From 274622ea6939898086569650b8f2af1785e531a8 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Fri, 5 Jun 2015 22:27:08 -0400 Subject: [PATCH] Rename VXMICRO_ARCH_arm -> CONFIG_ARM Change-Id: I32b2e39781825504e7936b3df0c864988650c35c Signed-off-by: Anas Nashif --- arch/arm/include/asm_inline.h | 2 +- doc/doxygen/irq_test_common_commented.h | 6 +++--- include/arch/cpu.h | 2 +- include/linker-defs.h | 2 +- include/section_tags.h | 2 +- include/sections.h | 2 +- include/toolchain/common.h | 2 +- include/toolchain/gcc.h | 12 ++++++------ kernel/microkernel/k_task.c | 2 +- kernel/nanokernel/nano_init.c | 2 +- samples/include/irq_test_common.h | 6 +++--- scripts/Makefile.arm.preparch | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/arch/arm/include/asm_inline.h b/arch/arm/include/asm_inline.h index dcb65781b67..72ae2c7b24f 100644 --- a/arch/arm/include/asm_inline.h +++ b/arch/arm/include/asm_inline.h @@ -33,7 +33,7 @@ #ifndef _ASM_INLINE_H #define _ASM_INLINE_H -#if !defined(VXMICRO_ARCH_arm) || !defined(CONFIG_CPU_CORTEXM) +#if !defined(CONFIG_ARM) || !defined(CONFIG_CPU_CORTEXM) #error arch/arm/include/asm_inline.h is for ARM CortexM only #endif diff --git a/doc/doxygen/irq_test_common_commented.h b/doc/doxygen/irq_test_common_commented.h index d6b3a2a8196..7a31935366e 100644 --- a/doc/doxygen/irq_test_common_commented.h +++ b/doc/doxygen/irq_test_common_commented.h @@ -42,7 +42,7 @@ Interrupt stuff, abstracted across CPU architectures. #if defined(CONFIG_X86_32) #define IRQ_PRIORITY 3 -#elif defined(VXMICRO_ARCH_arm) +#elif defined(CONFIG_ARM) #if defined(CONFIG_CPU_CORTEXM) #define IRQ_PRIORITY _EXC_PRIO(3) #endif /* CONFIG_CPU_CORTEXM */ @@ -96,7 +96,7 @@ static char sw_isr_trigger_1[] = }; #endif /* NUM_SW_IRQS >= 2 */ -#elif defined(VXMICRO_ARCH_arm) +#elif defined(CONFIG_ARM) #if defined(CONFIG_CPU_CORTEXM) #include static inline void sw_isr_trigger_0(void) @@ -160,7 +160,7 @@ static int initIRQ sw_isr_trigger_1[1] = vector; } #endif /* NUM_SW_IRQS >= 2 */ -#elif defined(VXMICRO_ARCH_arm) +#elif defined(CONFIG_ARM) #if defined(CONFIG_CPU_CORTEXM) if (i->isr[0]) { diff --git a/include/arch/cpu.h b/include/arch/cpu.h index 4cdf9f3f456..c04f9e6c8b8 100644 --- a/include/arch/cpu.h +++ b/include/arch/cpu.h @@ -35,7 +35,7 @@ #if defined(CONFIG_X86_32) #include -#elif defined(VXMICRO_ARCH_arm) +#elif defined(CONFIG_ARM) #include #elif defined(VXMICRO_ARCH_arc) #include diff --git a/include/linker-defs.h b/include/linker-defs.h index c7b67d6c57a..113672ad9fb 100644 --- a/include/linker-defs.h +++ b/include/linker-defs.h @@ -47,7 +47,7 @@ This file may be included by: /* include platform dependent linker-defs */ #ifdef CONFIG_X86_32 #include -#elif defined(VXMICRO_ARCH_arm) +#elif defined(CONFIG_ARM) /* Nothing yet to include */ #elif defined(VXMICRO_ARCH_arc) /* Nothing yet to include */ diff --git a/include/section_tags.h b/include/section_tags.h index a1062a1e7ba..367031d7eeb 100644 --- a/include/section_tags.h +++ b/include/section_tags.h @@ -42,7 +42,7 @@ #define __noinit __section(NOINIT, _FILE_PATH_HASH, __COUNTER__) -#if defined(VXMICRO_ARCH_arm) +#if defined(CONFIG_ARM) #define __scs_section __section(SCS_SECTION, _FILE_PATH_HASH, __COUNTER__) #define __scp_section __section(SCP_SECTION, _FILE_PATH_HASH, __COUNTER__) diff --git a/include/sections.h b/include/sections.h index 8b8ac36b8b6..e039662704a 100644 --- a/include/sections.h +++ b/include/sections.h @@ -62,7 +62,7 @@ #define DATA data #define NOINIT noinit -#if defined(VXMICRO_ARCH_arm) +#if defined(CONFIG_ARM) #define SCS_SECTION scs #define SCP_SECTION scp diff --git a/include/toolchain/common.h b/include/toolchain/common.h index 390919998e9..803b136a6ba 100644 --- a/include/toolchain/common.h +++ b/include/toolchain/common.h @@ -93,7 +93,7 @@ Macros to abstract compiler capabilities (common to all toolchains). #define PERFOPT_ALIGN .balign 1 #endif - #elif defined(VXMICRO_ARCH_arm) + #elif defined(CONFIG_ARM) #ifdef CONFIG_ISA_THUMB #define PERFOPT_ALIGN .balign 2 diff --git a/include/toolchain/gcc.h b/include/toolchain/gcc.h index 39268b43af0..ffaeea29694 100644 --- a/include/toolchain/gcc.h +++ b/include/toolchain/gcc.h @@ -53,7 +53,7 @@ /* The GNU assembler for Cortex-M3 uses # for immediate values, not * comments, so the @nobits# trick does not work. */ -#if defined(VXMICRO_ARCH_arm) +#if defined(CONFIG_ARM) #define _NODATA_SECTION(segment) __attribute__((section(#segment))) #else #define _NODATA_SECTION(segment) \ @@ -120,7 +120,7 @@ __extension__ ({ \ #if defined(_ASMLANGUAGE) && !defined(_LINKER) -#ifdef VXMICRO_ARCH_arm +#ifdef CONFIG_ARM #if defined(CONFIG_ISA_THUMB) @@ -155,7 +155,7 @@ A##a: #define FUNC_CODE() #define FUNC_INSTR(a) -#endif /* !VXMICRO_ARCH_arm */ +#endif /* !CONFIG_ARM */ #endif /* _ASMLANGUAGE && !_LINKER */ @@ -168,7 +168,7 @@ A##a: #if defined(_ASMLANGUAGE) && !defined(_LINKER) -#ifdef VXMICRO_ARCH_arm +#ifdef CONFIG_ARM #define GTEXT(sym) .global FUNC(sym); .type FUNC(sym),%function #define GDATA(sym) .global FUNC(sym); .type FUNC(sym),%object #define WTEXT(sym) .weak FUNC(sym); .type FUNC(sym),%function @@ -191,7 +191,7 @@ A##a: #define GTEXT(sym) glbl_text sym #define GDATA(sym) glbl_data sym -#else /* !VXMICRO_ARCH_arm && !VXMICRO_ARCH_arc */ +#else /* !CONFIG_ARM && !VXMICRO_ARCH_arc */ #define GTEXT(sym) .globl FUNC(sym); .type FUNC(sym),@function #define GDATA(sym) .globl FUNC(sym); .type FUNC(sym),@object #endif @@ -279,7 +279,7 @@ A##a: #define GEN_ABS_SYM_END } -#if defined(VXMICRO_ARCH_arm) +#if defined(CONFIG_ARM) /* * GNU/ARM backend does not have a proper operand modifier which does not diff --git a/kernel/microkernel/k_task.c b/kernel/microkernel/k_task.c index f0a5462611a..f006eb5eef2 100644 --- a/kernel/microkernel/k_task.c +++ b/kernel/microkernel/k_task.c @@ -137,7 +137,7 @@ void set_state_bit( * tasks. */ #if defined(__GNUC__) -#if defined(VXMICRO_ARCH_arm) +#if defined(CONFIG_ARM) /* * Avoid bad code generation by certain gcc toolchains for ARM * when an optimization setting of -O2 or above is used. diff --git a/kernel/nanokernel/nano_init.c b/kernel/nanokernel/nano_init.c index 86037203af2..0deb244f154 100644 --- a/kernel/nanokernel/nano_init.c +++ b/kernel/nanokernel/nano_init.c @@ -188,7 +188,7 @@ extern void *__stack_chk_guard; #if defined(CONFIG_X86_32) #define _MOVE_INSTR "movl " -#elif defined(VXMICRO_ARCH_arm) +#elif defined(CONFIG_ARM) #define _MOVE_INSTR "str " #else #error "Unknown VXMICRO_ARCH type" diff --git a/samples/include/irq_test_common.h b/samples/include/irq_test_common.h index 6f01ada08ca..551f2528d39 100644 --- a/samples/include/irq_test_common.h +++ b/samples/include/irq_test_common.h @@ -41,7 +41,7 @@ Interrupt stuff, abstracted across CPU architectures. #if defined(CONFIG_X86_32) #define IRQ_PRIORITY 3 -#elif defined(VXMICRO_ARCH_arm) +#elif defined(CONFIG_ARM) #if defined(CONFIG_CPU_CORTEXM) #define IRQ_PRIORITY _EXC_PRIO(3) #endif /* CONFIG_CPU_CORTEXM */ @@ -90,7 +90,7 @@ static char sw_isr_trigger_1[] = { }; #endif /* NUM_SW_IRQS >= 2 */ -#elif defined(VXMICRO_ARCH_arm) +#elif defined(CONFIG_ARM) #if defined(CONFIG_CPU_CORTEXM) #include static inline void sw_isr_trigger_0(void) @@ -142,7 +142,7 @@ static int initIRQ(struct isrInitInfo *i) sw_isr_trigger_1[1] = vector; } #endif /* NUM_SW_IRQS >= 2 */ -#elif defined(VXMICRO_ARCH_arm) +#elif defined(CONFIG_ARM) #if defined(CONFIG_CPU_CORTEXM) if (i->isr[0]) { (void) irq_connect(0, IRQ_PRIORITY, i->isr[0], i->arg[0]); diff --git a/scripts/Makefile.arm.preparch b/scripts/Makefile.arm.preparch index 4dca8f88423..c3236d3286a 100644 --- a/scripts/Makefile.arm.preparch +++ b/scripts/Makefile.arm.preparch @@ -7,7 +7,7 @@ endif ifeq ($(CONFIG_CPU_CORTEXM4),y) arm_FLAGS += -mcpu=cortex-m4 -march=armv7e-m endif -arm_FLAGS += -DVXMICRO_ARCH_arm +arm_FLAGS += -DCONFIG_ARM arm_FLAGS += -DVXMICRO_ARCH=arm arm_FLAGS += $(SECTION_GC_FLAG) arm_FLAGS += $(LTO_FLAG-$(CONFIG_LTO))