diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-12-08 07:46:48 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-12-08 09:30:43 +0100 |
commit | 26ff9fd62ff694e17b3748c6c7a7fa04ea9b9157 (patch) | |
tree | c9d9509ee3c9efc4eab72c6529bb3d97e494aabb /c | |
parent | bsps/arm: Remove obsolete s3c2400 (diff) | |
download | rtems-26ff9fd62ff694e17b3748c6c7a7fa04ea9b9157.tar.bz2 |
bsp/csb336: Move libcpu files to BSP
Update #3254.
Diffstat (limited to 'c')
-rw-r--r-- | c/src/lib/libbsp/arm/csb336/Makefile.am | 10 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/csb336/clock/clockdrv.c (renamed from c/src/lib/libcpu/arm/mc9328mxl/clock/clockdrv.c) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/csb336/include/bsp/irq.h (renamed from c/src/lib/libcpu/arm/mc9328mxl/irq/irq.h) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/csb336/include/mc9328mxl.h (renamed from c/src/lib/libcpu/arm/mc9328mxl/include/mc9328mxl.h) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/csb336/irq/irq.c (renamed from c/src/lib/libcpu/arm/mc9328mxl/irq/irq.c) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/csb336/make/custom/csb336.cfg | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/csb336/preinstall.am | 8 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/csb336/timer/timer.c (renamed from c/src/lib/libcpu/arm/mc9328mxl/timer/timer.c) | 0 | ||||
-rw-r--r-- | c/src/lib/libcpu/arm/Makefile.am | 25 | ||||
-rw-r--r-- | c/src/lib/libcpu/arm/configure.ac | 2 | ||||
-rw-r--r-- | c/src/lib/libcpu/arm/preinstall.am | 9 |
11 files changed, 15 insertions, 41 deletions
diff --git a/c/src/lib/libbsp/arm/csb336/Makefile.am b/c/src/lib/libbsp/arm/csb336/Makefile.am index b91d8f7049..2faa7175ef 100644 --- a/c/src/lib/libbsp/arm/csb336/Makefile.am +++ b/c/src/lib/libbsp/arm/csb336/Makefile.am @@ -8,6 +8,7 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_HEADERS += include/mc9328mxl.h include_bsp_HEADERS = libbsp_a_CPPFLAGS = @@ -36,17 +37,21 @@ libbsp_a_SOURCES += \ ../../shared/sbrk.c ../../shared/gnatinstallhandler.c libbsp_a_SOURCES += ../../shared/cpucounterread.c libbsp_a_SOURCES += ../../shared/cpucounterdiff.c +libbsp_a_SOURCES += clock/clockdrv.c +libbsp_a_SOURCES += timer/timer.c # console libbsp_a_SOURCES += console/uart.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 @@ -62,10 +67,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@/timer.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 diff --git a/c/src/lib/libcpu/arm/mc9328mxl/clock/clockdrv.c b/c/src/lib/libbsp/arm/csb336/clock/clockdrv.c index 576a8278d5..576a8278d5 100644 --- a/c/src/lib/libcpu/arm/mc9328mxl/clock/clockdrv.c +++ b/c/src/lib/libbsp/arm/csb336/clock/clockdrv.c diff --git a/c/src/lib/libcpu/arm/mc9328mxl/irq/irq.h b/c/src/lib/libbsp/arm/csb336/include/bsp/irq.h index eb56fdd887..eb56fdd887 100644 --- a/c/src/lib/libcpu/arm/mc9328mxl/irq/irq.h +++ b/c/src/lib/libbsp/arm/csb336/include/bsp/irq.h diff --git a/c/src/lib/libcpu/arm/mc9328mxl/include/mc9328mxl.h b/c/src/lib/libbsp/arm/csb336/include/mc9328mxl.h index dd0516283a..dd0516283a 100644 --- a/c/src/lib/libcpu/arm/mc9328mxl/include/mc9328mxl.h +++ b/c/src/lib/libbsp/arm/csb336/include/mc9328mxl.h diff --git a/c/src/lib/libcpu/arm/mc9328mxl/irq/irq.c b/c/src/lib/libbsp/arm/csb336/irq/irq.c index e5887b9717..e5887b9717 100644 --- a/c/src/lib/libcpu/arm/mc9328mxl/irq/irq.c +++ b/c/src/lib/libbsp/arm/csb336/irq/irq.c diff --git a/c/src/lib/libbsp/arm/csb336/make/custom/csb336.cfg b/c/src/lib/libbsp/arm/csb336/make/custom/csb336.cfg index 535b66610d..bc2f65cc9c 100644 --- a/c/src/lib/libbsp/arm/csb336/make/custom/csb336.cfg +++ b/c/src/lib/libbsp/arm/csb336/make/custom/csb336.cfg @@ -5,7 +5,7 @@ include $(RTEMS_ROOT)/make/custom/default.cfg RTEMS_CPU=arm -RTEMS_CPU_MODEL=mc9328mxl +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/csb336/preinstall.am b/c/src/lib/libbsp/arm/csb336/preinstall.am index b3c0f66fe8..dbdb788360 100644 --- a/c/src/lib/libbsp/arm/csb336/preinstall.am +++ b/c/src/lib/libbsp/arm/csb336/preinstall.am @@ -45,6 +45,10 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/mc9328mxl.h: include/mc9328mxl.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mc9328mxl.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/mc9328mxl.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h @@ -69,3 +73,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/mc9328mxl/timer/timer.c b/c/src/lib/libbsp/arm/csb336/timer/timer.c index 66ff4a0bf4..66ff4a0bf4 100644 --- a/c/src/lib/libcpu/arm/mc9328mxl/timer/timer.c +++ b/c/src/lib/libbsp/arm/csb336/timer/timer.c diff --git a/c/src/lib/libcpu/arm/Makefile.am b/c/src/lib/libcpu/arm/Makefile.am index c80f2336f0..60bff6b29c 100644 --- a/c/src/lib/libcpu/arm/Makefile.am +++ b/c/src/lib/libcpu/arm/Makefile.am @@ -71,31 +71,6 @@ at91rm9200_irq_rel_CPPFLAGS = $(AM_CPPFLAGS) at91rm9200_irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif -if mc9328mxl -include_HEADERS = mc9328mxl/include/mc9328mxl.h - -## mc9328mxl/clock -noinst_PROGRAMS += mc9328mxl/clock.rel -mc9328mxl_clock_rel_SOURCES = mc9328mxl/clock/clockdrv.c -mc9328mxl_clock_rel_CPPFLAGS = $(AM_CPPFLAGS) -mc9328mxl_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -## mc9328mxl/timer -noinst_PROGRAMS += mc9328mxl/timer.rel -mc9328mxl_timer_rel_SOURCES = mc9328mxl/timer/timer.c -mc9328mxl_timer_rel_CPPFLAGS = $(AM_CPPFLAGS) -mc9328mxl_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -## mc9328mxl/interrupt -include_bsp_HEADERS += mc9328mxl/irq/irq.h - -noinst_PROGRAMS += mc9328mxl/irq.rel -mc9328mxl_irq_rel_SOURCES = mc9328mxl/irq/irq.c \ - mc9328mxl/irq/irq.h -mc9328mxl_irq_rel_CPPFLAGS = $(AM_CPPFLAGS) -mc9328mxl_irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -endif - if s3c24xx include_HEADERS = s3c24xx/include/s3c24xx.h s3c24xx/include/s3c2400.h s3c24xx/include/s3c2410.h diff --git a/c/src/lib/libcpu/arm/configure.ac b/c/src/lib/libcpu/arm/configure.ac index 24f18c39ff..67cac9a862 100644 --- a/c/src/lib/libcpu/arm/configure.ac +++ b/c/src/lib/libcpu/arm/configure.ac @@ -21,12 +21,10 @@ RTEMS_PROG_CCAS AM_CONDITIONAL(shared, test "$RTEMS_CPU_MODEL" = "arm1136" || \ test "$RTEMS_CPU_MODEL" = "at91rm9200" || \ - test "$RTEMS_CPU_MODEL" = "mc9328mxl" || \ test "$RTEMS_CPU_MODEL" = "s3c2410" || \ 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(s3c24xx, test "$RTEMS_CPU_MODEL" = "s3c2410") diff --git a/c/src/lib/libcpu/arm/preinstall.am b/c/src/lib/libcpu/arm/preinstall.am index 9c83ab43a8..68f30b6482 100644 --- a/c/src/lib/libcpu/arm/preinstall.am +++ b/c/src/lib/libcpu/arm/preinstall.am @@ -74,15 +74,6 @@ $(PROJECT_INCLUDE)/bsp/irq.h: at91rm9200/irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirs $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h endif -if mc9328mxl -$(PROJECT_INCLUDE)/mc9328mxl.h: mc9328mxl/include/mc9328mxl.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mc9328mxl.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mc9328mxl.h - -$(PROJECT_INCLUDE)/bsp/irq.h: mc9328mxl/irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h -endif if s3c24xx $(PROJECT_INCLUDE)/s3c24xx.h: s3c24xx/include/s3c24xx.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/s3c24xx.h |