bsp/csb337: Move libcpu files to BSP

Update #3254.

21 files changed, 54 insertions, 99 deletions

diff --git a/c/src/lib/libbsp/arm/csb337/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am
index 9d414c14f1..c490467e51 100644
--- a/c/src/lib/libbsp/arm/csb337/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb337/Makefile.am
@@ -8,6 +8,15 @@ dist_project_lib_DATA = bsp_specs
 
 include_HEADERS = include/bsp.h
 include_HEADERS += include/tm27.h
+include_HEADERS += include/at91rm9200_dbgu.h
+include_HEADERS += include/at91rm9200_emac.h
+include_HEADERS += include/at91rm9200_gpio.h
+include_HEADERS += include/at91rm9200.h
+include_HEADERS += include/at91rm9200_mem.h
+include_HEADERS += include/at91rm9200_pmc.h
+include_HEADERS += include/at91rm9200_usart.h
+include_HEADERS += include/bits.h
+
 if ENABLE_LCD
 include_HEADERS += include/sed1356.h
 endif
@@ -59,19 +68,26 @@ libbsp_a_SOURCES = \
     ../../shared/gnatinstallhandler.c
 libbsp_a_SOURCES += ../../shared/cpucounterread.c
 libbsp_a_SOURCES += ../../shared/cpucounterdiff.c
+libbsp_a_SOURCES += startup/pmc.c
+libbsp_a_SOURCES += clock/clock.c
+libbsp_a_SOURCES += timer/timer.c
 # console
 libbsp_a_SOURCES += ../../shared/console.c console/uarts.c \
     ../../shared/console_select.c  ../../shared/console_control.c \
     ../../shared/console_read.c ../../shared/console_write.c 
+libbsp_a_SOURCES += console/dbgu.c
+libbsp_a_SOURCES += console/usart.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
 if ENABLE_LCD
 libbsp_a_SOURCES += console/sed1356.c console/fbcons.c
 endif
@@ -99,13 +115,7 @@ network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS)
 network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 endif
 
-libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel \
-    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \
-    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/dbgu.rel \
-    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/usart.rel \
-    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel \
-    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/pmc.rel \
-    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/irq.rel
+libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel
 if HAS_NETWORKING
 libbsp_a_LIBADD += network.rel
 endif
diff --git a/c/src/lib/libcpu/arm/at91rm9200/clock/clock.c b/c/src/lib/libbsp/arm/csb337/clock/clock.c
index f231a04697..f231a04697 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/clock/clock.c
+++ b/c/src/lib/libbsp/arm/csb337/clock/clock.c
diff --git a/c/src/lib/libcpu/arm/at91rm9200/dbgu/dbgu.c b/c/src/lib/libbsp/arm/csb337/console/dbgu.c
index 1a16762e32..1a16762e32 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/dbgu/dbgu.c
+++ b/c/src/lib/libbsp/arm/csb337/console/dbgu.c
diff --git a/c/src/lib/libcpu/arm/at91rm9200/usart/usart.c b/c/src/lib/libbsp/arm/csb337/console/usart.c
index 23b877ce64..23b877ce64 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/usart/usart.c
+++ b/c/src/lib/libbsp/arm/csb337/console/usart.c
diff --git a/c/src/lib/libcpu/arm/at91rm9200/include/at91rm9200.h b/c/src/lib/libbsp/arm/csb337/include/at91rm9200.h
index 3ed64c7073..3ed64c7073 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/include/at91rm9200.h
+++ b/c/src/lib/libbsp/arm/csb337/include/at91rm9200.h
diff --git a/c/src/lib/libcpu/arm/at91rm9200/include/at91rm9200_dbgu.h b/c/src/lib/libbsp/arm/csb337/include/at91rm9200_dbgu.h
index 9a65483db0..9a65483db0 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/include/at91rm9200_dbgu.h
+++ b/c/src/lib/libbsp/arm/csb337/include/at91rm9200_dbgu.h
diff --git a/c/src/lib/libcpu/arm/at91rm9200/include/at91rm9200_emac.h b/c/src/lib/libbsp/arm/csb337/include/at91rm9200_emac.h
index 77c42d1526..77c42d1526 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/include/at91rm9200_emac.h
+++ b/c/src/lib/libbsp/arm/csb337/include/at91rm9200_emac.h
diff --git a/c/src/lib/libcpu/arm/at91rm9200/include/at91rm9200_gpio.h b/c/src/lib/libbsp/arm/csb337/include/at91rm9200_gpio.h
index 9fa18ad476..9fa18ad476 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/include/at91rm9200_gpio.h
+++ b/c/src/lib/libbsp/arm/csb337/include/at91rm9200_gpio.h
diff --git a/c/src/lib/libcpu/arm/at91rm9200/include/at91rm9200_mem.h b/c/src/lib/libbsp/arm/csb337/include/at91rm9200_mem.h
index fafb18f6e8..fafb18f6e8 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/include/at91rm9200_mem.h
+++ b/c/src/lib/libbsp/arm/csb337/include/at91rm9200_mem.h
diff --git a/c/src/lib/libcpu/arm/at91rm9200/include/at91rm9200_pmc.h b/c/src/lib/libbsp/arm/csb337/include/at91rm9200_pmc.h
index 70cf77fc5a..70cf77fc5a 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/include/at91rm9200_pmc.h
+++ b/c/src/lib/libbsp/arm/csb337/include/at91rm9200_pmc.h
diff --git a/c/src/lib/libcpu/arm/at91rm9200/include/at91rm9200_usart.h b/c/src/lib/libbsp/arm/csb337/include/at91rm9200_usart.h
index 387f353992..387f353992 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/include/at91rm9200_usart.h
+++ b/c/src/lib/libbsp/arm/csb337/include/at91rm9200_usart.h
diff --git a/c/src/lib/libcpu/arm/at91rm9200/include/bits.h b/c/src/lib/libbsp/arm/csb337/include/bits.h
index 6f2c4036b6..6f2c4036b6 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/include/bits.h
+++ b/c/src/lib/libbsp/arm/csb337/include/bits.h
diff --git a/c/src/lib/libcpu/arm/at91rm9200/irq/irq.h b/c/src/lib/libbsp/arm/csb337/include/bsp/irq.h
index 771059a3e4..771059a3e4 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/irq/irq.h
+++ b/c/src/lib/libbsp/arm/csb337/include/bsp/irq.h
diff --git a/c/src/lib/libcpu/arm/at91rm9200/irq/irq.c b/c/src/lib/libbsp/arm/csb337/irq/irq.c
index 95e93845b9..95e93845b9 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/irq/irq.c
+++ b/c/src/lib/libbsp/arm/csb337/irq/irq.c
diff --git a/c/src/lib/libbsp/arm/csb337/make/custom/csb337.cfg b/c/src/lib/libbsp/arm/csb337/make/custom/csb337.cfg
index a579c1903f..56e2d7a116 100644
--- a/c/src/lib/libbsp/arm/csb337/make/custom/csb337.cfg
+++ b/c/src/lib/libbsp/arm/csb337/make/custom/csb337.cfg
@@ -5,7 +5,7 @@
 include $(RTEMS_ROOT)/make/custom/default.cfg
 
 RTEMS_CPU=arm
-RTEMS_CPU_MODEL=at91rm9200
+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/csb337/preinstall.am b/c/src/lib/libbsp/arm/csb337/preinstall.am
index c293475f1b..57ab234874 100644
--- a/c/src/lib/libbsp/arm/csb337/preinstall.am
+++ b/c/src/lib/libbsp/arm/csb337/preinstall.am
@@ -45,6 +45,38 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
 
+$(PROJECT_INCLUDE)/at91rm9200_dbgu.h: include/at91rm9200_dbgu.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_dbgu.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_dbgu.h
+
+$(PROJECT_INCLUDE)/at91rm9200_emac.h: include/at91rm9200_emac.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_emac.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_emac.h
+
+$(PROJECT_INCLUDE)/at91rm9200_gpio.h: include/at91rm9200_gpio.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_gpio.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_gpio.h
+
+$(PROJECT_INCLUDE)/at91rm9200.h: include/at91rm9200.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200.h
+
+$(PROJECT_INCLUDE)/at91rm9200_mem.h: include/at91rm9200_mem.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_mem.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_mem.h
+
+$(PROJECT_INCLUDE)/at91rm9200_pmc.h: include/at91rm9200_pmc.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_pmc.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_pmc.h
+
+$(PROJECT_INCLUDE)/at91rm9200_usart.h: include/at91rm9200_usart.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_usart.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_usart.h
+
+$(PROJECT_INCLUDE)/bits.h: include/bits.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bits.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bits.h
+
 if ENABLE_LCD
 $(PROJECT_INCLUDE)/sed1356.h: include/sed1356.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sed1356.h
@@ -110,3 +142,7 @@ $(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
+
diff --git a/c/src/lib/libcpu/arm/at91rm9200/pmc/pmc.c b/c/src/lib/libbsp/arm/csb337/startup/pmc.c
index a15bf3c075..a15bf3c075 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/pmc/pmc.c
+++ b/c/src/lib/libbsp/arm/csb337/startup/pmc.c
diff --git a/c/src/lib/libcpu/arm/at91rm9200/timer/timer.c b/c/src/lib/libbsp/arm/csb337/timer/timer.c
index c65dd8096a..c65dd8096a 100644
--- a/c/src/lib/libcpu/arm/at91rm9200/timer/timer.c
+++ b/c/src/lib/libbsp/arm/csb337/timer/timer.c
diff --git a/c/src/lib/libcpu/arm/Makefile.am b/c/src/lib/libcpu/arm/Makefile.am
index 364dc023fc..12174ea45c 100644
--- a/c/src/lib/libcpu/arm/Makefile.am
+++ b/c/src/lib/libcpu/arm/Makefile.am
@@ -25,51 +25,5 @@ shared_arm920_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/shared/src
 shared_arm920_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 \
-    at91rm9200/include/at91rm9200_mem.h at91rm9200/include/at91rm9200_pmc.h \
-    at91rm9200/include/bits.h at91rm9200/include/at91rm9200_usart.h
-
-## at91rm9200/clock
-noinst_PROGRAMS += at91rm9200/clock.rel
-at91rm9200_clock_rel_SOURCES = at91rm9200/clock/clock.c
-at91rm9200_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
-at91rm9200_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-## at91rm9200/dbgu
-noinst_PROGRAMS += at91rm9200/dbgu.rel
-at91rm9200_dbgu_rel_SOURCES = at91rm9200/dbgu/dbgu.c
-at91rm9200_dbgu_rel_CPPFLAGS = $(AM_CPPFLAGS)
-at91rm9200_dbgu_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-## at91rm9200/usart
-noinst_PROGRAMS += at91rm9200/usart.rel
-at91rm9200_usart_rel_SOURCES = at91rm9200/usart/usart.c
-at91rm9200_usart_rel_CPPFLAGS = $(AM_CPPFLAGS)
-at91rm9200_usart_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-## at91rm9200/timer
-noinst_PROGRAMS += at91rm9200/timer.rel
-at91rm9200_timer_rel_SOURCES = at91rm9200/timer/timer.c
-at91rm9200_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
-at91rm9200_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-## at91rm9200/pmc
-noinst_PROGRAMS += at91rm9200/pmc.rel
-at91rm9200_pmc_rel_SOURCES = at91rm9200/pmc/pmc.c
-at91rm9200_pmc_rel_CPPFLAGS = $(AM_CPPFLAGS)
-at91rm9200_pmc_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-## at91rm9200/interrupt
-include_bsp_HEADERS += at91rm9200/irq/irq.h
-
-noinst_PROGRAMS += at91rm9200/irq.rel
-at91rm9200_irq_rel_SOURCES = at91rm9200/irq/irq.c \
-    at91rm9200/irq/irq.h
-at91rm9200_irq_rel_CPPFLAGS = $(AM_CPPFLAGS)
-at91rm9200_irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-endif
-
 include $(srcdir)/preinstall.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/arm/configure.ac b/c/src/lib/libcpu/arm/configure.ac
index 0a34ed82cd..c72c34eb19 100644
--- a/c/src/lib/libcpu/arm/configure.ac
+++ b/c/src/lib/libcpu/arm/configure.ac
@@ -20,11 +20,8 @@ RTEMS_CANONICALIZE_TOOLS
 RTEMS_PROG_CCAS
 
 AM_CONDITIONAL(shared, test "$RTEMS_CPU_MODEL" = "arm1136" || \
-		       test "$RTEMS_CPU_MODEL" = "at91rm9200" || \
 		       test "$RTEMS_CPU_MODEL" = "shared")
 
-AM_CONDITIONAL(at91rm9200, test "$RTEMS_CPU_MODEL" = "at91rm9200")
-
 RTEMS_AMPOLISH3
 
 # Explicitly list all Makefiles here
diff --git a/c/src/lib/libcpu/arm/preinstall.am b/c/src/lib/libcpu/arm/preinstall.am
index 32ddb72cbf..fbdff2099b 100644
--- a/c/src/lib/libcpu/arm/preinstall.am
+++ b/c/src/lib/libcpu/arm/preinstall.am
@@ -13,11 +13,6 @@ all-am: $(PREINSTALL_FILES)
 PREINSTALL_FILES =
 CLEANFILES = $(PREINSTALL_FILES)
 
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(MKDIR_P) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
-
 $(PROJECT_INCLUDE)/bsp/$(dirstamp):
 	@$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
 	@: > $(PROJECT_INCLUDE)/bsp/$(dirstamp)
@@ -37,40 +32,3 @@ $(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 at91rm9200
-$(PROJECT_INCLUDE)/at91rm9200.h: at91rm9200/include/at91rm9200.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200.h
-
-$(PROJECT_INCLUDE)/at91rm9200_dbgu.h: at91rm9200/include/at91rm9200_dbgu.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_dbgu.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_dbgu.h
-
-$(PROJECT_INCLUDE)/at91rm9200_emac.h: at91rm9200/include/at91rm9200_emac.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_emac.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_emac.h
-
-$(PROJECT_INCLUDE)/at91rm9200_gpio.h: at91rm9200/include/at91rm9200_gpio.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_gpio.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_gpio.h
-
-$(PROJECT_INCLUDE)/at91rm9200_mem.h: at91rm9200/include/at91rm9200_mem.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_mem.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_mem.h
-
-$(PROJECT_INCLUDE)/at91rm9200_pmc.h: at91rm9200/include/at91rm9200_pmc.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_pmc.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_pmc.h
-
-$(PROJECT_INCLUDE)/bits.h: at91rm9200/include/bits.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bits.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bits.h
-
-$(PROJECT_INCLUDE)/at91rm9200_usart.h: at91rm9200/include/at91rm9200_usart.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_usart.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_usart.h
-
-$(PROJECT_INCLUDE)/bsp/irq.h: at91rm9200/irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-endif