diff --git a/arch/x86/include/asm_inline.h b/arch/x86/include/asm_inline.h index dcbefa96cee..b7a441b63c5 100644 --- a/arch/x86/include/asm_inline.h +++ b/arch/x86/include/asm_inline.h @@ -33,7 +33,7 @@ #ifndef _ASM_INLINE_H #define _ASM_INLINE_H -#if !defined(VXMICRO_ARCH_x86) +#if !defined(CONFIG_X86_32) #error The arch/x86/include/asm_inline.h is only for x86 architecture #endif diff --git a/doc/doxygen/irq_test_common_commented.h b/doc/doxygen/irq_test_common_commented.h index f1de6f81654..d6b3a2a8196 100644 --- a/doc/doxygen/irq_test_common_commented.h +++ b/doc/doxygen/irq_test_common_commented.h @@ -40,7 +40,7 @@ Interrupt stuff, abstracted across CPU architectures. #define _IRQ_TEST_COMMON__H_ -#if defined(VXMICRO_ARCH_x86) +#if defined(CONFIG_X86_32) #define IRQ_PRIORITY 3 #elif defined(VXMICRO_ARCH_arm) #if defined(CONFIG_CPU_CORTEXM) @@ -58,7 +58,7 @@ Interrupt stuff, abstracted across CPU architectures. #error NUM_SW_IRQS only supports 1 or 2 IRQs #endif -#if defined(VXMICRO_ARCH_x86) +#if defined(CONFIG_X86_32) static NANO_CPU_INT_STUB_DECL(nanoIntStub1); #if NUM_SW_IRQS >= 2 static NANO_CPU_INT_STUB_DECL(nanoIntStub2); @@ -71,7 +71,7 @@ typedef void (*vvfn)(void); /*! Declares a void-void_pointer function pointer to test the ISR. */ typedef void (*vvpfn)(void *); -#if defined(VXMICRO_ARCH_x86) +#if defined(CONFIG_X86_32) /* * Opcode for generating a software interrupt. The ISR associated with each * of these software interrupts will call either nano_isr_lifo_put() or @@ -134,7 +134,7 @@ static int initIRQ struct isrInitInfo *i ) { -#if defined(VXMICRO_ARCH_x86) +#if defined(CONFIG_X86_32) int vector; /* vector to which interrupt is connected */ if (i->isr[0]) @@ -173,7 +173,7 @@ static int initIRQ irq_enable (1); } #endif /* CONFIG_CPU_CORTEXM */ -#endif /* VXMICRO_ARCH_x86 */ +#endif /* CONFIG_X86_32 */ return 0; } diff --git a/include/arch/cpu.h b/include/arch/cpu.h index 46dec21832e..4cdf9f3f456 100644 --- a/include/arch/cpu.h +++ b/include/arch/cpu.h @@ -33,7 +33,7 @@ #ifndef __ARCHCPU_H__ #define __ARCHCPU_H__ -#if defined(VXMICRO_ARCH_x86) +#if defined(CONFIG_X86_32) #include #elif defined(VXMICRO_ARCH_arm) #include diff --git a/include/linker-defs.h b/include/linker-defs.h index 9154990b57f..c7b67d6c57a 100644 --- a/include/linker-defs.h +++ b/include/linker-defs.h @@ -45,7 +45,7 @@ This file may be included by: #include /* include platform dependent linker-defs */ -#ifdef VXMICRO_ARCH_x86 +#ifdef CONFIG_X86_32 #include #elif defined(VXMICRO_ARCH_arm) /* Nothing yet to include */ @@ -56,7 +56,7 @@ This file may be included by: #endif #ifdef _LINKER -#ifdef VXMICRO_ARCH_x86 /* LINKER FILES: defines used by linker script */ +#ifdef CONFIG_X86_32 /* LINKER FILES: defines used by linker script */ /* Should be moved to linker-common-defs.h */ #if defined(CONFIG_XIP) #define ROMABLE_REGION ROM diff --git a/include/sections.h b/include/sections.h index 3c89b74882b..8b8ac36b8b6 100644 --- a/include/sections.h +++ b/include/sections.h @@ -50,7 +50,7 @@ /* Various text section names */ #define TEXT text -#if defined(VXMICRO_ARCH_x86) +#if defined(CONFIG_X86_32) #define TEXT_START text_start /* beginning of TEXT section */ #else #define TEXT_START text /* beginning of TEXT section */ diff --git a/include/toolchain/common.h b/include/toolchain/common.h index 23a8105dae5..390919998e9 100644 --- a/include/toolchain/common.h +++ b/include/toolchain/common.h @@ -85,7 +85,7 @@ Macros to abstract compiler capabilities (common to all toolchains). #ifdef _ASMLANGUAGE - #ifdef VXMICRO_ARCH_x86 + #ifdef CONFIG_X86_32 #ifdef PERF_OPT #define PERFOPT_ALIGN .balign 16 diff --git a/include/toolchain/gcc.h b/include/toolchain/gcc.h index 0c0c0ef7bb6..39268b43af0 100644 --- a/include/toolchain/gcc.h +++ b/include/toolchain/gcc.h @@ -294,7 +294,7 @@ A##a: ",%B0" \ "\n\t.type\t" #name ",%%object" : : "n"(~(value))) -#elif defined(VXMICRO_ARCH_x86) || defined(VXMICRO_ARCH_arc) +#elif defined(CONFIG_X86_32) || defined(VXMICRO_ARCH_arc) #define GEN_ABSOLUTE_SYM(name, value) \ __asm__(".globl\t" #name "\n\t.equ\t" #name \ diff --git a/kernel/microkernel/k_irq.c b/kernel/microkernel/k_irq.c index f18148cc193..81835da65c3 100644 --- a/kernel/microkernel/k_irq.c +++ b/kernel/microkernel/k_irq.c @@ -87,7 +87,7 @@ static struct task_irq_info task_irq_object[MAX_TASK_IRQS] = { /* architecture-specific */ -#if defined(VXMICRO_ARCH_x86) +#if defined(CONFIG_X86_32) /* task IRQ interrupt stub array */ NANO_CPU_INT_STUB_DECL(irq_obj_mem_stub[MAX_TASK_IRQS]); diff --git a/kernel/nanokernel/nano_init.c b/kernel/nanokernel/nano_init.c index c2057153df3..86037203af2 100644 --- a/kernel/nanokernel/nano_init.c +++ b/kernel/nanokernel/nano_init.c @@ -186,7 +186,7 @@ static void nano_init(tCCS *dummyOutContext) extern void *__stack_chk_guard; -#if defined(VXMICRO_ARCH_x86) +#if defined(CONFIG_X86_32) #define _MOVE_INSTR "movl " #elif defined(VXMICRO_ARCH_arm) #define _MOVE_INSTR "str " diff --git a/samples/include/irq_test_common.h b/samples/include/irq_test_common.h index a642f054195..6f01ada08ca 100644 --- a/samples/include/irq_test_common.h +++ b/samples/include/irq_test_common.h @@ -39,7 +39,7 @@ Interrupt stuff, abstracted across CPU architectures. #ifndef _IRQ_TEST_COMMON__H_ #define _IRQ_TEST_COMMON__H_ -#if defined(VXMICRO_ARCH_x86) +#if defined(CONFIG_X86_32) #define IRQ_PRIORITY 3 #elif defined(VXMICRO_ARCH_arm) #if defined(CONFIG_CPU_CORTEXM) @@ -57,7 +57,7 @@ Interrupt stuff, abstracted across CPU architectures. #error NUM_SW_IRQS only supports 1 or 2 IRQs #endif -#if defined(VXMICRO_ARCH_x86) +#if defined(CONFIG_X86_32) static NANO_CPU_INT_STUB_DECL(nanoIntStub1); #if NUM_SW_IRQS >= 2 static NANO_CPU_INT_STUB_DECL(nanoIntStub2); @@ -67,7 +67,7 @@ Interrupt stuff, abstracted across CPU architectures. typedef void (*vvfn)(void); /* void-void function pointer */ typedef void (*vvpfn)(void *); /* void-void_pointer function pointer */ -#if defined(VXMICRO_ARCH_x86) +#if defined(CONFIG_X86_32) /* * Opcode for generating a software interrupt. The ISR associated with each * of these software interrupts will call either nano_isr_lifo_put() or @@ -120,7 +120,7 @@ struct isrInitInfo { static int initIRQ(struct isrInitInfo *i) { -#if defined(VXMICRO_ARCH_x86) +#if defined(CONFIG_X86_32) int vector; /* vector to which interrupt is connected */ if (i->isr[0]) { @@ -153,7 +153,7 @@ static int initIRQ(struct isrInitInfo *i) irq_enable(1); } #endif /* CONFIG_CPU_CORTEXM */ -#endif /* VXMICRO_ARCH_x86 */ +#endif /* CONFIG_X86_32 */ return 0; } diff --git a/samples/microkernel/benchmark/footprint/src/test_asm_inline_gcc.h b/samples/microkernel/benchmark/footprint/src/test_asm_inline_gcc.h index 83570103ffa..e954515b0aa 100644 --- a/samples/microkernel/benchmark/footprint/src/test_asm_inline_gcc.h +++ b/samples/microkernel/benchmark/footprint/src/test_asm_inline_gcc.h @@ -33,7 +33,7 @@ #ifndef _TEST_ASM_INLINE_GCC_H #define _TEST_ASM_INLINE_GCC_H -#if !defined(__GNUC__) || !defined(VXMICRO_ARCH_x86) +#if !defined(__GNUC__) || !defined(CONFIG_X86_32) #error test_asm_inline_gcc.h goes only with x86 GCC #endif diff --git a/samples/microkernel/benchmark/latency_measure/src/raise_int.c b/samples/microkernel/benchmark/latency_measure/src/raise_int.c index 6d6594da63c..b6e1330796e 100644 --- a/samples/microkernel/benchmark/latency_measure/src/raise_int.c +++ b/samples/microkernel/benchmark/latency_measure/src/raise_int.c @@ -40,7 +40,7 @@ #include -#if defined(VXMICRO_ARCH_x86) +#if defined(CONFIG_X86_32) static void genInt0 (void) { diff --git a/samples/microkernel/benchmark/latency_measure/src/test_asm_inline_gcc.h b/samples/microkernel/benchmark/latency_measure/src/test_asm_inline_gcc.h index 011c3424fa4..565199100f3 100644 --- a/samples/microkernel/benchmark/latency_measure/src/test_asm_inline_gcc.h +++ b/samples/microkernel/benchmark/latency_measure/src/test_asm_inline_gcc.h @@ -33,7 +33,7 @@ #ifndef _TEST_ASM_INLINE_GCC_H #define _TEST_ASM_INLINE_GCC_H -#if !defined(__GNUC__) || !defined(VXMICRO_ARCH_x86) +#if !defined(__GNUC__) || !defined(CONFIG_X86_32) #error test_asm_inline_gcc.h goes only with x86 GCC #endif diff --git a/samples/microkernel/test/test_static_idt/src/test_asm_inline_gcc.h b/samples/microkernel/test/test_static_idt/src/test_asm_inline_gcc.h index 7c5de56a543..5417effb820 100644 --- a/samples/microkernel/test/test_static_idt/src/test_asm_inline_gcc.h +++ b/samples/microkernel/test/test_static_idt/src/test_asm_inline_gcc.h @@ -33,7 +33,7 @@ #ifndef _TEST_ASM_INLINE_GCC_H #define _TEST_ASM_INLINE_GCC_H -#if !defined(__GNUC__) || !defined(VXMICRO_ARCH_x86) +#if !defined(__GNUC__) || !defined(CONFIG_X86_32) #error test_asm_inline_gcc.h goes only with x86 GCC #endif diff --git a/samples/microkernel/test/test_task_irq/src/raise_int.c b/samples/microkernel/test/test_task_irq/src/raise_int.c index e7c661e5f57..f68d60a10c0 100644 --- a/samples/microkernel/test/test_task_irq/src/raise_int.c +++ b/samples/microkernel/test/test_task_irq/src/raise_int.c @@ -40,7 +40,7 @@ #include -#if defined(VXMICRO_ARCH_x86) +#if defined(CONFIG_X86_32) static void genInt0(void) { diff --git a/samples/microkernel/test/test_task_irq/src/test_device.c b/samples/microkernel/test/test_task_irq/src/test_device.c index 2f224cf3841..7c59bbac8a6 100644 --- a/samples/microkernel/test/test_task_irq/src/test_device.c +++ b/samples/microkernel/test/test_task_irq/src/test_device.c @@ -51,7 +51,7 @@ exercises the task_irq_free() API. #define DEV4_ID 3 #define DEV5_ID 4 -#if defined(VXMICRO_ARCH_x86) +#if defined(CONFIG_X86_32) #define DEV1_IRQ 8 #define DEV2_IRQ 14 #define DEV3_IRQ 32 diff --git a/samples/microkernel/test/test_tickless/src/test_tickless.c b/samples/microkernel/test/test_tickless/src/test_tickless.c index 8b08039e092..4b9c6161b6e 100644 --- a/samples/microkernel/test/test_tickless/src/test_tickless.c +++ b/samples/microkernel/test/test_tickless/src/test_tickless.c @@ -55,7 +55,7 @@ extern int32_t _sys_idle_threshold_ticks; * timestamp routines. */ -#if defined(VXMICRO_ARCH_x86) +#if defined(CONFIG_X86_32) typedef uint64_t _timer_res_t; #define _TIMER_ZERO 0ULL @@ -133,7 +133,7 @@ void ticklessTestTask(void) } cal_tsc /= CAL_REPS; -#if defined(VXMICRO_ARCH_x86) +#if defined(CONFIG_X86_32) printk("Calibrated time stamp period = 0x%x%x\n", (uint32_t)(cal_tsc >> 32), (uint32_t)(cal_tsc & 0xFFFFFFFFLL)); #elif defined(CONFIG_ARM) @@ -170,7 +170,7 @@ void ticklessTestTask(void) printk("end ticks : %d\n", end_ticks); printk("diff ticks : %d\n", diff_ticks); -#if defined(VXMICRO_ARCH_x86) +#if defined(CONFIG_X86_32) printk("diff time stamp: 0x%x%x\n", (uint32_t)(diff_tsc >> 32), (uint32_t)(diff_tsc & 0xFFFFFFFFULL)); printk("Cal time stamp: 0x%x%x\n", diff --git a/samples/nanokernel/benchmark/footprint/src/test_asm_inline_gcc.h b/samples/nanokernel/benchmark/footprint/src/test_asm_inline_gcc.h index 83570103ffa..e954515b0aa 100644 --- a/samples/nanokernel/benchmark/footprint/src/test_asm_inline_gcc.h +++ b/samples/nanokernel/benchmark/footprint/src/test_asm_inline_gcc.h @@ -33,7 +33,7 @@ #ifndef _TEST_ASM_INLINE_GCC_H #define _TEST_ASM_INLINE_GCC_H -#if !defined(__GNUC__) || !defined(VXMICRO_ARCH_x86) +#if !defined(__GNUC__) || !defined(CONFIG_X86_32) #error test_asm_inline_gcc.h goes only with x86 GCC #endif diff --git a/scripts/Makefile.x86.preparch b/scripts/Makefile.x86.preparch index 7f4abca2279..dc5592e3be6 100644 --- a/scripts/Makefile.x86.preparch +++ b/scripts/Makefile.x86.preparch @@ -10,7 +10,6 @@ ifneq ($(CONFIG_BSP_QUARK),y) iSSE_FP_MATH_ ?= -mno-sse iSSE_FP_MATH ?= ${iSSE_FP_MATH_${CONFIG_SSE_FP_MATH}} endif -x86_FLAGS = -DVXMICRO_ARCH_x86 x86_FLAGS += -DVXMICRO_ARCH=x86 x86_FLAGS += $(ALIGN_STACK_FLAG) x86_FLAGS += $(SECTION_GC_FLAG) @@ -19,8 +18,6 @@ x86_FLAGS += $(LTO_FLAG) x86_FLAGS += $(PERF_OPT_FLAG) x86_FLAGS += $(iSSE_FP_MATH) -LDFLAG_LINKERCMD = -DVXMICRO_ARCH_x86 - ISA_FLAG_pentium4-$(CONFIG_BSP_PCPENTIUM4) = -march=pentium4 ISA_FLAG_minuteia-$(CONFIG_BSP_PCMINUTEIA) = -march=pentium ISA_FLAG_atom_n28xx-$(CONFIG_BSP_ATOM_N28XX) = -march=atom -mtune=atom