bsp/gumstix: Move libcpu files to BSP

Update #3254.

13 files changed, 22 insertions, 51 deletions

diff --git a/c/src/lib/libbsp/arm/gumstix/Makefile.am b/c/src/lib/libbsp/arm/gumstix/Makefile.am
index 42104577ad..c12dbf4b2c 100644
--- a/c/src/lib/libbsp/arm/gumstix/Makefile.am
+++ b/c/src/lib/libbsp/arm/gumstix/Makefile.am
@@ -9,6 +9,8 @@ dist_project_lib_DATA = bsp_specs
 
 include_HEADERS = include/bsp.h
 include_HEADERS += include/tm27.h
+include_HEADERS += include/pxa255.h
+include_HEADERS += include/ffuart.h
 
 include_bsp_HEADERS =
 
@@ -35,20 +37,25 @@ libbsp_a_SOURCES += \
   ../../shared/bspclean.c startup/bspstart.c startup/bspreset.c startup/memmap.c
 libbsp_a_SOURCES += ../../shared/cpucounterread.c
 libbsp_a_SOURCES += ../../shared/cpucounterdiff.c
+libbsp_a_SOURCES += clock/clock.c
+libbsp_a_SOURCES += timer/timer.c
 
 #console
 libbsp_a_SOURCES += console/uarts.c ../../shared/console.c \
   ../../shared/console_select.c  ../../shared/console_control.c \
   ../../shared/console_read.c ../../shared/console_write.c 
+libbsp_a_SOURCES += console/ffuart.c
 # IRQ
 include_bsp_HEADERS += ../../shared/include/irq-generic.h \
 	../../shared/include/irq-info.h
+include_bsp_HEADERS += include/bsp/irq.h
 libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
 libbsp_a_SOURCES += ../../shared/src/irq-generic.c
 libbsp_a_SOURCES += ../../shared/src/irq-info.c
 libbsp_a_SOURCES += ../../shared/src/irq-legacy.c
 libbsp_a_SOURCES += ../../shared/src/irq-server.c
 libbsp_a_SOURCES += ../../shared/src/irq-shell.c
+libbsp_a_SOURCES += irq/irq.c
 
 # Cache
 libbsp_a_SOURCES += ../../../libcpu/shared/src/cache_manager.c
@@ -67,11 +74,7 @@ rtl8019_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 endif
 
-libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel \
-    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \
-    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel \
-    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/ffuart.rel \
-    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/irq.rel
+libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel
 
 if ON_SKYEYE
 if HAS_NETWORKING
diff --git a/c/src/lib/libcpu/arm/pxa255/clock/clock.c b/c/src/lib/libbsp/arm/gumstix/clock/clock.c
index d8e8afb9dd..d8e8afb9dd 100644
--- a/c/src/lib/libcpu/arm/pxa255/clock/clock.c
+++ b/c/src/lib/libbsp/arm/gumstix/clock/clock.c
diff --git a/c/src/lib/libcpu/arm/pxa255/ffuart/ffuart.c b/c/src/lib/libbsp/arm/gumstix/console/ffuart.c
index 335fc6f4de..335fc6f4de 100644
--- a/c/src/lib/libcpu/arm/pxa255/ffuart/ffuart.c
+++ b/c/src/lib/libbsp/arm/gumstix/console/ffuart.c
diff --git a/c/src/lib/libcpu/arm/pxa255/irq/irq.h b/c/src/lib/libbsp/arm/gumstix/include/bsp/irq.h
index a8b5d24da1..a8b5d24da1 100644
--- a/c/src/lib/libcpu/arm/pxa255/irq/irq.h
+++ b/c/src/lib/libbsp/arm/gumstix/include/bsp/irq.h
diff --git a/c/src/lib/libcpu/arm/pxa255/include/ffuart.h b/c/src/lib/libbsp/arm/gumstix/include/ffuart.h
index 68df822183..68df822183 100644
--- a/c/src/lib/libcpu/arm/pxa255/include/ffuart.h
+++ b/c/src/lib/libbsp/arm/gumstix/include/ffuart.h
diff --git a/c/src/lib/libcpu/arm/pxa255/include/pxa255.h b/c/src/lib/libbsp/arm/gumstix/include/pxa255.h
index d5f2830c53..d5f2830c53 100644
--- a/c/src/lib/libcpu/arm/pxa255/include/pxa255.h
+++ b/c/src/lib/libbsp/arm/gumstix/include/pxa255.h
diff --git a/c/src/lib/libcpu/arm/pxa255/irq/irq.c b/c/src/lib/libbsp/arm/gumstix/irq/irq.c
index 425795b165..425795b165 100644
--- a/c/src/lib/libcpu/arm/pxa255/irq/irq.c
+++ b/c/src/lib/libbsp/arm/gumstix/irq/irq.c
diff --git a/c/src/lib/libbsp/arm/gumstix/make/custom/gumstix.cfg b/c/src/lib/libbsp/arm/gumstix/make/custom/gumstix.cfg
index a8d9fd3647..d42b44695b 100644
--- a/c/src/lib/libbsp/arm/gumstix/make/custom/gumstix.cfg
+++ b/c/src/lib/libbsp/arm/gumstix/make/custom/gumstix.cfg
@@ -5,7 +5,7 @@
 include $(RTEMS_ROOT)/make/custom/default.cfg
 
 RTEMS_CPU=arm
-RTEMS_CPU_MODEL=pxa255
+RTEMS_CPU_MODEL=shared
 
 #  This contains the compiler options necessary to select the CPU model
 #  and (hopefully) optimize for it. 
diff --git a/c/src/lib/libbsp/arm/gumstix/preinstall.am b/c/src/lib/libbsp/arm/gumstix/preinstall.am
index 23dbe2a207..99477a8ded 100644
--- a/c/src/lib/libbsp/arm/gumstix/preinstall.am
+++ b/c/src/lib/libbsp/arm/gumstix/preinstall.am
@@ -45,6 +45,14 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
 
+$(PROJECT_INCLUDE)/pxa255.h: include/pxa255.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pxa255.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/pxa255.h
+
+$(PROJECT_INCLUDE)/ffuart.h: include/ffuart.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ffuart.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/ffuart.h
+
 $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
@@ -69,6 +77,10 @@ $(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INC
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
 
+$(PROJECT_INCLUDE)/bsp/irq.h: include/bsp/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
+
 if ON_SKYEYE
 endif
 if ON_SKYEYE
diff --git a/c/src/lib/libcpu/arm/pxa255/timer/timer.c b/c/src/lib/libbsp/arm/gumstix/timer/timer.c
index 7eb3d5b811..7eb3d5b811 100644
--- a/c/src/lib/libcpu/arm/pxa255/timer/timer.c
+++ b/c/src/lib/libbsp/arm/gumstix/timer/timer.c
diff --git a/c/src/lib/libcpu/arm/Makefile.am b/c/src/lib/libcpu/arm/Makefile.am
index 83fe0d58b5..c80f2336f0 100644
--- a/c/src/lib/libcpu/arm/Makefile.am
+++ b/c/src/lib/libcpu/arm/Makefile.am
@@ -25,36 +25,6 @@ shared_arm920_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/shared/src
 shared_arm920_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
-if pxa255
-include_HEADERS = pxa255/include/pxa255.h pxa255/include/ffuart.h
-
-## pxa255/clock
-noinst_PROGRAMS += pxa255/clock.rel
-pxa255_clock_rel_SOURCES = pxa255/clock/clock.c
-pxa255_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
-pxa255_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-## pxa255/timer
-noinst_PROGRAMS += pxa255/timer.rel
-pxa255_timer_rel_SOURCES = pxa255/timer/timer.c
-pxa255_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
-pxa255_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-## pxa255/ffuart
-noinst_PROGRAMS += pxa255/ffuart.rel
-pxa255_ffuart_rel_SOURCES = pxa255/ffuart/ffuart.c
-pxa255_ffuart_rel_CPPFLAGS = $(AM_CPPFLAGS)
-pxa255_ffuart_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-## pxa255/interrupt
-include_bsp_HEADERS += pxa255/irq/irq.h
-noinst_PROGRAMS += pxa255/irq.rel
-pxa255_irq_rel_SOURCES = pxa255/irq/irq.c \
-    pxa255/irq/irq.h
-pxa255_irq_rel_CPPFLAGS = $(AM_CPPFLAGS)
-pxa255_irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-endif
-
 if at91rm9200
 include_HEADERS = at91rm9200/include/at91rm9200.h at91rm9200/include/at91rm9200_dbgu.h \
     at91rm9200/include/at91rm9200_emac.h at91rm9200/include/at91rm9200_gpio.h \
diff --git a/c/src/lib/libcpu/arm/configure.ac b/c/src/lib/libcpu/arm/configure.ac
index 81edac8dc4..ed0f41499e 100644
--- a/c/src/lib/libcpu/arm/configure.ac
+++ b/c/src/lib/libcpu/arm/configure.ac
@@ -24,12 +24,11 @@ AM_CONDITIONAL(shared, test "$RTEMS_CPU_MODEL" = "arm1136" || \
 		       test "$RTEMS_CPU_MODEL" = "mc9328mxl" || \
 		       test "$RTEMS_CPU_MODEL" = "s3c2410" || \
 		       test "$RTEMS_CPU_MODEL" = "s3c2400" || \
-		       test "$RTEMS_CPU_MODEL" = "pxa255")
+		       test "$RTEMS_CPU_MODEL" = "shared")
 
 AM_CONDITIONAL(at91rm9200, test "$RTEMS_CPU_MODEL" = "at91rm9200")
 AM_CONDITIONAL(mc9328mxl, test "$RTEMS_CPU_MODEL" = "mc9328mxl")
 AM_CONDITIONAL(lpc22xx, test "$RTEMS_CPU_MODEL" = "lpc22xx")
-AM_CONDITIONAL(pxa255, test "$RTEMS_CPU_MODEL" = "pxa255")
 AM_CONDITIONAL(s3c24xx, test "$RTEMS_CPU_MODEL" = "s3c2400" ||\
                         test "$RTEMS_CPU_MODEL" = "s3c2410")
 
diff --git a/c/src/lib/libcpu/arm/preinstall.am b/c/src/lib/libcpu/arm/preinstall.am
index 751a085f58..9c83ab43a8 100644
--- a/c/src/lib/libcpu/arm/preinstall.am
+++ b/c/src/lib/libcpu/arm/preinstall.am
@@ -37,19 +37,6 @@ $(PROJECT_INCLUDE)/libcpu/arm-cp15.h: shared/include/arm-cp15.h $(PROJECT_INCLUD
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/arm-cp15.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/arm-cp15.h
 endif
-if pxa255
-$(PROJECT_INCLUDE)/pxa255.h: pxa255/include/pxa255.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pxa255.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/pxa255.h
-
-$(PROJECT_INCLUDE)/ffuart.h: pxa255/include/ffuart.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ffuart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ffuart.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: pxa255/irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-endif
 if at91rm9200
 $(PROJECT_INCLUDE)/at91rm9200.h: at91rm9200/include/at91rm9200.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200.h