diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-12-08 07:52:41 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-12-08 13:03:46 +0100 |
commit | 78297109857d5203130c64d1531d5264382e6226 (patch) | |
tree | df5abcde5b42810ba30a4149fcc45b52d51b80c2 /c | |
parent | bsp/csb336: Move libcpu files to BSP (diff) | |
download | rtems-78297109857d5203130c64d1531d5264382e6226.tar.bz2 |
bsp/rtl22xx: Move libcpu files to BSP
Update #3254.
Diffstat (limited to 'c')
-rw-r--r-- | c/src/lib/libbsp/arm/rtl22xx/Makefile.am | 10 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/rtl22xx/clock/clockdrv.c (renamed from c/src/lib/libcpu/arm/lpc22xx/clock/clockdrv.c) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/rtl22xx/include/bsp/irq.h (renamed from c/src/lib/libcpu/arm/lpc22xx/irq/irq.h) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/rtl22xx/include/lpc22xx.h (renamed from c/src/lib/libcpu/arm/lpc22xx/include/lpc22xx.h) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/rtl22xx/irq/irq.c (renamed from c/src/lib/libcpu/arm/lpc22xx/irq/irq.c) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/rtl22xx/make/custom/rtl22xx.cfg | 1 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/rtl22xx/preinstall.am | 8 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/rtl22xx/timer/lpc_timer.h (renamed from c/src/lib/libcpu/arm/lpc22xx/timer/lpc_timer.h) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/rtl22xx/timer/timer.c (renamed from c/src/lib/libcpu/arm/lpc22xx/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 | 1 | ||||
-rw-r--r-- | c/src/lib/libcpu/arm/preinstall.am | 9 |
12 files changed, 14 insertions, 40 deletions
diff --git a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am index 70d0ff9078..a64740af87 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am +++ b/c/src/lib/libbsp/arm/rtl22xx/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/lpc22xx.h include_bsp_HEADERS = @@ -38,6 +39,8 @@ libbsp_a_SOURCES += \ ../../shared/gnatinstallhandler.c libbsp_a_SOURCES += ../../shared/cpucounterread.c libbsp_a_SOURCES += ../../shared/cpucounterdiff.c +libbsp_a_SOURCES += timer/timer.c +libbsp_a_SOURCES += clock/clockdrv.c # console libbsp_a_SOURCES += ../../shared/console.c \ ../../shared/console_select.c ../../shared/console_control.c \ @@ -45,12 +48,14 @@ libbsp_a_SOURCES += ../../shared/console.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 # debugio libbsp_a_SOURCES += console/uart.c @@ -67,10 +72,7 @@ network_rel_CPPFLAGS = $(AM_CPPFLAGS) $(network_CPPFLAGS) network_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif -libbsp_a_LIBADD = \ - ../../../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 = if HAS_NETWORKING libbsp_a_LIBADD += network.rel endif diff --git a/c/src/lib/libcpu/arm/lpc22xx/clock/clockdrv.c b/c/src/lib/libbsp/arm/rtl22xx/clock/clockdrv.c index 3a0cf0a3a1..3a0cf0a3a1 100644 --- a/c/src/lib/libcpu/arm/lpc22xx/clock/clockdrv.c +++ b/c/src/lib/libbsp/arm/rtl22xx/clock/clockdrv.c diff --git a/c/src/lib/libcpu/arm/lpc22xx/irq/irq.h b/c/src/lib/libbsp/arm/rtl22xx/include/bsp/irq.h index 31825ca56e..31825ca56e 100644 --- a/c/src/lib/libcpu/arm/lpc22xx/irq/irq.h +++ b/c/src/lib/libbsp/arm/rtl22xx/include/bsp/irq.h diff --git a/c/src/lib/libcpu/arm/lpc22xx/include/lpc22xx.h b/c/src/lib/libbsp/arm/rtl22xx/include/lpc22xx.h index babaf8343d..babaf8343d 100644 --- a/c/src/lib/libcpu/arm/lpc22xx/include/lpc22xx.h +++ b/c/src/lib/libbsp/arm/rtl22xx/include/lpc22xx.h diff --git a/c/src/lib/libcpu/arm/lpc22xx/irq/irq.c b/c/src/lib/libbsp/arm/rtl22xx/irq/irq.c index 83e140bd7b..83e140bd7b 100644 --- a/c/src/lib/libcpu/arm/lpc22xx/irq/irq.c +++ b/c/src/lib/libbsp/arm/rtl22xx/irq/irq.c diff --git a/c/src/lib/libbsp/arm/rtl22xx/make/custom/rtl22xx.cfg b/c/src/lib/libbsp/arm/rtl22xx/make/custom/rtl22xx.cfg index 8d4574638a..9b195477f8 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/make/custom/rtl22xx.cfg +++ b/c/src/lib/libbsp/arm/rtl22xx/make/custom/rtl22xx.cfg @@ -5,7 +5,6 @@ include $(RTEMS_ROOT)/make/custom/default.cfg RTEMS_CPU=arm -RTEMS_CPU_MODEL=lpc22xx # This contains the compiler options necessary to select the CPU model # and (hopefully) optimize for it. diff --git a/c/src/lib/libbsp/arm/rtl22xx/preinstall.am b/c/src/lib/libbsp/arm/rtl22xx/preinstall.am index 7d8f37689f..1748114195 100644 --- a/c/src/lib/libbsp/arm/rtl22xx/preinstall.am +++ b/c/src/lib/libbsp/arm/rtl22xx/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)/lpc22xx.h: include/lpc22xx.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/lpc22xx.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/lpc22xx.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h @@ -73,3 +77,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/lpc22xx/timer/lpc_timer.h b/c/src/lib/libbsp/arm/rtl22xx/timer/lpc_timer.h index 364812ddb8..364812ddb8 100644 --- a/c/src/lib/libcpu/arm/lpc22xx/timer/lpc_timer.h +++ b/c/src/lib/libbsp/arm/rtl22xx/timer/lpc_timer.h diff --git a/c/src/lib/libcpu/arm/lpc22xx/timer/timer.c b/c/src/lib/libbsp/arm/rtl22xx/timer/timer.c index ad73aeda3c..ad73aeda3c 100644 --- a/c/src/lib/libcpu/arm/lpc22xx/timer/timer.c +++ b/c/src/lib/libbsp/arm/rtl22xx/timer/timer.c diff --git a/c/src/lib/libcpu/arm/Makefile.am b/c/src/lib/libcpu/arm/Makefile.am index 60bff6b29c..5f92a64310 100644 --- a/c/src/lib/libcpu/arm/Makefile.am +++ b/c/src/lib/libcpu/arm/Makefile.am @@ -96,30 +96,5 @@ s3c24xx_irq_rel_CPPFLAGS = $(AM_CPPFLAGS) s3c24xx_irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif -if lpc22xx -include_HEADERS = lpc22xx/include/lpc22xx.h - -## lpc22xx/clock -noinst_PROGRAMS += lpc22xx/clock.rel -lpc22xx_clock_rel_SOURCES = lpc22xx/clock/clockdrv.c -lpc22xx_clock_rel_CPPFLAGS = $(AM_CPPFLAGS) -lpc22xx_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -## lpc22xx/timer -noinst_PROGRAMS += lpc22xx/timer.rel -lpc22xx_timer_rel_SOURCES = lpc22xx/timer/timer.c -lpc22xx_timer_rel_CPPFLAGS = $(AM_CPPFLAGS) -lpc22xx_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -## lpc22xx/interrupt -include_bsp_HEADERS += lpc22xx/irq/irq.h - -noinst_PROGRAMS += lpc22xx/irq.rel -lpc22xx_irq_rel_SOURCES = lpc22xx/irq/irq.c \ - lpc22xx/irq/irq.h -lpc22xx_irq_rel_CPPFLAGS = $(AM_CPPFLAGS) -lpc22xx_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 67cac9a862..c524c205ad 100644 --- a/c/src/lib/libcpu/arm/configure.ac +++ b/c/src/lib/libcpu/arm/configure.ac @@ -25,7 +25,6 @@ AM_CONDITIONAL(shared, test "$RTEMS_CPU_MODEL" = "arm1136" || \ test "$RTEMS_CPU_MODEL" = "shared") AM_CONDITIONAL(at91rm9200, test "$RTEMS_CPU_MODEL" = "at91rm9200") -AM_CONDITIONAL(lpc22xx, test "$RTEMS_CPU_MODEL" = "lpc22xx") AM_CONDITIONAL(s3c24xx, test "$RTEMS_CPU_MODEL" = "s3c2410") RTEMS_AMPOLISH3 diff --git a/c/src/lib/libcpu/arm/preinstall.am b/c/src/lib/libcpu/arm/preinstall.am index 68f30b6482..2358f10c3c 100644 --- a/c/src/lib/libcpu/arm/preinstall.am +++ b/c/src/lib/libcpu/arm/preinstall.am @@ -91,12 +91,3 @@ $(PROJECT_INCLUDE)/bsp/irq.h: s3c24xx/irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstam $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h endif -if lpc22xx -$(PROJECT_INCLUDE)/lpc22xx.h: lpc22xx/include/lpc22xx.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/lpc22xx.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/lpc22xx.h - -$(PROJECT_INCLUDE)/bsp/irq.h: lpc22xx/irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h -endif |