diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-03-10 10:17:35 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-03-13 08:05:39 +0100 |
| commit | c4905d8d314f4325b18e4dbbd6cbfc5b0f75f313 (patch) | |
| tree | 9191f15047275025a5ca14d898d986a677383a22 /c/src/lib/libbsp | |
| parent | bsps/mips: Move libcpu content to bsps (diff) | |
| download | rtems-c4905d8d314f4325b18e4dbbd6cbfc5b0f75f313.tar.bz2 | |
bsps/arm: Move libcpu content to bsps
This patch is a part of the BSP source reorganization.
Update #3285.
Diffstat (limited to 'c/src/lib/libbsp')
15 files changed, 5 insertions, 20 deletions
diff --git a/c/src/lib/libbsp/arm/csb336/Makefile.am b/c/src/lib/libbsp/arm/csb336/Makefile.am index 8bc5a44f23..6f65d36398 100644 --- a/c/src/lib/libbsp/arm/csb336/Makefile.am +++ b/c/src/lib/libbsp/arm/csb336/Makefile.am @@ -50,7 +50,7 @@ libbsp_a_SOURCES += network/lan91c11x.c libbsp_a_SOURCES += network/network.c endif -libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel +libbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cp15/arm920-mmu.c include $(top_srcdir)/../../../../automake/local.am include $(srcdir)/../../../../../../bsps/arm/csb336/headers.am 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 bc2f65cc9c..d38e2e10b8 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,6 @@ include $(RTEMS_ROOT)/make/custom/default.cfg RTEMS_CPU=arm -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/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am index 69780d18a5..d7527a0a36 100644 --- a/c/src/lib/libbsp/arm/csb337/Makefile.am +++ b/c/src/lib/libbsp/arm/csb337/Makefile.am @@ -80,7 +80,7 @@ if HAS_NETWORKING libbsp_a_SOURCES += network/network.c endif -libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel +libbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cp15/arm920-mmu.c include $(top_srcdir)/../../../../automake/local.am include $(srcdir)/../../../../../../bsps/arm/csb337/headers.am 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 56e2d7a116..97d9685c3d 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,6 @@ include $(RTEMS_ROOT)/make/custom/default.cfg RTEMS_CPU=arm -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/edb7312/make/custom/edb7312.cfg b/c/src/lib/libbsp/arm/edb7312/make/custom/edb7312.cfg index 832f47bdde..32dd537872 100644 --- a/c/src/lib/libbsp/arm/edb7312/make/custom/edb7312.cfg +++ b/c/src/lib/libbsp/arm/edb7312/make/custom/edb7312.cfg @@ -5,12 +5,11 @@ include $(RTEMS_ROOT)/make/custom/default.cfg RTEMS_CPU=arm -RTEMS_CPU_MODEL=arm7tdmi # This contains the compiler options necessary to select the CPU model # and (hopefully) optimize for it. # -CPU_CFLAGS = -mcpu=$(RTEMS_CPU_MODEL) +CPU_CFLAGS = -mcpu=arm7tdmi # optimize flag: typically -O2 CFLAGS_OPTIMIZE_V = -O2 -g diff --git a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am index 62cbdccb8b..f9a47f4b23 100644 --- a/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am +++ b/c/src/lib/libbsp/arm/gdbarmsim/Makefile.am @@ -52,11 +52,6 @@ libbsp_a_SOURCES += ../../shared/src/irq-shell.c # Cache libbsp_a_SOURCES += ../../../../../../bsps/shared/cache/nocache.c -#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 - # Shared if shared libbsp_a_SOURCES += ../shared/arm-cp15-set-exception-handler.c diff --git a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm1136jfs.cfg b/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm1136jfs.cfg index a802a8ffdc..be4d5a6484 100644 --- a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm1136jfs.cfg +++ b/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm1136jfs.cfg @@ -5,7 +5,6 @@ include $(RTEMS_ROOT)/make/custom/default.cfg RTEMS_CPU=arm -RTEMS_CPU_MODEL=arm1136 # This contains the compiler options necessary to select the CPU model # and (hopefully) optimize for it. diff --git a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm1136js.cfg b/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm1136js.cfg index 7ae3e6bb71..83308c39b0 100644 --- a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm1136js.cfg +++ b/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm1136js.cfg @@ -5,7 +5,6 @@ include $(RTEMS_ROOT)/make/custom/default.cfg RTEMS_CPU=arm -RTEMS_CPU_MODEL=arm1136 # This contains the compiler options necessary to select the CPU model # and (hopefully) optimize for it. diff --git a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm7tdmi.cfg b/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm7tdmi.cfg index 28a2e76460..e992733864 100644 --- a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm7tdmi.cfg +++ b/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm7tdmi.cfg @@ -5,7 +5,6 @@ include $(RTEMS_ROOT)/make/custom/default.cfg RTEMS_CPU=arm -RTEMS_CPU_MODEL=arm7tdmi # This contains the compiler options necessary to select the CPU model # and (hopefully) optimize for it. diff --git a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm920.cfg b/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm920.cfg index 72478f8d95..b246d5bb20 100644 --- a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm920.cfg +++ b/c/src/lib/libbsp/arm/gdbarmsim/make/custom/arm920.cfg @@ -5,7 +5,6 @@ include $(RTEMS_ROOT)/make/custom/default.cfg RTEMS_CPU=arm -RTEMS_CPU_MODEL=arm920 # This contains the compiler options necessary to select the CPU model # and (hopefully) optimize for it. diff --git a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/armcortexa9.cfg b/c/src/lib/libbsp/arm/gdbarmsim/make/custom/armcortexa9.cfg index 693eb9f762..6eecf70615 100644 --- a/c/src/lib/libbsp/arm/gdbarmsim/make/custom/armcortexa9.cfg +++ b/c/src/lib/libbsp/arm/gdbarmsim/make/custom/armcortexa9.cfg @@ -5,7 +5,6 @@ include $(RTEMS_ROOT)/make/custom/default.cfg RTEMS_CPU=arm -RTEMS_CPU_MODEL=arm1136 # 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/Makefile.am b/c/src/lib/libbsp/arm/gumstix/Makefile.am index cff8663382..2c282e798a 100644 --- a/c/src/lib/libbsp/arm/gumstix/Makefile.am +++ b/c/src/lib/libbsp/arm/gumstix/Makefile.am @@ -55,7 +55,7 @@ libbsp_a_SOURCES += rtl8019/rtl8019.c rtl8019/wd80x3.h endif endif -libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel +libbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cp15/arm920-mmu.c include $(top_srcdir)/../../../../automake/local.am include $(srcdir)/../../../../../../bsps/arm/gumstix/headers.am 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 d42b44695b..664e42b365 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,6 @@ include $(RTEMS_ROOT)/make/custom/default.cfg RTEMS_CPU=arm -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/Makefile.am b/c/src/lib/libbsp/arm/smdk2410/Makefile.am index a0922bd77f..01cddc925b 100644 --- a/c/src/lib/libbsp/arm/smdk2410/Makefile.am +++ b/c/src/lib/libbsp/arm/smdk2410/Makefile.am @@ -58,7 +58,7 @@ libbsp_a_SOURCES += smc/smc.h # Cache libbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cache/cache-cp15.c -libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel +libbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cp15/arm920-mmu.c include $(top_srcdir)/../../../../automake/local.am include $(srcdir)/../../../../../../bsps/arm/smdk2410/headers.am 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 fe532ceb4f..b5720cae3f 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,6 @@ include $(RTEMS_ROOT)/make/custom/default.cfg RTEMS_CPU=arm -RTEMS_CPU_MODEL=shared # This contains the compiler options necessary to select the CPU model # and (hopefully) optimize for it. |