From 916dcff7a8343aef8c3e2b58be9492768c80c61a Mon Sep 17 00:00:00 2001 From: Peter Mitsis Date: Fri, 24 Jul 2015 14:07:03 -0400 Subject: [PATCH] arm: Move bsp/CortexM to core/cortex_m Eliminates bsp directory as part of transforming BSPs to platforms. Change-Id: I8b5366bf32797ddbb1bfa3520ddfeed6344cec2f Signed-off-by: Peter Mitsis --- arch/arm/Kconfig | 2 +- arch/arm/Makefile | 1 - arch/arm/bsp/Makefile | 1 - arch/arm/core/Makefile | 2 ++ arch/arm/{bsp/CortexM => core/cortex_m}/Kconfig | 0 arch/arm/{bsp/CortexM => core/cortex_m}/Makefile | 0 arch/arm/{bsp/CortexM => core/cortex_m}/nmi.c | 0 arch/arm/{bsp/CortexM => core/cortex_m}/prep_c.c | 0 arch/arm/{bsp/CortexM => core/cortex_m}/reset.S | 0 arch/arm/{bsp/CortexM => core/cortex_m}/scb.c | 0 arch/arm/{bsp/CortexM => core/cortex_m}/scs.c | 0 arch/arm/{bsp/CortexM => core/cortex_m}/sw_isr_table.S | 0 arch/arm/{bsp/CortexM => core/cortex_m}/vector_table.S | 0 arch/arm/{bsp/CortexM => core/cortex_m}/vector_table.h | 0 14 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 arch/arm/bsp/Makefile rename arch/arm/{bsp/CortexM => core/cortex_m}/Kconfig (100%) rename arch/arm/{bsp/CortexM => core/cortex_m}/Makefile (100%) rename arch/arm/{bsp/CortexM => core/cortex_m}/nmi.c (100%) rename arch/arm/{bsp/CortexM => core/cortex_m}/prep_c.c (100%) rename arch/arm/{bsp/CortexM => core/cortex_m}/reset.S (100%) rename arch/arm/{bsp/CortexM => core/cortex_m}/scb.c (100%) rename arch/arm/{bsp/CortexM => core/cortex_m}/scs.c (100%) rename arch/arm/{bsp/CortexM => core/cortex_m}/sw_isr_table.S (100%) rename arch/arm/{bsp/CortexM => core/cortex_m}/vector_table.S (100%) rename arch/arm/{bsp/CortexM => core/cortex_m}/vector_table.h (100%) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 528f493c6d7..d2bd9cc45c0 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -91,7 +91,7 @@ endchoice endmenu -source "arch/arm/bsp/CortexM/Kconfig" +source "arch/arm/core/cortex_m/Kconfig" if PLATFORM_TI_LM3S6965 source "arch/arm/platforms/ti_lm3s6965/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index de69a1000f2..8f12275bac1 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -1,5 +1,4 @@ obj-y = core/ -obj-y += bsp/ obj-$(CONFIG_PLATFORM_FSL_FRDM_K64F) += platforms/fsl_frdm_k64f/ obj-$(CONFIG_PLATFORM_TI_LM3S6965) += platforms/ti_lm3s6965/ diff --git a/arch/arm/bsp/Makefile b/arch/arm/bsp/Makefile deleted file mode 100644 index d41a6ff5740..00000000000 --- a/arch/arm/bsp/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-y = CortexM/ diff --git a/arch/arm/core/Makefile b/arch/arm/core/Makefile index 9eded144f9c..b8651f4d7d5 100644 --- a/arch/arm/core/Makefile +++ b/arch/arm/core/Makefile @@ -11,3 +11,5 @@ obj-y = atomic.o exc_exit.o ffs.o irq_init.o \ fatal.o sys_fatal_error_handler.o obj-$(CONFIG_MICROKERNEL) += task_abort.o + +obj-$(CONFIG_CPU_CORTEX_M) += cortex_m/ diff --git a/arch/arm/bsp/CortexM/Kconfig b/arch/arm/core/cortex_m/Kconfig similarity index 100% rename from arch/arm/bsp/CortexM/Kconfig rename to arch/arm/core/cortex_m/Kconfig diff --git a/arch/arm/bsp/CortexM/Makefile b/arch/arm/core/cortex_m/Makefile similarity index 100% rename from arch/arm/bsp/CortexM/Makefile rename to arch/arm/core/cortex_m/Makefile diff --git a/arch/arm/bsp/CortexM/nmi.c b/arch/arm/core/cortex_m/nmi.c similarity index 100% rename from arch/arm/bsp/CortexM/nmi.c rename to arch/arm/core/cortex_m/nmi.c diff --git a/arch/arm/bsp/CortexM/prep_c.c b/arch/arm/core/cortex_m/prep_c.c similarity index 100% rename from arch/arm/bsp/CortexM/prep_c.c rename to arch/arm/core/cortex_m/prep_c.c diff --git a/arch/arm/bsp/CortexM/reset.S b/arch/arm/core/cortex_m/reset.S similarity index 100% rename from arch/arm/bsp/CortexM/reset.S rename to arch/arm/core/cortex_m/reset.S diff --git a/arch/arm/bsp/CortexM/scb.c b/arch/arm/core/cortex_m/scb.c similarity index 100% rename from arch/arm/bsp/CortexM/scb.c rename to arch/arm/core/cortex_m/scb.c diff --git a/arch/arm/bsp/CortexM/scs.c b/arch/arm/core/cortex_m/scs.c similarity index 100% rename from arch/arm/bsp/CortexM/scs.c rename to arch/arm/core/cortex_m/scs.c diff --git a/arch/arm/bsp/CortexM/sw_isr_table.S b/arch/arm/core/cortex_m/sw_isr_table.S similarity index 100% rename from arch/arm/bsp/CortexM/sw_isr_table.S rename to arch/arm/core/cortex_m/sw_isr_table.S diff --git a/arch/arm/bsp/CortexM/vector_table.S b/arch/arm/core/cortex_m/vector_table.S similarity index 100% rename from arch/arm/bsp/CortexM/vector_table.S rename to arch/arm/core/cortex_m/vector_table.S diff --git a/arch/arm/bsp/CortexM/vector_table.h b/arch/arm/core/cortex_m/vector_table.h similarity index 100% rename from arch/arm/bsp/CortexM/vector_table.h rename to arch/arm/core/cortex_m/vector_table.h