bsps: Move libchip to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

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>

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

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

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
 

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 \

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