diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-12-08 07:57:21 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-12-08 13:03:50 +0100 |
commit | a1460043f5ea4f56586c2ad405fe4f7ab41a77a0 (patch) | |
tree | 237fc99474512f55626c205810d9b351fae652e7 | |
parent | bsp/rtl22xx: Move libcpu files to BSP (diff) | |
download | rtems-a1460043f5ea4f56586c2ad405fe4f7ab41a77a0.tar.bz2 |
bsp/smdk2410: Move libcpu files to BSP
Update #3254.
-rw-r--r-- | c/src/lib/libbsp/arm/smdk2410/Makefile.am | 13 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/smdk2410/clock/clockdrv.c (renamed from c/src/lib/libcpu/arm/s3c24xx/clock/clockdrv.c) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/smdk2410/clock/support.c (renamed from c/src/lib/libcpu/arm/s3c24xx/clock/support.c) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/smdk2410/include/bsp/irq.h (renamed from c/src/lib/libcpu/arm/s3c24xx/irq/irq.h) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/smdk2410/include/s3c2400.h (renamed from c/src/lib/libcpu/arm/s3c24xx/include/s3c2400.h) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/smdk2410/include/s3c2410.h (renamed from c/src/lib/libcpu/arm/s3c24xx/include/s3c2410.h) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/smdk2410/include/s3c24xx.h (renamed from c/src/lib/libcpu/arm/s3c24xx/include/s3c24xx.h) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/smdk2410/irq/irq.c (renamed from c/src/lib/libcpu/arm/s3c24xx/irq/irq.c) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/smdk2410/make/custom/smdk2410.cfg | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/smdk2410/preinstall.am | 16 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/smdk2410/timer/timer.c (renamed from c/src/lib/libcpu/arm/s3c24xx/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 | 17 |
14 files changed, 26 insertions, 49 deletions
diff --git a/c/src/lib/libbsp/arm/smdk2410/Makefile.am b/c/src/lib/libbsp/arm/smdk2410/Makefile.am index e4400546e0..60afd59b6e 100644 --- a/c/src/lib/libbsp/arm/smdk2410/Makefile.am +++ b/c/src/lib/libbsp/arm/smdk2410/Makefile.am @@ -9,6 +9,9 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += smc/smc.h include_HEADERS += include/tm27.h +include_HEADERS += include/s3c24xx.h +include_HEADERS += include/s3c2400.h +include_HEADERS += include/s3c2410.h include_bsp_HEADERS = libbsp_a_CPPFLAGS = @@ -41,6 +44,9 @@ libbsp_a_SOURCES += ../../shared/bspgetworkarea.c 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 +libbsp_a_SOURCES += clock/support.c # console libbsp_a_SOURCES += console/uart.c libbsp_a_SOURCES += ../../shared/console.c @@ -51,12 +57,14 @@ libbsp_a_SOURCES += ../../shared/console_control.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 # smc libbsp_a_SOURCES += smc/smc.c libbsp_a_SOURCES += smc/smc.h @@ -67,10 +75,7 @@ libbsp_a_SOURCES += ../shared/include/arm-cache-l1.h libbsp_a_SOURCES += ../shared/armv467ar-basic-cache/cache_.h libbsp_a_CPPFLAGS += -I$(srcdir)/../shared/armv467ar-basic-cache -libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel \ - ../../../libcpu/@RTEMS_CPU@/s3c24xx/clock.rel \ - ../../../libcpu/@RTEMS_CPU@/s3c24xx/timer.rel \ - ../../../libcpu/@RTEMS_CPU@/s3c24xx/irq.rel +libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libcpu/arm/s3c24xx/clock/clockdrv.c b/c/src/lib/libbsp/arm/smdk2410/clock/clockdrv.c index 41d61909cb..41d61909cb 100644 --- a/c/src/lib/libcpu/arm/s3c24xx/clock/clockdrv.c +++ b/c/src/lib/libbsp/arm/smdk2410/clock/clockdrv.c diff --git a/c/src/lib/libcpu/arm/s3c24xx/clock/support.c b/c/src/lib/libbsp/arm/smdk2410/clock/support.c index 80010ace91..80010ace91 100644 --- a/c/src/lib/libcpu/arm/s3c24xx/clock/support.c +++ b/c/src/lib/libbsp/arm/smdk2410/clock/support.c diff --git a/c/src/lib/libcpu/arm/s3c24xx/irq/irq.h b/c/src/lib/libbsp/arm/smdk2410/include/bsp/irq.h index 8882b4362b..8882b4362b 100644 --- a/c/src/lib/libcpu/arm/s3c24xx/irq/irq.h +++ b/c/src/lib/libbsp/arm/smdk2410/include/bsp/irq.h diff --git a/c/src/lib/libcpu/arm/s3c24xx/include/s3c2400.h b/c/src/lib/libbsp/arm/smdk2410/include/s3c2400.h index 89a3cf73d8..89a3cf73d8 100644 --- a/c/src/lib/libcpu/arm/s3c24xx/include/s3c2400.h +++ b/c/src/lib/libbsp/arm/smdk2410/include/s3c2400.h diff --git a/c/src/lib/libcpu/arm/s3c24xx/include/s3c2410.h b/c/src/lib/libbsp/arm/smdk2410/include/s3c2410.h index c6a0a0b452..c6a0a0b452 100644 --- a/c/src/lib/libcpu/arm/s3c24xx/include/s3c2410.h +++ b/c/src/lib/libbsp/arm/smdk2410/include/s3c2410.h diff --git a/c/src/lib/libcpu/arm/s3c24xx/include/s3c24xx.h b/c/src/lib/libbsp/arm/smdk2410/include/s3c24xx.h index 914b867abf..914b867abf 100644 --- a/c/src/lib/libcpu/arm/s3c24xx/include/s3c24xx.h +++ b/c/src/lib/libbsp/arm/smdk2410/include/s3c24xx.h diff --git a/c/src/lib/libcpu/arm/s3c24xx/irq/irq.c b/c/src/lib/libbsp/arm/smdk2410/irq/irq.c index ea8f610353..ea8f610353 100644 --- a/c/src/lib/libcpu/arm/s3c24xx/irq/irq.c +++ b/c/src/lib/libbsp/arm/smdk2410/irq/irq.c diff --git a/c/src/lib/libbsp/arm/smdk2410/make/custom/smdk2410.cfg b/c/src/lib/libbsp/arm/smdk2410/make/custom/smdk2410.cfg index c2b92738bd..fe532ceb4f 100644 --- a/c/src/lib/libbsp/arm/smdk2410/make/custom/smdk2410.cfg +++ b/c/src/lib/libbsp/arm/smdk2410/make/custom/smdk2410.cfg @@ -5,7 +5,7 @@ include $(RTEMS_ROOT)/make/custom/default.cfg RTEMS_CPU=arm -RTEMS_CPU_MODEL=s3c2410 +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/smdk2410/preinstall.am b/c/src/lib/libbsp/arm/smdk2410/preinstall.am index a59027ec44..a049bab452 100644 --- a/c/src/lib/libbsp/arm/smdk2410/preinstall.am +++ b/c/src/lib/libbsp/arm/smdk2410/preinstall.am @@ -49,6 +49,18 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/s3c24xx.h: include/s3c24xx.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/s3c24xx.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/s3c24xx.h + +$(PROJECT_INCLUDE)/s3c2400.h: include/s3c2400.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/s3c2400.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/s3c2400.h + +$(PROJECT_INCLUDE)/s3c2410.h: include/s3c2410.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/s3c2410.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/s3c2410.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 +85,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/s3c24xx/timer/timer.c b/c/src/lib/libbsp/arm/smdk2410/timer/timer.c index 2bc599df75..2bc599df75 100644 --- a/c/src/lib/libcpu/arm/s3c24xx/timer/timer.c +++ b/c/src/lib/libbsp/arm/smdk2410/timer/timer.c diff --git a/c/src/lib/libcpu/arm/Makefile.am b/c/src/lib/libcpu/arm/Makefile.am index 5f92a64310..364dc023fc 100644 --- a/c/src/lib/libcpu/arm/Makefile.am +++ b/c/src/lib/libcpu/arm/Makefile.am @@ -71,30 +71,5 @@ at91rm9200_irq_rel_CPPFLAGS = $(AM_CPPFLAGS) at91rm9200_irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif -if s3c24xx -include_HEADERS = s3c24xx/include/s3c24xx.h s3c24xx/include/s3c2400.h s3c24xx/include/s3c2410.h - -## s3c24xx/clock -noinst_PROGRAMS += s3c24xx/clock.rel -s3c24xx_clock_rel_SOURCES = s3c24xx/clock/clockdrv.c s3c24xx/clock/support.c -s3c24xx_clock_rel_CPPFLAGS = $(AM_CPPFLAGS) -s3c24xx_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -## s3c24xx/timer -noinst_PROGRAMS += s3c24xx/timer.rel -s3c24xx_timer_rel_SOURCES = s3c24xx/timer/timer.c -s3c24xx_timer_rel_CPPFLAGS = $(AM_CPPFLAGS) -s3c24xx_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -## s3c24xx/interrupt -include_bsp_HEADERS += s3c24xx/irq/irq.h - -noinst_PROGRAMS += s3c24xx/irq.rel -s3c24xx_irq_rel_SOURCES = s3c24xx/irq/irq.c \ - s3c24xx/irq/irq.h -s3c24xx_irq_rel_CPPFLAGS = $(AM_CPPFLAGS) -s3c24xx_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 c524c205ad..0a34ed82cd 100644 --- a/c/src/lib/libcpu/arm/configure.ac +++ b/c/src/lib/libcpu/arm/configure.ac @@ -21,11 +21,9 @@ RTEMS_PROG_CCAS AM_CONDITIONAL(shared, test "$RTEMS_CPU_MODEL" = "arm1136" || \ test "$RTEMS_CPU_MODEL" = "at91rm9200" || \ - test "$RTEMS_CPU_MODEL" = "s3c2410" || \ test "$RTEMS_CPU_MODEL" = "shared") AM_CONDITIONAL(at91rm9200, test "$RTEMS_CPU_MODEL" = "at91rm9200") -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 2358f10c3c..32ddb72cbf 100644 --- a/c/src/lib/libcpu/arm/preinstall.am +++ b/c/src/lib/libcpu/arm/preinstall.am @@ -74,20 +74,3 @@ $(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 s3c24xx -$(PROJECT_INCLUDE)/s3c24xx.h: s3c24xx/include/s3c24xx.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/s3c24xx.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/s3c24xx.h - -$(PROJECT_INCLUDE)/s3c2400.h: s3c24xx/include/s3c2400.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/s3c2400.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/s3c2400.h - -$(PROJECT_INCLUDE)/s3c2410.h: s3c24xx/include/s3c2410.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/s3c2410.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/s3c2410.h - -$(PROJECT_INCLUDE)/bsp/irq.h: s3c24xx/irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h -endif |