[PATCH 6/6] bsps: Move libchip to bsps
Sebastian Huber
sebastian.huber at embedded-brains.de
Tue Apr 3 13:28:00 UTC 2018
This patch is a part of the BSP source reorganization.
Update #3285.
---
.../powerpc/gen5200/dev/mpc5200-ata.c | 0
.../shared/dev}/display/disp_fonts.h | 0
.../shared/dev}/display/disp_hcms29xx.c | 0
.../shared/dev}/display/font_hcms29xx.c | 0
.../shared/dev}/display/font_hcms29xx.h | 0
.../libchip => bsps/shared/dev}/flash/am29lv160.c | 0
.../shared/dev}/i2c/i2c-2b-eeprom.c | 0
.../libchip => bsps/shared/dev}/i2c/i2c-ds1621.c | 0
{c/src/libchip => bsps/shared/dev}/i2c/i2c-sc620.c | 4 --
.../shared/dev}/i2c/spi-flash-m25p40.c | 0
.../shared/dev}/i2c/spi-fram-fm25l256.c | 0
.../libchip => bsps/shared/dev}/i2c/spi-memdrv.c | 0
.../libchip => bsps/shared/dev}/i2c/spi-sd-card.c | 0
{c/src/libchip => bsps/shared/dev}/ide/ata.c | 0
{c/src/libchip => bsps/shared/dev}/ide/ata_util.c | 0
.../shared/dev}/ide/ide_controller.c | 0
.../libchip => bsps/shared/dev}/rtc/README.ds1643 | 0
.../libchip => bsps/shared/dev}/rtc/README.icm7170 | 0
.../libchip => bsps/shared/dev}/rtc/README.m48t08 | 0
.../libchip => bsps/shared/dev}/rtc/README.m48t18 | 0
.../shared/dev}/rtc/README.mc146818a | 0
{c/src/libchip => bsps/shared/dev}/rtc/STATUS | 0
{c/src/libchip => bsps/shared/dev}/rtc/ds1375.c | 0
{c/src/libchip => bsps/shared/dev}/rtc/icm7170.c | 0
.../libchip => bsps/shared/dev}/rtc/icm7170_reg.c | 0
.../libchip => bsps/shared/dev}/rtc/icm7170_reg2.c | 0
.../libchip => bsps/shared/dev}/rtc/icm7170_reg4.c | 0
.../libchip => bsps/shared/dev}/rtc/icm7170_reg8.c | 0
{c/src/libchip => bsps/shared/dev}/rtc/m48t08.c | 0
.../libchip => bsps/shared/dev}/rtc/m48t08_reg.c | 0
.../libchip => bsps/shared/dev}/rtc/m48t08_reg2.c | 0
.../libchip => bsps/shared/dev}/rtc/m48t08_reg4.c | 0
.../libchip => bsps/shared/dev}/rtc/m48t08_reg8.c | 0
{c/src/libchip => bsps/shared/dev}/rtc/mc146818a.c | 0
.../shared/dev}/rtc/mc146818a_ioreg.c | 0
{c/src/libchip => bsps/shared/dev}/rtc/rtcprobe.c | 0
{c/src/libchip => bsps/shared/dev}/serial/README | 0
.../shared/dev}/serial/README.mc68681 | 0
.../shared/dev}/serial/README.ns16550 | 0
.../shared/dev}/serial/README.xr88681 | 0
.../shared/dev}/serial/README.z85c30 | 0
{c/src/libchip => bsps/shared/dev}/serial/STATUS | 0
.../libchip => bsps/shared/dev}/serial/mc68681.c | 0
.../shared/dev}/serial/mc68681_baud.c | 0
.../libchip => bsps/shared/dev}/serial/mc68681_p.h | 0
.../shared/dev}/serial/mc68681_reg.c | 0
.../shared/dev}/serial/mc68681_reg2.c | 0
.../shared/dev}/serial/mc68681_reg4.c | 0
.../shared/dev}/serial/mc68681_reg8.c | 0
.../shared/dev}/serial/ns16550-context.c | 0
.../libchip => bsps/shared/dev}/serial/ns16550.c | 0
.../libchip => bsps/shared/dev}/serial/serprobe.c | 0
{c/src/libchip => bsps/shared/dev}/serial/z85c30.c | 0
.../libchip => bsps/shared/dev}/serial/z85c30_p.h | 0
.../shared/dev}/serial/z85c30_reg.c | 0
{c/src/libchip/network => bsps/shared/net}/README | 0
.../network => bsps/shared/net}/README.3com | 0
.../network => bsps/shared/net}/README.cs8900 | 0
.../network => bsps/shared/net}/README.dec21140 | 0
.../network => bsps/shared/net}/README.i82586 | 0
.../network => bsps/shared/net}/README.open_eth | 0
.../network => bsps/shared/net}/README.sonic | 0
.../network => bsps/shared/net}/README.tulipclone | 0
.../libchip/network => bsps/shared/net}/cs8900.c | 0
.../network => bsps/shared/net}/cs8900.c.bsp | 0
.../network => bsps/shared/net}/cs8900.h.bsp | 0
.../libchip/network => bsps/shared/net}/dec21140.c | 0
{c/src/libchip/network => bsps/shared/net}/elnk.c | 0
.../network/greth.c => bsps/shared/net/greth2.c | 0
.../libchip/network => bsps/shared/net}/i82586.c | 0
.../network => bsps/shared/net}/i82586reg.h | 0
{c/src/libchip/network => bsps/shared/net}/if_dc.c | 0
.../libchip/network => bsps/shared/net}/if_fxp.c | 0
.../network => bsps/shared/net}/if_fxpreg.h | 0
.../libchip/network => bsps/shared/net}/open_eth.c | 0
.../libchip/network => bsps/shared/net}/smc91111.c | 0
.../network => bsps/shared/net}/smc91111config.h | 0
{c/src/libchip/network => bsps/shared/net}/sonic.c | 0
bsps/shared/shared.am | 52 ++++++++++++++++
c/src/configure.ac | 5 --
c/src/lib/libbsp/powerpc/gen5200/Makefile.am | 2 +-
c/src/libchip/Makefile.am | 71 +---------------------
c/src/wrapup/Makefile.am | 12 +---
83 files changed, 55 insertions(+), 91 deletions(-)
rename c/src/lib/libbsp/powerpc/gen5200/ide/ata.c => bsps/powerpc/gen5200/dev/mpc5200-ata.c (100%)
rename {c/src/libchip => bsps/shared/dev}/display/disp_fonts.h (100%)
rename {c/src/libchip => bsps/shared/dev}/display/disp_hcms29xx.c (100%)
rename {c/src/libchip => bsps/shared/dev}/display/font_hcms29xx.c (100%)
rename {c/src/libchip => bsps/shared/dev}/display/font_hcms29xx.h (100%)
rename {c/src/libchip => bsps/shared/dev}/flash/am29lv160.c (100%)
rename {c/src/libchip => bsps/shared/dev}/i2c/i2c-2b-eeprom.c (100%)
rename {c/src/libchip => bsps/shared/dev}/i2c/i2c-ds1621.c (100%)
rename {c/src/libchip => bsps/shared/dev}/i2c/i2c-sc620.c (97%)
rename {c/src/libchip => bsps/shared/dev}/i2c/spi-flash-m25p40.c (100%)
rename {c/src/libchip => bsps/shared/dev}/i2c/spi-fram-fm25l256.c (100%)
rename {c/src/libchip => bsps/shared/dev}/i2c/spi-memdrv.c (100%)
rename {c/src/libchip => bsps/shared/dev}/i2c/spi-sd-card.c (100%)
rename {c/src/libchip => bsps/shared/dev}/ide/ata.c (100%)
rename {c/src/libchip => bsps/shared/dev}/ide/ata_util.c (100%)
rename {c/src/libchip => bsps/shared/dev}/ide/ide_controller.c (100%)
rename {c/src/libchip => bsps/shared/dev}/rtc/README.ds1643 (100%)
rename {c/src/libchip => bsps/shared/dev}/rtc/README.icm7170 (100%)
rename {c/src/libchip => bsps/shared/dev}/rtc/README.m48t08 (100%)
rename {c/src/libchip => bsps/shared/dev}/rtc/README.m48t18 (100%)
rename {c/src/libchip => bsps/shared/dev}/rtc/README.mc146818a (100%)
rename {c/src/libchip => bsps/shared/dev}/rtc/STATUS (100%)
rename {c/src/libchip => bsps/shared/dev}/rtc/ds1375.c (100%)
rename {c/src/libchip => bsps/shared/dev}/rtc/icm7170.c (100%)
rename {c/src/libchip => bsps/shared/dev}/rtc/icm7170_reg.c (100%)
rename {c/src/libchip => bsps/shared/dev}/rtc/icm7170_reg2.c (100%)
rename {c/src/libchip => bsps/shared/dev}/rtc/icm7170_reg4.c (100%)
rename {c/src/libchip => bsps/shared/dev}/rtc/icm7170_reg8.c (100%)
rename {c/src/libchip => bsps/shared/dev}/rtc/m48t08.c (100%)
rename {c/src/libchip => bsps/shared/dev}/rtc/m48t08_reg.c (100%)
rename {c/src/libchip => bsps/shared/dev}/rtc/m48t08_reg2.c (100%)
rename {c/src/libchip => bsps/shared/dev}/rtc/m48t08_reg4.c (100%)
rename {c/src/libchip => bsps/shared/dev}/rtc/m48t08_reg8.c (100%)
rename {c/src/libchip => bsps/shared/dev}/rtc/mc146818a.c (100%)
rename {c/src/libchip => bsps/shared/dev}/rtc/mc146818a_ioreg.c (100%)
rename {c/src/libchip => bsps/shared/dev}/rtc/rtcprobe.c (100%)
rename {c/src/libchip => bsps/shared/dev}/serial/README (100%)
rename {c/src/libchip => bsps/shared/dev}/serial/README.mc68681 (100%)
rename {c/src/libchip => bsps/shared/dev}/serial/README.ns16550 (100%)
rename {c/src/libchip => bsps/shared/dev}/serial/README.xr88681 (100%)
rename {c/src/libchip => bsps/shared/dev}/serial/README.z85c30 (100%)
rename {c/src/libchip => bsps/shared/dev}/serial/STATUS (100%)
rename {c/src/libchip => bsps/shared/dev}/serial/mc68681.c (100%)
rename {c/src/libchip => bsps/shared/dev}/serial/mc68681_baud.c (100%)
rename {c/src/libchip => bsps/shared/dev}/serial/mc68681_p.h (100%)
rename {c/src/libchip => bsps/shared/dev}/serial/mc68681_reg.c (100%)
rename {c/src/libchip => bsps/shared/dev}/serial/mc68681_reg2.c (100%)
rename {c/src/libchip => bsps/shared/dev}/serial/mc68681_reg4.c (100%)
rename {c/src/libchip => bsps/shared/dev}/serial/mc68681_reg8.c (100%)
rename {c/src/libchip => bsps/shared/dev}/serial/ns16550-context.c (100%)
rename {c/src/libchip => bsps/shared/dev}/serial/ns16550.c (100%)
rename {c/src/libchip => bsps/shared/dev}/serial/serprobe.c (100%)
rename {c/src/libchip => bsps/shared/dev}/serial/z85c30.c (100%)
rename {c/src/libchip => bsps/shared/dev}/serial/z85c30_p.h (100%)
rename {c/src/libchip => bsps/shared/dev}/serial/z85c30_reg.c (100%)
rename {c/src/libchip/network => bsps/shared/net}/README (100%)
rename {c/src/libchip/network => bsps/shared/net}/README.3com (100%)
rename {c/src/libchip/network => bsps/shared/net}/README.cs8900 (100%)
rename {c/src/libchip/network => bsps/shared/net}/README.dec21140 (100%)
rename {c/src/libchip/network => bsps/shared/net}/README.i82586 (100%)
rename {c/src/libchip/network => bsps/shared/net}/README.open_eth (100%)
rename {c/src/libchip/network => bsps/shared/net}/README.sonic (100%)
rename {c/src/libchip/network => bsps/shared/net}/README.tulipclone (100%)
rename {c/src/libchip/network => bsps/shared/net}/cs8900.c (100%)
rename {c/src/libchip/network => bsps/shared/net}/cs8900.c.bsp (100%)
rename {c/src/libchip/network => bsps/shared/net}/cs8900.h.bsp (100%)
rename {c/src/libchip/network => bsps/shared/net}/dec21140.c (100%)
rename {c/src/libchip/network => bsps/shared/net}/elnk.c (100%)
rename c/src/libchip/network/greth.c => bsps/shared/net/greth2.c (100%)
rename {c/src/libchip/network => bsps/shared/net}/i82586.c (100%)
rename {c/src/libchip/network => bsps/shared/net}/i82586reg.h (100%)
rename {c/src/libchip/network => bsps/shared/net}/if_dc.c (100%)
rename {c/src/libchip/network => bsps/shared/net}/if_fxp.c (100%)
rename {c/src/libchip/network => bsps/shared/net}/if_fxpreg.h (100%)
rename {c/src/libchip/network => bsps/shared/net}/open_eth.c (100%)
rename {c/src/libchip/network => bsps/shared/net}/smc91111.c (100%)
rename {c/src/libchip/network => bsps/shared/net}/smc91111config.h (100%)
rename {c/src/libchip/network => bsps/shared/net}/sonic.c (100%)
diff --git a/c/src/lib/libbsp/powerpc/gen5200/ide/ata.c b/bsps/powerpc/gen5200/dev/mpc5200-ata.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/ide/ata.c
rename to bsps/powerpc/gen5200/dev/mpc5200-ata.c
diff --git a/c/src/libchip/display/disp_fonts.h b/bsps/shared/dev/display/disp_fonts.h
similarity index 100%
rename from c/src/libchip/display/disp_fonts.h
rename to bsps/shared/dev/display/disp_fonts.h
diff --git a/c/src/libchip/display/disp_hcms29xx.c b/bsps/shared/dev/display/disp_hcms29xx.c
similarity index 100%
rename from c/src/libchip/display/disp_hcms29xx.c
rename to bsps/shared/dev/display/disp_hcms29xx.c
diff --git a/c/src/libchip/display/font_hcms29xx.c b/bsps/shared/dev/display/font_hcms29xx.c
similarity index 100%
rename from c/src/libchip/display/font_hcms29xx.c
rename to bsps/shared/dev/display/font_hcms29xx.c
diff --git a/c/src/libchip/display/font_hcms29xx.h b/bsps/shared/dev/display/font_hcms29xx.h
similarity index 100%
rename from c/src/libchip/display/font_hcms29xx.h
rename to bsps/shared/dev/display/font_hcms29xx.h
diff --git a/c/src/libchip/flash/am29lv160.c b/bsps/shared/dev/flash/am29lv160.c
similarity index 100%
rename from c/src/libchip/flash/am29lv160.c
rename to bsps/shared/dev/flash/am29lv160.c
diff --git a/c/src/libchip/i2c/i2c-2b-eeprom.c b/bsps/shared/dev/i2c/i2c-2b-eeprom.c
similarity index 100%
rename from c/src/libchip/i2c/i2c-2b-eeprom.c
rename to bsps/shared/dev/i2c/i2c-2b-eeprom.c
diff --git a/c/src/libchip/i2c/i2c-ds1621.c b/bsps/shared/dev/i2c/i2c-ds1621.c
similarity index 100%
rename from c/src/libchip/i2c/i2c-ds1621.c
rename to bsps/shared/dev/i2c/i2c-ds1621.c
diff --git a/c/src/libchip/i2c/i2c-sc620.c b/bsps/shared/dev/i2c/i2c-sc620.c
similarity index 97%
rename from c/src/libchip/i2c/i2c-sc620.c
rename to bsps/shared/dev/i2c/i2c-sc620.c
index e4dd2d0871..7b30ae56af 100644
--- a/c/src/libchip/i2c/i2c-sc620.c
+++ b/bsps/shared/dev/i2c/i2c-sc620.c
@@ -18,10 +18,6 @@
* http://www.rtems.org/license/LICENSE.
*/
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
-
#include <libchip/i2c-sc620.h>
#include <rtems/libio.h>
diff --git a/c/src/libchip/i2c/spi-flash-m25p40.c b/bsps/shared/dev/i2c/spi-flash-m25p40.c
similarity index 100%
rename from c/src/libchip/i2c/spi-flash-m25p40.c
rename to bsps/shared/dev/i2c/spi-flash-m25p40.c
diff --git a/c/src/libchip/i2c/spi-fram-fm25l256.c b/bsps/shared/dev/i2c/spi-fram-fm25l256.c
similarity index 100%
rename from c/src/libchip/i2c/spi-fram-fm25l256.c
rename to bsps/shared/dev/i2c/spi-fram-fm25l256.c
diff --git a/c/src/libchip/i2c/spi-memdrv.c b/bsps/shared/dev/i2c/spi-memdrv.c
similarity index 100%
rename from c/src/libchip/i2c/spi-memdrv.c
rename to bsps/shared/dev/i2c/spi-memdrv.c
diff --git a/c/src/libchip/i2c/spi-sd-card.c b/bsps/shared/dev/i2c/spi-sd-card.c
similarity index 100%
rename from c/src/libchip/i2c/spi-sd-card.c
rename to bsps/shared/dev/i2c/spi-sd-card.c
diff --git a/c/src/libchip/ide/ata.c b/bsps/shared/dev/ide/ata.c
similarity index 100%
rename from c/src/libchip/ide/ata.c
rename to bsps/shared/dev/ide/ata.c
diff --git a/c/src/libchip/ide/ata_util.c b/bsps/shared/dev/ide/ata_util.c
similarity index 100%
rename from c/src/libchip/ide/ata_util.c
rename to bsps/shared/dev/ide/ata_util.c
diff --git a/c/src/libchip/ide/ide_controller.c b/bsps/shared/dev/ide/ide_controller.c
similarity index 100%
rename from c/src/libchip/ide/ide_controller.c
rename to bsps/shared/dev/ide/ide_controller.c
diff --git a/c/src/libchip/rtc/README.ds1643 b/bsps/shared/dev/rtc/README.ds1643
similarity index 100%
rename from c/src/libchip/rtc/README.ds1643
rename to bsps/shared/dev/rtc/README.ds1643
diff --git a/c/src/libchip/rtc/README.icm7170 b/bsps/shared/dev/rtc/README.icm7170
similarity index 100%
rename from c/src/libchip/rtc/README.icm7170
rename to bsps/shared/dev/rtc/README.icm7170
diff --git a/c/src/libchip/rtc/README.m48t08 b/bsps/shared/dev/rtc/README.m48t08
similarity index 100%
rename from c/src/libchip/rtc/README.m48t08
rename to bsps/shared/dev/rtc/README.m48t08
diff --git a/c/src/libchip/rtc/README.m48t18 b/bsps/shared/dev/rtc/README.m48t18
similarity index 100%
rename from c/src/libchip/rtc/README.m48t18
rename to bsps/shared/dev/rtc/README.m48t18
diff --git a/c/src/libchip/rtc/README.mc146818a b/bsps/shared/dev/rtc/README.mc146818a
similarity index 100%
rename from c/src/libchip/rtc/README.mc146818a
rename to bsps/shared/dev/rtc/README.mc146818a
diff --git a/c/src/libchip/rtc/STATUS b/bsps/shared/dev/rtc/STATUS
similarity index 100%
rename from c/src/libchip/rtc/STATUS
rename to bsps/shared/dev/rtc/STATUS
diff --git a/c/src/libchip/rtc/ds1375.c b/bsps/shared/dev/rtc/ds1375.c
similarity index 100%
rename from c/src/libchip/rtc/ds1375.c
rename to bsps/shared/dev/rtc/ds1375.c
diff --git a/c/src/libchip/rtc/icm7170.c b/bsps/shared/dev/rtc/icm7170.c
similarity index 100%
rename from c/src/libchip/rtc/icm7170.c
rename to bsps/shared/dev/rtc/icm7170.c
diff --git a/c/src/libchip/rtc/icm7170_reg.c b/bsps/shared/dev/rtc/icm7170_reg.c
similarity index 100%
rename from c/src/libchip/rtc/icm7170_reg.c
rename to bsps/shared/dev/rtc/icm7170_reg.c
diff --git a/c/src/libchip/rtc/icm7170_reg2.c b/bsps/shared/dev/rtc/icm7170_reg2.c
similarity index 100%
rename from c/src/libchip/rtc/icm7170_reg2.c
rename to bsps/shared/dev/rtc/icm7170_reg2.c
diff --git a/c/src/libchip/rtc/icm7170_reg4.c b/bsps/shared/dev/rtc/icm7170_reg4.c
similarity index 100%
rename from c/src/libchip/rtc/icm7170_reg4.c
rename to bsps/shared/dev/rtc/icm7170_reg4.c
diff --git a/c/src/libchip/rtc/icm7170_reg8.c b/bsps/shared/dev/rtc/icm7170_reg8.c
similarity index 100%
rename from c/src/libchip/rtc/icm7170_reg8.c
rename to bsps/shared/dev/rtc/icm7170_reg8.c
diff --git a/c/src/libchip/rtc/m48t08.c b/bsps/shared/dev/rtc/m48t08.c
similarity index 100%
rename from c/src/libchip/rtc/m48t08.c
rename to bsps/shared/dev/rtc/m48t08.c
diff --git a/c/src/libchip/rtc/m48t08_reg.c b/bsps/shared/dev/rtc/m48t08_reg.c
similarity index 100%
rename from c/src/libchip/rtc/m48t08_reg.c
rename to bsps/shared/dev/rtc/m48t08_reg.c
diff --git a/c/src/libchip/rtc/m48t08_reg2.c b/bsps/shared/dev/rtc/m48t08_reg2.c
similarity index 100%
rename from c/src/libchip/rtc/m48t08_reg2.c
rename to bsps/shared/dev/rtc/m48t08_reg2.c
diff --git a/c/src/libchip/rtc/m48t08_reg4.c b/bsps/shared/dev/rtc/m48t08_reg4.c
similarity index 100%
rename from c/src/libchip/rtc/m48t08_reg4.c
rename to bsps/shared/dev/rtc/m48t08_reg4.c
diff --git a/c/src/libchip/rtc/m48t08_reg8.c b/bsps/shared/dev/rtc/m48t08_reg8.c
similarity index 100%
rename from c/src/libchip/rtc/m48t08_reg8.c
rename to bsps/shared/dev/rtc/m48t08_reg8.c
diff --git a/c/src/libchip/rtc/mc146818a.c b/bsps/shared/dev/rtc/mc146818a.c
similarity index 100%
rename from c/src/libchip/rtc/mc146818a.c
rename to bsps/shared/dev/rtc/mc146818a.c
diff --git a/c/src/libchip/rtc/mc146818a_ioreg.c b/bsps/shared/dev/rtc/mc146818a_ioreg.c
similarity index 100%
rename from c/src/libchip/rtc/mc146818a_ioreg.c
rename to bsps/shared/dev/rtc/mc146818a_ioreg.c
diff --git a/c/src/libchip/rtc/rtcprobe.c b/bsps/shared/dev/rtc/rtcprobe.c
similarity index 100%
rename from c/src/libchip/rtc/rtcprobe.c
rename to bsps/shared/dev/rtc/rtcprobe.c
diff --git a/c/src/libchip/serial/README b/bsps/shared/dev/serial/README
similarity index 100%
rename from c/src/libchip/serial/README
rename to bsps/shared/dev/serial/README
diff --git a/c/src/libchip/serial/README.mc68681 b/bsps/shared/dev/serial/README.mc68681
similarity index 100%
rename from c/src/libchip/serial/README.mc68681
rename to bsps/shared/dev/serial/README.mc68681
diff --git a/c/src/libchip/serial/README.ns16550 b/bsps/shared/dev/serial/README.ns16550
similarity index 100%
rename from c/src/libchip/serial/README.ns16550
rename to bsps/shared/dev/serial/README.ns16550
diff --git a/c/src/libchip/serial/README.xr88681 b/bsps/shared/dev/serial/README.xr88681
similarity index 100%
rename from c/src/libchip/serial/README.xr88681
rename to bsps/shared/dev/serial/README.xr88681
diff --git a/c/src/libchip/serial/README.z85c30 b/bsps/shared/dev/serial/README.z85c30
similarity index 100%
rename from c/src/libchip/serial/README.z85c30
rename to bsps/shared/dev/serial/README.z85c30
diff --git a/c/src/libchip/serial/STATUS b/bsps/shared/dev/serial/STATUS
similarity index 100%
rename from c/src/libchip/serial/STATUS
rename to bsps/shared/dev/serial/STATUS
diff --git a/c/src/libchip/serial/mc68681.c b/bsps/shared/dev/serial/mc68681.c
similarity index 100%
rename from c/src/libchip/serial/mc68681.c
rename to bsps/shared/dev/serial/mc68681.c
diff --git a/c/src/libchip/serial/mc68681_baud.c b/bsps/shared/dev/serial/mc68681_baud.c
similarity index 100%
rename from c/src/libchip/serial/mc68681_baud.c
rename to bsps/shared/dev/serial/mc68681_baud.c
diff --git a/c/src/libchip/serial/mc68681_p.h b/bsps/shared/dev/serial/mc68681_p.h
similarity index 100%
rename from c/src/libchip/serial/mc68681_p.h
rename to bsps/shared/dev/serial/mc68681_p.h
diff --git a/c/src/libchip/serial/mc68681_reg.c b/bsps/shared/dev/serial/mc68681_reg.c
similarity index 100%
rename from c/src/libchip/serial/mc68681_reg.c
rename to bsps/shared/dev/serial/mc68681_reg.c
diff --git a/c/src/libchip/serial/mc68681_reg2.c b/bsps/shared/dev/serial/mc68681_reg2.c
similarity index 100%
rename from c/src/libchip/serial/mc68681_reg2.c
rename to bsps/shared/dev/serial/mc68681_reg2.c
diff --git a/c/src/libchip/serial/mc68681_reg4.c b/bsps/shared/dev/serial/mc68681_reg4.c
similarity index 100%
rename from c/src/libchip/serial/mc68681_reg4.c
rename to bsps/shared/dev/serial/mc68681_reg4.c
diff --git a/c/src/libchip/serial/mc68681_reg8.c b/bsps/shared/dev/serial/mc68681_reg8.c
similarity index 100%
rename from c/src/libchip/serial/mc68681_reg8.c
rename to bsps/shared/dev/serial/mc68681_reg8.c
diff --git a/c/src/libchip/serial/ns16550-context.c b/bsps/shared/dev/serial/ns16550-context.c
similarity index 100%
rename from c/src/libchip/serial/ns16550-context.c
rename to bsps/shared/dev/serial/ns16550-context.c
diff --git a/c/src/libchip/serial/ns16550.c b/bsps/shared/dev/serial/ns16550.c
similarity index 100%
rename from c/src/libchip/serial/ns16550.c
rename to bsps/shared/dev/serial/ns16550.c
diff --git a/c/src/libchip/serial/serprobe.c b/bsps/shared/dev/serial/serprobe.c
similarity index 100%
rename from c/src/libchip/serial/serprobe.c
rename to bsps/shared/dev/serial/serprobe.c
diff --git a/c/src/libchip/serial/z85c30.c b/bsps/shared/dev/serial/z85c30.c
similarity index 100%
rename from c/src/libchip/serial/z85c30.c
rename to bsps/shared/dev/serial/z85c30.c
diff --git a/c/src/libchip/serial/z85c30_p.h b/bsps/shared/dev/serial/z85c30_p.h
similarity index 100%
rename from c/src/libchip/serial/z85c30_p.h
rename to bsps/shared/dev/serial/z85c30_p.h
diff --git a/c/src/libchip/serial/z85c30_reg.c b/bsps/shared/dev/serial/z85c30_reg.c
similarity index 100%
rename from c/src/libchip/serial/z85c30_reg.c
rename to bsps/shared/dev/serial/z85c30_reg.c
diff --git a/c/src/libchip/network/README b/bsps/shared/net/README
similarity index 100%
rename from c/src/libchip/network/README
rename to bsps/shared/net/README
diff --git a/c/src/libchip/network/README.3com b/bsps/shared/net/README.3com
similarity index 100%
rename from c/src/libchip/network/README.3com
rename to bsps/shared/net/README.3com
diff --git a/c/src/libchip/network/README.cs8900 b/bsps/shared/net/README.cs8900
similarity index 100%
rename from c/src/libchip/network/README.cs8900
rename to bsps/shared/net/README.cs8900
diff --git a/c/src/libchip/network/README.dec21140 b/bsps/shared/net/README.dec21140
similarity index 100%
rename from c/src/libchip/network/README.dec21140
rename to bsps/shared/net/README.dec21140
diff --git a/c/src/libchip/network/README.i82586 b/bsps/shared/net/README.i82586
similarity index 100%
rename from c/src/libchip/network/README.i82586
rename to bsps/shared/net/README.i82586
diff --git a/c/src/libchip/network/README.open_eth b/bsps/shared/net/README.open_eth
similarity index 100%
rename from c/src/libchip/network/README.open_eth
rename to bsps/shared/net/README.open_eth
diff --git a/c/src/libchip/network/README.sonic b/bsps/shared/net/README.sonic
similarity index 100%
rename from c/src/libchip/network/README.sonic
rename to bsps/shared/net/README.sonic
diff --git a/c/src/libchip/network/README.tulipclone b/bsps/shared/net/README.tulipclone
similarity index 100%
rename from c/src/libchip/network/README.tulipclone
rename to bsps/shared/net/README.tulipclone
diff --git a/c/src/libchip/network/cs8900.c b/bsps/shared/net/cs8900.c
similarity index 100%
rename from c/src/libchip/network/cs8900.c
rename to bsps/shared/net/cs8900.c
diff --git a/c/src/libchip/network/cs8900.c.bsp b/bsps/shared/net/cs8900.c.bsp
similarity index 100%
rename from c/src/libchip/network/cs8900.c.bsp
rename to bsps/shared/net/cs8900.c.bsp
diff --git a/c/src/libchip/network/cs8900.h.bsp b/bsps/shared/net/cs8900.h.bsp
similarity index 100%
rename from c/src/libchip/network/cs8900.h.bsp
rename to bsps/shared/net/cs8900.h.bsp
diff --git a/c/src/libchip/network/dec21140.c b/bsps/shared/net/dec21140.c
similarity index 100%
rename from c/src/libchip/network/dec21140.c
rename to bsps/shared/net/dec21140.c
diff --git a/c/src/libchip/network/elnk.c b/bsps/shared/net/elnk.c
similarity index 100%
rename from c/src/libchip/network/elnk.c
rename to bsps/shared/net/elnk.c
diff --git a/c/src/libchip/network/greth.c b/bsps/shared/net/greth2.c
similarity index 100%
rename from c/src/libchip/network/greth.c
rename to bsps/shared/net/greth2.c
diff --git a/c/src/libchip/network/i82586.c b/bsps/shared/net/i82586.c
similarity index 100%
rename from c/src/libchip/network/i82586.c
rename to bsps/shared/net/i82586.c
diff --git a/c/src/libchip/network/i82586reg.h b/bsps/shared/net/i82586reg.h
similarity index 100%
rename from c/src/libchip/network/i82586reg.h
rename to bsps/shared/net/i82586reg.h
diff --git a/c/src/libchip/network/if_dc.c b/bsps/shared/net/if_dc.c
similarity index 100%
rename from c/src/libchip/network/if_dc.c
rename to bsps/shared/net/if_dc.c
diff --git a/c/src/libchip/network/if_fxp.c b/bsps/shared/net/if_fxp.c
similarity index 100%
rename from c/src/libchip/network/if_fxp.c
rename to bsps/shared/net/if_fxp.c
diff --git a/c/src/libchip/network/if_fxpreg.h b/bsps/shared/net/if_fxpreg.h
similarity index 100%
rename from c/src/libchip/network/if_fxpreg.h
rename to bsps/shared/net/if_fxpreg.h
diff --git a/c/src/libchip/network/open_eth.c b/bsps/shared/net/open_eth.c
similarity index 100%
rename from c/src/libchip/network/open_eth.c
rename to bsps/shared/net/open_eth.c
diff --git a/c/src/libchip/network/smc91111.c b/bsps/shared/net/smc91111.c
similarity index 100%
rename from c/src/libchip/network/smc91111.c
rename to bsps/shared/net/smc91111.c
diff --git a/c/src/libchip/network/smc91111config.h b/bsps/shared/net/smc91111config.h
similarity index 100%
rename from c/src/libchip/network/smc91111config.h
rename to bsps/shared/net/smc91111config.h
diff --git a/c/src/libchip/network/sonic.c b/bsps/shared/net/sonic.c
similarity index 100%
rename from c/src/libchip/network/sonic.c
rename to bsps/shared/net/sonic.c
diff --git a/bsps/shared/shared.am b/bsps/shared/shared.am
index 854710d804..d3503ddc01 100644
--- a/bsps/shared/shared.am
+++ b/bsps/shared/shared.am
@@ -1 +1,53 @@
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/display/disp_hcms29xx.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/display/font_hcms29xx.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/flash/am29lv160.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/i2c/i2c-2b-eeprom.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/i2c/i2c-ds1621.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/i2c/i2c-sc620.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/i2c/spi-flash-m25p40.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/i2c/spi-fram-fm25l256.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/i2c/spi-memdrv.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/i2c/spi-sd-card.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/ide/ata.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/ide/ata_util.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/ide/ide_controller.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/ds1375.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/icm7170.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/icm7170_reg2.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/icm7170_reg4.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/icm7170_reg8.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/icm7170_reg.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/m48t08.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/m48t08_reg2.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/m48t08_reg4.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/m48t08_reg8.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/m48t08_reg.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/mc146818a.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/mc146818a_ioreg.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtcprobe.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/mc68681_baud.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/mc68681.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/mc68681_reg2.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/mc68681_reg4.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/mc68681_reg8.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/mc68681_reg.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/ns16550.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/ns16550-context.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/serprobe.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/z85c30.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/z85c30_reg.c
+if HAS_NETWORKING
+libbsp_a_SOURCES += ../../../../../../bsps/shared/net/cs8900.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/net/dec21140.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/net/elnk.c
+if !HAS_SMP
+libbsp_a_SOURCES += ../../../../../../bsps/shared/net/greth2.c
+endif
+libbsp_a_SOURCES += ../../../../../../bsps/shared/net/i82586.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/net/if_dc.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/net/if_fxp.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/net/open_eth.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/net/smc91111.c
+libbsp_a_SOURCES += ../../../../../../bsps/shared/net/sonic.c
+endif
libbsp_a_SOURCES += ../../../../../../bsps/shared/rtems-version.c
diff --git a/c/src/configure.ac b/c/src/configure.ac
index 508f20f18e..a39b4ec08d 100644
--- a/c/src/configure.ac
+++ b/c/src/configure.ac
@@ -23,7 +23,6 @@ RTEMS_ENV_RTEMSBSP
RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
RTEMS_CHECK_POSIX_API(RTEMS_BSP)
-RTEMS_CHECK_SMP
AC_MSG_NOTICE([setting up make/custom])
@@ -111,7 +110,6 @@ RTEMS_CHECK_GCC_WEAK
AC_SUBST(CUSTOM_CFG_FILES)
-RTEMS_CHECK_NETWORKING(RTEMS_BSP)
RTEMS_CHECK_MULTIPROCESSING
BSP_SUBDIRS=
@@ -155,9 +153,6 @@ AS_IF([test "$host_cpu" = sparc],[
[whether to enable ipalignment work-around])
])
-AM_CONDITIONAL([HAS_NETWORKING],[test "$HAS_NETWORKING" = "yes"])
-AM_CONDITIONAL(HAS_SMP,[test "$rtems_cv_HAS_SMP" = "yes"])
-
RTEMS_PROJECT_ROOT
# Explicitly list all Makefiles here
diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
index 9c625bf928..e9305d039d 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
@@ -57,7 +57,7 @@ libbsp_a_SOURCES += console/console.c
libbsp_a_SOURCES += i2c/i2c.c i2c/i2cdrv.c i2c/mpc5200mbus.c i2c/mpc5200mbus.h
# ide
libbsp_a_SOURCES += ide/idecfg.c ide/pcmcia_ide.c ide/pcmcia_ide.h
-libbsp_a_SOURCES += ide/ata.c
+libbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen5200/dev/mpc5200-ata.c
libbsp_a_SOURCES += ide/ata-instance.c
libbsp_a_SOURCES += ide/ata-dma-pio-single.c
diff --git a/c/src/libchip/Makefile.am b/c/src/libchip/Makefile.am
index 89c9688a8c..74c83f14c8 100644
--- a/c/src/libchip/Makefile.am
+++ b/c/src/libchip/Makefile.am
@@ -1,77 +1,8 @@
include $(top_srcdir)/automake/compile.am
-noinst_LIBRARIES =
-noinst_PROGRAMS =
-
-# display
-noinst_LIBRARIES += libdisplay.a
-libdisplay_a_SOURCES = display/disp_hcms29xx.c display/font_hcms29xx.c
-libdisplay_a_CPPFLAGS = $(AM_CPPFLAGS)
-
-# flash
-noinst_LIBRARIES += libflash.a
-libflash_a_SOURCES = flash/am29lv160.c
-libflash_a_CPPFLAGS = $(AM_CPPFLAGS)
-
-# ide
-noinst_LIBRARIES += libide.a
-libide_a_SOURCES = ide/ata.c ide/ata_util.c ide/ide_controller.c
-libide_a_CPPFLAGS = $(AM_CPPFLAGS)
-
-# network
-if HAS_NETWORKING
-noinst_LIBRARIES += libnetchip.a
-libnetchip_a_CPPFLAGS = $(AM_CPPFLAGS)
-libnetchip_a_SOURCES = network/cs8900.c network/dec21140.c network/i82586.c \
- network/sonic.c network/if_fxp.c network/elnk.c network/open_eth.c \
- network/if_dc.c
-if !HAS_SMP
-libnetchip_a_SOURCES += network/greth.c
-endif
-libnetchip_a_SOURCES += network/smc91111.c network/smc91111config.h
-endif
-
-
-# rtc
-noinst_LIBRARIES += librtcio.a
-librtcio_a_CPPFLAGS = $(AM_CPPFLAGS)
-librtcio_a_SOURCES = rtc/rtcprobe.c rtc/icm7170.c rtc/icm7170_reg.c \
- rtc/icm7170_reg2.c rtc/icm7170_reg4.c rtc/icm7170_reg8.c rtc/m48t08.c \
- rtc/m48t08_reg.c rtc/m48t08_reg2.c rtc/m48t08_reg4.c rtc/m48t08_reg8.c \
- rtc/mc146818a.c rtc/mc146818a_ioreg.c rtc/ds1375.c
-
-
-# i2c
-noinst_LIBRARIES += libi2cio.a
-
-libi2cio_a_CPPFLAGS = $(AM_CPPFLAGS)
-libi2cio_a_SOURCES = i2c/i2c-ds1621.h \
- i2c/i2c-2b-eeprom.h \
- i2c/spi-memdrv.h \
- i2c/spi-flash-m25p40.h \
- i2c/spi-fram-fm25l256.h \
- i2c/i2c-ds1621.c \
- i2c/i2c-2b-eeprom.c \
- i2c/i2c-sc620.c \
- i2c/spi-memdrv.c \
- i2c/spi-flash-m25p40.c \
- i2c/spi-fram-fm25l256.c \
- i2c/spi-sd-card.c
-
-# serial
-noinst_LIBRARIES += libserialio.a
-libserialio_a_CPPFLAGS = $(AM_CPPFLAGS)
-libserialio_a_SOURCES = serial/mc68681.c serial/mc68681_baud.c \
- serial/mc68681_reg.c serial/mc68681_reg2.c serial/mc68681_reg4.c \
- serial/mc68681_reg8.c serial/ns16550.c serial/z85c30.c \
- serial/z85c30_reg.c serial/serprobe.c serial/mc68681_p.h \
- serial/z85c30_p.h
-libserialio_a_SOURCES += serial/ns16550-context.c
-
-
## shmdr
if HAS_MP
-noinst_LIBRARIES += libshmdr.a
+noinst_LIBRARIES = libshmdr.a
libshmdr_a_CPPFLAGS = $(AM_CPPFLAGS)
libshmdr_a_SOURCES = shmdr/addlq.c shmdr/cnvpkt.c shmdr/getlq.c shmdr/dump.c \
shmdr/fatal.c shmdr/getpkt.c shmdr/init.c shmdr/initlq.c shmdr/intr.c \
diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am
index 42d283ab6a..fed257c8aa 100644
--- a/c/src/wrapup/Makefile.am
+++ b/c/src/wrapup/Makefile.am
@@ -13,17 +13,7 @@ TMPINSTALL_FILES = $(PROJECT_LIB)/librtemsbsp.a
CLEANFILES = o-optimize/librtemsbsp.a
-SRCS += ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/libbsp.a
-
-SRCS += ../libchip/libflash.a
-SRCS += ../libchip/librtcio.a
-SRCS += ../libchip/libserialio.a
-SRCS += ../libchip/libide.a
-if HAS_NETWORKING
-SRCS += ../libchip/libnetchip.a
-endif
-SRCS += ../libchip/libi2cio.a
-SRCS += ../libchip/libdisplay.a
+SRCS = ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/libbsp.a
if HAS_MP
SRCS += ../libchip/libshmdr.a
--
2.12.3
More information about the devel
mailing list