bsps: Move libchip to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

83 files changed, 55 insertions, 91 deletions

diff --git a/c/src/lib/libbsp/powerpc/gen5200/ide/ata.c b/bsps/powerpc/gen5200/dev/mpc5200-ata.c
index de7ee27fb3..de7ee27fb3 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/ide/ata.c
+++ b/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
index 39e909390a..39e909390a 100644
--- a/c/src/libchip/display/disp_fonts.h
+++ b/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
index 5730b36ea9..5730b36ea9 100644
--- a/c/src/libchip/display/disp_hcms29xx.c
+++ b/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
index e25cca2eca..e25cca2eca 100644
--- a/c/src/libchip/display/font_hcms29xx.c
+++ b/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
index 8638fcf600..8638fcf600 100644
--- a/c/src/libchip/display/font_hcms29xx.h
+++ b/bsps/shared/dev/display/font_hcms29xx.h
diff --git a/c/src/libchip/flash/am29lv160.c b/bsps/shared/dev/flash/am29lv160.c
index 5cfaae4f24..5cfaae4f24 100644
--- a/c/src/libchip/flash/am29lv160.c
+++ b/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
index 4a8b5fdb9c..4a8b5fdb9c 100644
--- a/c/src/libchip/i2c/i2c-2b-eeprom.c
+++ b/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
index 51f64de679..51f64de679 100644
--- a/c/src/libchip/i2c/i2c-ds1621.c
+++ b/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
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
index 075a4510b9..075a4510b9 100644
--- a/c/src/libchip/i2c/spi-flash-m25p40.c
+++ b/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
index 086feb82bb..086feb82bb 100644
--- a/c/src/libchip/i2c/spi-fram-fm25l256.c
+++ b/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
index 593029732e..593029732e 100644
--- a/c/src/libchip/i2c/spi-memdrv.c
+++ b/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
index a343f7faa8..a343f7faa8 100644
--- a/c/src/libchip/i2c/spi-sd-card.c
+++ b/bsps/shared/dev/i2c/spi-sd-card.c
diff --git a/c/src/libchip/ide/ata.c b/bsps/shared/dev/ide/ata.c
index 7bb3f6ec73..7bb3f6ec73 100644
--- a/c/src/libchip/ide/ata.c
+++ b/bsps/shared/dev/ide/ata.c
diff --git a/c/src/libchip/ide/ata_util.c b/bsps/shared/dev/ide/ata_util.c
index 68e0f0bbe5..68e0f0bbe5 100644
--- a/c/src/libchip/ide/ata_util.c
+++ b/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
index 912f9e3157..912f9e3157 100644
--- a/c/src/libchip/ide/ide_controller.c
+++ b/bsps/shared/dev/ide/ide_controller.c
diff --git a/c/src/libchip/rtc/README.ds1643 b/bsps/shared/dev/rtc/README.ds1643
index a3a38605c8..a3a38605c8 100644
--- a/c/src/libchip/rtc/README.ds1643
+++ b/bsps/shared/dev/rtc/README.ds1643
diff --git a/c/src/libchip/rtc/README.icm7170 b/bsps/shared/dev/rtc/README.icm7170
index d4ecff570f..d4ecff570f 100644
--- a/c/src/libchip/rtc/README.icm7170
+++ b/bsps/shared/dev/rtc/README.icm7170
diff --git a/c/src/libchip/rtc/README.m48t08 b/bsps/shared/dev/rtc/README.m48t08
index 25c032e85e..25c032e85e 100644
--- a/c/src/libchip/rtc/README.m48t08
+++ b/bsps/shared/dev/rtc/README.m48t08
diff --git a/c/src/libchip/rtc/README.m48t18 b/bsps/shared/dev/rtc/README.m48t18
index 0925c62115..0925c62115 100644
--- a/c/src/libchip/rtc/README.m48t18
+++ b/bsps/shared/dev/rtc/README.m48t18
diff --git a/c/src/libchip/rtc/README.mc146818a b/bsps/shared/dev/rtc/README.mc146818a
index e9a9c86447..e9a9c86447 100644
--- a/c/src/libchip/rtc/README.mc146818a
+++ b/bsps/shared/dev/rtc/README.mc146818a
diff --git a/c/src/libchip/rtc/STATUS b/bsps/shared/dev/rtc/STATUS
index a6d5c41cd5..a6d5c41cd5 100644
--- a/c/src/libchip/rtc/STATUS
+++ b/bsps/shared/dev/rtc/STATUS
diff --git a/c/src/libchip/rtc/ds1375.c b/bsps/shared/dev/rtc/ds1375.c
index 4a23a0044b..4a23a0044b 100644
--- a/c/src/libchip/rtc/ds1375.c
+++ b/bsps/shared/dev/rtc/ds1375.c
diff --git a/c/src/libchip/rtc/icm7170.c b/bsps/shared/dev/rtc/icm7170.c
index 1cc9e980f7..1cc9e980f7 100644
--- a/c/src/libchip/rtc/icm7170.c
+++ b/bsps/shared/dev/rtc/icm7170.c
diff --git a/c/src/libchip/rtc/icm7170_reg.c b/bsps/shared/dev/rtc/icm7170_reg.c
index 747f1f218d..747f1f218d 100644
--- a/c/src/libchip/rtc/icm7170_reg.c
+++ b/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
index 179d76c6f5..179d76c6f5 100644
--- a/c/src/libchip/rtc/icm7170_reg2.c
+++ b/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
index dada40961c..dada40961c 100644
--- a/c/src/libchip/rtc/icm7170_reg4.c
+++ b/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
index a1fb1a5ea2..a1fb1a5ea2 100644
--- a/c/src/libchip/rtc/icm7170_reg8.c
+++ b/bsps/shared/dev/rtc/icm7170_reg8.c
diff --git a/c/src/libchip/rtc/m48t08.c b/bsps/shared/dev/rtc/m48t08.c
index 3b600bd995..3b600bd995 100644
--- a/c/src/libchip/rtc/m48t08.c
+++ b/bsps/shared/dev/rtc/m48t08.c
diff --git a/c/src/libchip/rtc/m48t08_reg.c b/bsps/shared/dev/rtc/m48t08_reg.c
index 2174496fda..2174496fda 100644
--- a/c/src/libchip/rtc/m48t08_reg.c
+++ b/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
index 87d2041946..87d2041946 100644
--- a/c/src/libchip/rtc/m48t08_reg2.c
+++ b/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
index 2203249503..2203249503 100644
--- a/c/src/libchip/rtc/m48t08_reg4.c
+++ b/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
index 83044d752b..83044d752b 100644
--- a/c/src/libchip/rtc/m48t08_reg8.c
+++ b/bsps/shared/dev/rtc/m48t08_reg8.c
diff --git a/c/src/libchip/rtc/mc146818a.c b/bsps/shared/dev/rtc/mc146818a.c
index 2720ce5e8a..2720ce5e8a 100644
--- a/c/src/libchip/rtc/mc146818a.c
+++ b/bsps/shared/dev/rtc/mc146818a.c
diff --git a/c/src/libchip/rtc/mc146818a_ioreg.c b/bsps/shared/dev/rtc/mc146818a_ioreg.c
index 4c438a516a..4c438a516a 100644
--- a/c/src/libchip/rtc/mc146818a_ioreg.c
+++ b/bsps/shared/dev/rtc/mc146818a_ioreg.c
diff --git a/c/src/libchip/rtc/rtcprobe.c b/bsps/shared/dev/rtc/rtcprobe.c
index 71472ffd7c..71472ffd7c 100644
--- a/c/src/libchip/rtc/rtcprobe.c
+++ b/bsps/shared/dev/rtc/rtcprobe.c
diff --git a/c/src/libchip/serial/README b/bsps/shared/dev/serial/README
index 59bb9e90fa..59bb9e90fa 100644
--- a/c/src/libchip/serial/README
+++ b/bsps/shared/dev/serial/README
diff --git a/c/src/libchip/serial/README.mc68681 b/bsps/shared/dev/serial/README.mc68681
index e0966d0e10..e0966d0e10 100644
--- a/c/src/libchip/serial/README.mc68681
+++ b/bsps/shared/dev/serial/README.mc68681
diff --git a/c/src/libchip/serial/README.ns16550 b/bsps/shared/dev/serial/README.ns16550
index a0c31b5506..a0c31b5506 100644
--- a/c/src/libchip/serial/README.ns16550
+++ b/bsps/shared/dev/serial/README.ns16550
diff --git a/c/src/libchip/serial/README.xr88681 b/bsps/shared/dev/serial/README.xr88681
index 89b661143f..89b661143f 100644
--- a/c/src/libchip/serial/README.xr88681
+++ b/bsps/shared/dev/serial/README.xr88681
diff --git a/c/src/libchip/serial/README.z85c30 b/bsps/shared/dev/serial/README.z85c30
index f6e0b8cb11..f6e0b8cb11 100644
--- a/c/src/libchip/serial/README.z85c30
+++ b/bsps/shared/dev/serial/README.z85c30
diff --git a/c/src/libchip/serial/STATUS b/bsps/shared/dev/serial/STATUS
index 243b1a9de5..243b1a9de5 100644
--- a/c/src/libchip/serial/STATUS
+++ b/bsps/shared/dev/serial/STATUS
diff --git a/c/src/libchip/serial/mc68681.c b/bsps/shared/dev/serial/mc68681.c
index f4ddbd6a50..f4ddbd6a50 100644
--- a/c/src/libchip/serial/mc68681.c
+++ b/bsps/shared/dev/serial/mc68681.c
diff --git a/c/src/libchip/serial/mc68681_baud.c b/bsps/shared/dev/serial/mc68681_baud.c
index 0f8e87c2c2..0f8e87c2c2 100644
--- a/c/src/libchip/serial/mc68681_baud.c
+++ b/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
index 4623276303..4623276303 100644
--- a/c/src/libchip/serial/mc68681_p.h
+++ b/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
index fb92b8fcd3..fb92b8fcd3 100644
--- a/c/src/libchip/serial/mc68681_reg.c
+++ b/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
index 0e0121eb40..0e0121eb40 100644
--- a/c/src/libchip/serial/mc68681_reg2.c
+++ b/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
index e9dd94ce4b..e9dd94ce4b 100644
--- a/c/src/libchip/serial/mc68681_reg4.c
+++ b/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
index 402c2ffe1b..402c2ffe1b 100644
--- a/c/src/libchip/serial/mc68681_reg8.c
+++ b/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
index b42be96a26..b42be96a26 100644
--- a/c/src/libchip/serial/ns16550-context.c
+++ b/bsps/shared/dev/serial/ns16550-context.c
diff --git a/c/src/libchip/serial/ns16550.c b/bsps/shared/dev/serial/ns16550.c
index b1e5892c15..b1e5892c15 100644
--- a/c/src/libchip/serial/ns16550.c
+++ b/bsps/shared/dev/serial/ns16550.c
diff --git a/c/src/libchip/serial/serprobe.c b/bsps/shared/dev/serial/serprobe.c
index 7f8d392452..7f8d392452 100644
--- a/c/src/libchip/serial/serprobe.c
+++ b/bsps/shared/dev/serial/serprobe.c
diff --git a/c/src/libchip/serial/z85c30.c b/bsps/shared/dev/serial/z85c30.c
index 55df9d3451..55df9d3451 100644
--- a/c/src/libchip/serial/z85c30.c
+++ b/bsps/shared/dev/serial/z85c30.c
diff --git a/c/src/libchip/serial/z85c30_p.h b/bsps/shared/dev/serial/z85c30_p.h
index af2ed6507c..af2ed6507c 100644
--- a/c/src/libchip/serial/z85c30_p.h
+++ b/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
index 6e7b5d3494..6e7b5d3494 100644
--- a/c/src/libchip/serial/z85c30_reg.c
+++ b/bsps/shared/dev/serial/z85c30_reg.c
diff --git a/c/src/libchip/network/README b/bsps/shared/net/README
index ecb996e65f..ecb996e65f 100644
--- a/c/src/libchip/network/README
+++ b/bsps/shared/net/README
diff --git a/c/src/libchip/network/README.3com b/bsps/shared/net/README.3com
index b67061dec2..b67061dec2 100644
--- a/c/src/libchip/network/README.3com
+++ b/bsps/shared/net/README.3com
diff --git a/c/src/libchip/network/README.cs8900 b/bsps/shared/net/README.cs8900
index ecd575230f..ecd575230f 100644
--- a/c/src/libchip/network/README.cs8900
+++ b/bsps/shared/net/README.cs8900
diff --git a/c/src/libchip/network/README.dec21140 b/bsps/shared/net/README.dec21140
index f07bec7a36..f07bec7a36 100644
--- a/c/src/libchip/network/README.dec21140
+++ b/bsps/shared/net/README.dec21140
diff --git a/c/src/libchip/network/README.i82586 b/bsps/shared/net/README.i82586
index a0990367ef..a0990367ef 100644
--- a/c/src/libchip/network/README.i82586
+++ b/bsps/shared/net/README.i82586
diff --git a/c/src/libchip/network/README.open_eth b/bsps/shared/net/README.open_eth
index af9d8882cf..af9d8882cf 100644
--- a/c/src/libchip/network/README.open_eth
+++ b/bsps/shared/net/README.open_eth
diff --git a/c/src/libchip/network/README.sonic b/bsps/shared/net/README.sonic
index b2478b5571..b2478b5571 100644
--- a/c/src/libchip/network/README.sonic
+++ b/bsps/shared/net/README.sonic
diff --git a/c/src/libchip/network/README.tulipclone b/bsps/shared/net/README.tulipclone
index 90332bfd61..90332bfd61 100644
--- a/c/src/libchip/network/README.tulipclone
+++ b/bsps/shared/net/README.tulipclone
diff --git a/c/src/libchip/network/cs8900.c b/bsps/shared/net/cs8900.c
index 650a0e1fef..650a0e1fef 100644
--- a/c/src/libchip/network/cs8900.c
+++ b/bsps/shared/net/cs8900.c
diff --git a/c/src/libchip/network/cs8900.c.bsp b/bsps/shared/net/cs8900.c.bsp
index 7b7374a0f2..7b7374a0f2 100644
--- a/c/src/libchip/network/cs8900.c.bsp
+++ b/bsps/shared/net/cs8900.c.bsp
diff --git a/c/src/libchip/network/cs8900.h.bsp b/bsps/shared/net/cs8900.h.bsp
index 65ce0d2e93..65ce0d2e93 100644
--- a/c/src/libchip/network/cs8900.h.bsp
+++ b/bsps/shared/net/cs8900.h.bsp
diff --git a/c/src/libchip/network/dec21140.c b/bsps/shared/net/dec21140.c
index 6fd3d5b33f..6fd3d5b33f 100644
--- a/c/src/libchip/network/dec21140.c
+++ b/bsps/shared/net/dec21140.c
diff --git a/c/src/libchip/network/elnk.c b/bsps/shared/net/elnk.c
index 29adbe9c21..29adbe9c21 100644
--- a/c/src/libchip/network/elnk.c
+++ b/bsps/shared/net/elnk.c
diff --git a/c/src/libchip/network/greth.c b/bsps/shared/net/greth2.c
index 20be83ee48..20be83ee48 100644
--- a/c/src/libchip/network/greth.c
+++ b/bsps/shared/net/greth2.c
diff --git a/c/src/libchip/network/i82586.c b/bsps/shared/net/i82586.c
index c79af66e0d..c79af66e0d 100644
--- a/c/src/libchip/network/i82586.c
+++ b/bsps/shared/net/i82586.c
diff --git a/c/src/libchip/network/i82586reg.h b/bsps/shared/net/i82586reg.h
index e093aff68f..e093aff68f 100644
--- a/c/src/libchip/network/i82586reg.h
+++ b/bsps/shared/net/i82586reg.h
diff --git a/c/src/libchip/network/if_dc.c b/bsps/shared/net/if_dc.c
index e822a7c533..e822a7c533 100644
--- a/c/src/libchip/network/if_dc.c
+++ b/bsps/shared/net/if_dc.c
diff --git a/c/src/libchip/network/if_fxp.c b/bsps/shared/net/if_fxp.c
index 2fe9a5c403..2fe9a5c403 100644
--- a/c/src/libchip/network/if_fxp.c
+++ b/bsps/shared/net/if_fxp.c
diff --git a/c/src/libchip/network/if_fxpreg.h b/bsps/shared/net/if_fxpreg.h
index 9bf4e59ff5..9bf4e59ff5 100644
--- a/c/src/libchip/network/if_fxpreg.h
+++ b/bsps/shared/net/if_fxpreg.h
diff --git a/c/src/libchip/network/open_eth.c b/bsps/shared/net/open_eth.c
index 88df0882cf..88df0882cf 100644
--- a/c/src/libchip/network/open_eth.c
+++ b/bsps/shared/net/open_eth.c
diff --git a/c/src/libchip/network/smc91111.c b/bsps/shared/net/smc91111.c
index 45c87e8245..45c87e8245 100644
--- a/c/src/libchip/network/smc91111.c
+++ b/bsps/shared/net/smc91111.c
diff --git a/c/src/libchip/network/smc91111config.h b/bsps/shared/net/smc91111config.h
index 8340ca23bb..8340ca23bb 100644
--- a/c/src/libchip/network/smc91111config.h
+++ b/bsps/shared/net/smc91111config.h
diff --git a/c/src/libchip/network/sonic.c b/bsps/shared/net/sonic.c
index dc97008b8d..dc97008b8d 100644
--- a/c/src/libchip/network/sonic.c
+++ b/bsps/shared/net/sonic.c
diff --git a/bsps/shared/shared-sources.am b/bsps/shared/shared-sources.am
index 854710d804..d3503ddc01 100644
--- a/bsps/shared/shared-sources.am
+++ b/bsps/shared/shared-sources.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 80ef4018b8..191016701a 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