diff --git a/Kconfig.zephyr b/Kconfig.zephyr index 05c67f98618..bdd3bacaf9f 100644 --- a/Kconfig.zephyr +++ b/Kconfig.zephyr @@ -15,24 +15,17 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -config SRCARCH - string - option env="SRCARCH" - -source "arch/$SRCARCH/Kconfig" - - -config ARCH - string - option env="ARCH" - config KERNELVERSION string option env="KERNELVERSION" -config DEFCONFIG_LIST - string - option defconfig_list - default "$ARCH_DEFCONFIG" - default "arch/$ARCH/defconfig" +source "arch/Kconfig" + +source "kernel/Kconfig" + +source "drivers/Kconfig" + +source "net/Kconfig" + +source "misc/Kconfig" + diff --git a/arch/Kconfig b/arch/Kconfig index 4e6136810fa..78ba35d5e7e 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -18,3 +18,29 @@ # +choice + prompt "Architecture" + default X86 + +config ARC + bool "ARC architecture" + +config ARM + bool "ARM architecture" + +config X86 + bool "x86 architecture" + +endchoice + +config ARCH + string + help + System architecture string. + +config SOC + string + help + SOC being used. + +source "arch/*/Kconfig" diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index e14dc60874e..5bc0ad49d64 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -15,17 +15,15 @@ # See the License for the specific language governing permissions and # limitations under the License. # -config ARC - def_bool y +menu "ARC architecture" + depends on ARC + +config ARCH + default "arc" config ARCH_DEFCONFIG - string - default "arch/arc/defconfig" - -source "kernel/Kconfig" - -source "misc/Kconfig" - + string + default "arch/arc/defconfig" choice prompt "Platform Selection" @@ -41,7 +39,7 @@ config CPU_ARCEM4 default y select CPU_ARCV2 help - This option signifies the use of an ARC EM4 CPU + This option signifies the use of an ARC EM4 CPU endmenu @@ -50,7 +48,6 @@ menu "ARCv2 Family Options" config CPU_ARCV2 bool default y - select ARC help This option signifies the use of a CPU of the ARCv2 family. @@ -249,7 +246,4 @@ endmenu source "arch/arc/platforms/*/Kconfig" -source "drivers/Kconfig" - -source "net/Kconfig" - +endmenu diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index fe4cd00fd1a..08e3a4a88b5 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -15,16 +15,17 @@ # See the License for the specific language governing permissions and # limitations under the License. # -config ARM - def_bool y + + +menu "ARM architecture" + depends on ARM + +config ARCH + default "arm" config ARCH_DEFCONFIG - string - default "arch/arm/defconfig" - -source "kernel/Kconfig" - -source "misc/Kconfig" + string + default "arch/arm/defconfig" menu "General Platform Configuration" @@ -72,6 +73,4 @@ endmenu source "arch/arm/platforms/*/Kconfig" -source "drivers/Kconfig" - -source "net/Kconfig" +endmenu diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 135ee00fa96..97db54f75cd 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -16,14 +16,11 @@ # limitations under the License. # -config X86_32 - def_bool y +menu "x86 architecture" + depends on X86 -config ARCH_DEFCONFIG - string - default "arch/x86/defconfig" - -source "kernel/Kconfig" +config ARCH + default "x86" menu "X86 Platform Configuration options" @@ -273,8 +270,4 @@ endmenu source "arch/x86/platforms/*/Kconfig" -source "drivers/Kconfig" - -source "net/Kconfig" - -source "misc/Kconfig" +endmenu diff --git a/arch/x86/configs/arduino_101_defconfig b/arch/x86/configs/arduino_101_defconfig index 95830079d35..0f9438871b5 100644 --- a/arch/x86/configs/arduino_101_defconfig +++ b/arch/x86/configs/arduino_101_defconfig @@ -1,4 +1,4 @@ -CONFIG_X86_32=y +CONFIG_X86=y CONFIG_PLATFORM_QUARK_SE_X86=y CONFIG_CPU_MINUTEIA=y CONFIG_CONSOLE=y diff --git a/arch/x86/configs/basic_atom_defconfig b/arch/x86/configs/basic_atom_defconfig index 9494da068b5..26d66c071c9 100644 --- a/arch/x86/configs/basic_atom_defconfig +++ b/arch/x86/configs/basic_atom_defconfig @@ -1,4 +1,4 @@ -CONFIG_X86_32=y +CONFIG_X86=y CONFIG_PLATFORM_IA32=y CONFIG_CPU_ATOM=y CONFIG_IA32_LEGACY_IO_PORTS=y diff --git a/arch/x86/configs/basic_minuteia_defconfig b/arch/x86/configs/basic_minuteia_defconfig index 51a19bc718d..c729e12d673 100644 --- a/arch/x86/configs/basic_minuteia_defconfig +++ b/arch/x86/configs/basic_minuteia_defconfig @@ -1,4 +1,4 @@ -CONFIG_X86_32=y +CONFIG_X86=y CONFIG_PLATFORM_IA32=y CONFIG_CPU_MINUTEIA=y CONFIG_IA32_LEGACY_IO_PORTS=y diff --git a/arch/x86/configs/galileo_defconfig b/arch/x86/configs/galileo_defconfig index 020a5264b9b..4b350c436ad 100644 --- a/arch/x86/configs/galileo_defconfig +++ b/arch/x86/configs/galileo_defconfig @@ -1,6 +1,6 @@ CONFIG_NANO_TIMERS=y CONFIG_NANO_TIMEOUTS=y -CONFIG_X86_32=y +CONFIG_X86=y CONFIG_PLATFORM_GALILEO=y CONFIG_CPU_MINUTEIA=y CONFIG_PCI_LEGACY_BRIDGE=y diff --git a/arch/x86/configs/quark_d2000_defconfig b/arch/x86/configs/quark_d2000_defconfig index 1455ab23e75..e93cb5bf09a 100644 --- a/arch/x86/configs/quark_d2000_defconfig +++ b/arch/x86/configs/quark_d2000_defconfig @@ -1,4 +1,4 @@ -CONFIG_X86_32=y +CONFIG_X86=y CONFIG_PLATFORM_QUARK_D2000=y CONFIG_CPU_MINUTEIA=y CONFIG_IDT_NUM_VECTORS=64 diff --git a/arch/x86/configs/quark_se-x86_defconfig b/arch/x86/configs/quark_se-x86_defconfig index e5ed294fe33..7ec8c9344bc 100644 --- a/arch/x86/configs/quark_se-x86_defconfig +++ b/arch/x86/configs/quark_se-x86_defconfig @@ -1,4 +1,4 @@ -CONFIG_X86_32=y +CONFIG_X86=y CONFIG_PLATFORM_QUARK_SE_X86=y CONFIG_CPU_MINUTEIA=y CONFIG_CONSOLE=y diff --git a/arch/x86/defconfig b/arch/x86/defconfig index fe55bf21ae3..ba84c88faf1 100644 --- a/arch/x86/defconfig +++ b/arch/x86/defconfig @@ -1,4 +1,4 @@ -CONFIG_X86_32=y +CONFIG_X86=y CONFIG_PLATFORM_IA32=y CONFIG_CPU_MINUTEIA=y CONFIG_HPET_TIMER=y diff --git a/arch/x86/include/asm_inline.h b/arch/x86/include/asm_inline.h index c8cfe7a4ac2..abcda0a7d96 100644 --- a/arch/x86/include/asm_inline.h +++ b/arch/x86/include/asm_inline.h @@ -19,7 +19,7 @@ #ifndef _ASM_INLINE_H #define _ASM_INLINE_H -#if !defined(CONFIG_X86_32) +#if !defined(CONFIG_X86) #error The arch/x86/include/asm_inline.h is only for x86 architecture #endif diff --git a/doc/collaboration/code/doxygen/irq_test_common_commented.h b/doc/collaboration/code/doxygen/irq_test_common_commented.h index ad46111d85b..a750d54f4ca 100644 --- a/doc/collaboration/code/doxygen/irq_test_common_commented.h +++ b/doc/collaboration/code/doxygen/irq_test_common_commented.h @@ -26,7 +26,7 @@ Interrupt stuff, abstracted across CPU architectures. #define _IRQ_TEST_COMMON__H_ -#if defined(CONFIG_X86_32) +#if defined(CONFIG_X86) #define IRQ_PRIORITY 3 #elif defined(CONFIG_ARM) #if defined(CONFIG_CPU_CORTEX_M) @@ -44,7 +44,7 @@ Interrupt stuff, abstracted across CPU architectures. #error NUM_SW_IRQS only supports 1 or 2 IRQs #endif -#if defined(CONFIG_X86_32) +#if defined(CONFIG_X86) static NANO_CPU_INT_STUB_DECL(nanoIntStub1); #if NUM_SW_IRQS >= 2 static NANO_CPU_INT_STUB_DECL(nanoIntStub2); @@ -57,7 +57,7 @@ typedef void (*vvfn)(void); /** Declares a void-void_pointer function pointer to test the ISR. */ typedef void (*vvpfn)(void *); -#if defined(CONFIG_X86_32) +#if defined(CONFIG_X86) /* * 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 @@ static int initIRQ struct isrInitInfo *i ) { -#if defined(CONFIG_X86_32) +#if defined(CONFIG_X86) int vector; /* vector to which interrupt is connected */ if (i->isr[0]) @@ -159,7 +159,7 @@ static int initIRQ irq_enable (1); } #endif /* CONFIG_CPU_CORTEX_M */ -#endif /* CONFIG_X86_32 */ +#endif /* CONFIG_X86 */ return 0; } diff --git a/drivers/aio/aio_static_irq_stubs.S b/drivers/aio/aio_static_irq_stubs.S index 456b8a4c9ad..bd9fe78ce13 100644 --- a/drivers/aio/aio_static_irq_stubs.S +++ b/drivers/aio/aio_static_irq_stubs.S @@ -22,7 +22,7 @@ #define _ASMLANGUAGE -#ifdef CONFIG_X86_32 +#ifdef CONFIG_X86 #include #include #endif diff --git a/drivers/ethernet/eth_static_irq_stubs.S b/drivers/ethernet/eth_static_irq_stubs.S index e16a8d4d3ff..6a7774f4a87 100644 --- a/drivers/ethernet/eth_static_irq_stubs.S +++ b/drivers/ethernet/eth_static_irq_stubs.S @@ -22,7 +22,7 @@ #define _ASMLANGUAGE -#ifdef CONFIG_X86_32 +#ifdef CONFIG_X86 #include #include #endif diff --git a/drivers/gpio/gpio_static_irq_stubs.S b/drivers/gpio/gpio_static_irq_stubs.S index 0c5c1e9a5e3..0deb7994f59 100644 --- a/drivers/gpio/gpio_static_irq_stubs.S +++ b/drivers/gpio/gpio_static_irq_stubs.S @@ -22,7 +22,7 @@ #define _ASMLANGUAGE -#ifdef CONFIG_X86_32 +#ifdef CONFIG_X86 #include #include #endif diff --git a/drivers/i2c/i2c_static_irq_stubs.S b/drivers/i2c/i2c_static_irq_stubs.S index 0cde0c82ffb..9b53fc70ff3 100644 --- a/drivers/i2c/i2c_static_irq_stubs.S +++ b/drivers/i2c/i2c_static_irq_stubs.S @@ -22,7 +22,7 @@ #define _ASMLANGUAGE -#ifdef CONFIG_X86_32 +#ifdef CONFIG_X86 #include #include #endif diff --git a/drivers/interrupt_controller/Kconfig b/drivers/interrupt_controller/Kconfig index f834e7a499c..cd67b3dc03d 100644 --- a/drivers/interrupt_controller/Kconfig +++ b/drivers/interrupt_controller/Kconfig @@ -23,7 +23,7 @@ config LOAPIC bool "LOAPIC" default n select IOAPIC - depends on X86_32 + depends on X86 help This option selects local APIC as the interrupt controller. @@ -77,7 +77,7 @@ config IOAPIC_NUM_RTES config MVIC bool "Intel Quark D2000 Interrupt Controller (MVIC)" default n - depends on X86_32 + depends on X86 help The MVIC (Intel Quark microcontroller D2000 Interrupt Controller) is configured by default to support 32 external interrupt lines. Unlike the diff --git a/drivers/ipi/ipi_static_irq_stubs.S b/drivers/ipi/ipi_static_irq_stubs.S index e59012baa5f..682c56c7fa4 100644 --- a/drivers/ipi/ipi_static_irq_stubs.S +++ b/drivers/ipi/ipi_static_irq_stubs.S @@ -16,7 +16,7 @@ #define _ASMLANGUAGE -#ifdef CONFIG_X86_32 +#ifdef CONFIG_X86 #include #include #endif diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index 480323133d9..e55e7f8c277 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -18,11 +18,11 @@ menu "PCI Settings" - depends on X86_32 + depends on X86 config PCI bool "Enable PCI" default n - depends on X86_32 + depends on X86 help This options enables support of PCI bus for device drivers. diff --git a/drivers/random/Kconfig b/drivers/random/Kconfig index 541413c6978..f7d929c1704 100644 --- a/drivers/random/Kconfig +++ b/drivers/random/Kconfig @@ -40,7 +40,7 @@ config TEST_RANDOM_GENERATOR config X86_TSC_RANDOM_GENERATOR bool prompt "x86 timestamp counter based number generator" - depends on TEST_RANDOM_GENERATOR && X86_32 + depends on TEST_RANDOM_GENERATOR && X86 default y help This options enables number generator based on timestamp counter diff --git a/drivers/spi/spi_static_irq_stubs.S b/drivers/spi/spi_static_irq_stubs.S index 0a85adff4d8..33f6c7afbb5 100644 --- a/drivers/spi/spi_static_irq_stubs.S +++ b/drivers/spi/spi_static_irq_stubs.S @@ -15,7 +15,7 @@ */ #define _ASMLANGUAGE -#ifdef CONFIG_X86_32 +#ifdef CONFIG_X86 #include #include #endif diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig index ea0eaf194d9..f360c150fbc 100644 --- a/drivers/timer/Kconfig +++ b/drivers/timer/Kconfig @@ -22,7 +22,7 @@ menu "Timer Drivers" config HPET_TIMER bool "HPET timer" default n - depends on X86_32 + depends on X86 select IOAPIC select LOAPIC help @@ -95,7 +95,7 @@ endchoice config LOAPIC_TIMER bool "LOAPIC timer" - depends on (LOAPIC || MVIC) && X86_32 + depends on (LOAPIC || MVIC) && X86 default n help This option selects LOAPIC timer as a system timer. @@ -116,7 +116,7 @@ config LOAPIC_TIMER_IRQ_PRIORITY config LOAPIC_TIMER_DIVIDER_UNSUPPORTED bool "LOAPIC timer divider unsupported" - depends on LOAPIC_TIMER && MVIC && X86_32 + depends on LOAPIC_TIMER && MVIC && X86 default n help This option selects if Local Apic Timer divider register is supported. diff --git a/include/arch/cpu.h b/include/arch/cpu.h index 7d4c8e3cb78..08574c20131 100644 --- a/include/arch/cpu.h +++ b/include/arch/cpu.h @@ -19,7 +19,7 @@ #ifndef __ARCHCPU_H__ #define __ARCHCPU_H__ -#if defined(CONFIG_X86_32) +#if defined(CONFIG_X86) #include #elif defined(CONFIG_ARM) #include diff --git a/include/linker-defs.h b/include/linker-defs.h index b34b55cc04f..a7bda42a8a6 100644 --- a/include/linker-defs.h +++ b/include/linker-defs.h @@ -33,7 +33,7 @@ #include /* include platform dependent linker-defs */ -#ifdef CONFIG_X86_32 +#ifdef CONFIG_X86 #include #elif defined(CONFIG_ARM) /* Nothing yet to include */ @@ -71,7 +71,7 @@ DEVICE_INIT_LEVEL(APPLICATION) \ __device_init_end = .; \ -#ifdef CONFIG_X86_32 /* LINKER FILES: defines used by linker script */ +#ifdef CONFIG_X86 /* 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 d98f15b1c0c..196de7bd1b5 100644 --- a/include/sections.h +++ b/include/sections.h @@ -37,7 +37,7 @@ /* Various text section names */ #define TEXT text -#if defined(CONFIG_X86_32) +#if defined(CONFIG_X86) #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 c2b24fb0324..c6258b8455a 100644 --- a/include/toolchain/common.h +++ b/include/toolchain/common.h @@ -69,7 +69,7 @@ #ifdef _ASMLANGUAGE - #ifdef CONFIG_X86_32 + #ifdef CONFIG_X86 #ifdef PERF_OPT #define PERFOPT_ALIGN .balign 16 diff --git a/include/toolchain/gcc.h b/include/toolchain/gcc.h index ad6d6a70565..0f69ed89a29 100644 --- a/include/toolchain/gcc.h +++ b/include/toolchain/gcc.h @@ -253,7 +253,7 @@ A##a: ",%B0" \ "\n\t.type\t" #name ",%%object" : : "n"(~(value))) -#elif defined(CONFIG_X86_32) || defined(CONFIG_ARC) +#elif defined(CONFIG_X86) || defined(CONFIG_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 899c9bcef02..aeae262312e 100644 --- a/kernel/microkernel/k_irq.c +++ b/kernel/microkernel/k_irq.c @@ -73,7 +73,7 @@ static struct task_irq_info task_irq_object[MAX_TASK_IRQS] = { /* architecture-specific */ -#if defined(CONFIG_X86_32) +#if defined(CONFIG_X86) #define RELEASE_VECTOR(v) _IntVecMarkFree(v) diff --git a/kernel/nanokernel/nano_init.c b/kernel/nanokernel/nano_init.c index cc0d7baacf1..0ceba8dd103 100644 --- a/kernel/nanokernel/nano_init.c +++ b/kernel/nanokernel/nano_init.c @@ -199,13 +199,13 @@ static void nano_init(struct tcs *dummyOutContext) extern void *__stack_chk_guard; -#if defined(CONFIG_X86_32) +#if defined(CONFIG_X86) #define _MOVE_INSTR "movl " #elif defined(CONFIG_ARM) #define _MOVE_INSTR "str " #else #error "Unknown Architecture type" -#endif /* CONFIG_X86_32 */ +#endif /* CONFIG_X86 */ #define STACK_CANARY_INIT() \ do { \ diff --git a/misc/Kconfig b/misc/Kconfig index 8fa1a8cd15f..ce82a65af17 100644 --- a/misc/Kconfig +++ b/misc/Kconfig @@ -211,7 +211,7 @@ endmenu config BOOTLOADER_KEXEC bool prompt "Boot using Linux kexec() system call" - depends on X86_32 + depends on X86 default n help This option signifies that Linux boots the kernel using kexec system call @@ -221,7 +221,7 @@ config BOOTLOADER_UNKNOWN bool prompt "Generic boot loader support" default n - depends on X86_32 + depends on X86 help This option signifies that the target has a generic bootloader or that it supports multiple ways of booting and it isn't clear diff --git a/samples/include/irq_test_common.h b/samples/include/irq_test_common.h index 75dd61327e3..c7e595297e9 100644 --- a/samples/include/irq_test_common.h +++ b/samples/include/irq_test_common.h @@ -25,7 +25,7 @@ Interrupt stuff, abstracted across CPU architectures. #ifndef _IRQ_TEST_COMMON__H_ #define _IRQ_TEST_COMMON__H_ -#if defined(CONFIG_X86_32) +#if defined(CONFIG_X86) #define IRQ_PRIORITY 3 #elif defined(CONFIG_ARM) #if defined(CONFIG_CPU_CORTEX_M) @@ -46,7 +46,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(CONFIG_X86_32) +#if defined(CONFIG_X86) /* * Opcode for generating a software interrupt. The ISR associated with each * of these software interrupts will call either nano_isr_lifo_put() or @@ -98,7 +98,7 @@ struct isrInitInfo { static int initIRQ(struct isrInitInfo *i) { -#if defined(CONFIG_X86_32) +#if defined(CONFIG_X86) int vector; /* vector to which interrupt is connected */ if (i->isr[0]) { @@ -131,7 +131,7 @@ static int initIRQ(struct isrInitInfo *i) irq_enable(1); } #endif /* CONFIG_CPU_CORTEX_M */ -#endif /* CONFIG_X86_32 */ +#endif /* CONFIG_X86 */ 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 0aa7b72f65b..4ce0f56d420 100644 --- a/samples/microkernel/benchmark/footprint/src/test_asm_inline_gcc.h +++ b/samples/microkernel/benchmark/footprint/src/test_asm_inline_gcc.h @@ -19,7 +19,7 @@ #ifndef _TEST_ASM_INLINE_GCC_H #define _TEST_ASM_INLINE_GCC_H -#if !defined(__GNUC__) || !defined(CONFIG_X86_32) +#if !defined(__GNUC__) || !defined(CONFIG_X86) #error test_asm_inline_gcc.h goes only with x86 GCC #endif 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 f427d2d6c2b..4935160b45f 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 @@ -19,7 +19,7 @@ #ifndef _TEST_ASM_INLINE_GCC_H #define _TEST_ASM_INLINE_GCC_H -#if !defined(__GNUC__) || !defined(CONFIG_X86_32) +#if !defined(__GNUC__) || !defined(CONFIG_X86) #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 b1e4136ee5c..31172528b2c 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 @@ -19,7 +19,7 @@ #ifndef _TEST_ASM_INLINE_GCC_H #define _TEST_ASM_INLINE_GCC_H -#if !defined(__GNUC__) || !defined(CONFIG_X86_32) +#if !defined(__GNUC__) || !defined(CONFIG_X86) #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 54f183f15b5..da0a2b32693 100644 --- a/samples/microkernel/test/test_task_irq/src/raise_int.c +++ b/samples/microkernel/test/test_task_irq/src/raise_int.c @@ -26,7 +26,7 @@ #include -#if defined(CONFIG_X86_32) +#if defined(CONFIG_X86) 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 5ef007d5d82..10f40c45e13 100644 --- a/samples/microkernel/test/test_task_irq/src/test_device.c +++ b/samples/microkernel/test/test_task_irq/src/test_device.c @@ -37,7 +37,7 @@ exercises the task_irq_free() API. #define DEV4_ID 3 #define DEV5_ID 4 -#if defined(CONFIG_X86_32) +#if defined(CONFIG_X86) #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 58847c69ef3..b6c5cfeaef2 100644 --- a/samples/microkernel/test/test_tickless/src/test_tickless.c +++ b/samples/microkernel/test/test_tickless/src/test_tickless.c @@ -42,7 +42,7 @@ extern int32_t _sys_idle_threshold_ticks; * timestamp routines. */ -#if defined(CONFIG_X86_32) +#if defined(CONFIG_X86) typedef uint64_t _timer_res_t; #define _TIMER_ZERO 0ULL @@ -120,7 +120,7 @@ void ticklessTestTask(void) } cal_tsc /= CAL_REPS; -#if defined(CONFIG_X86_32) +#if defined(CONFIG_X86) printk("Calibrated time stamp period = 0x%x%x\n", (uint32_t)(cal_tsc >> 32), (uint32_t)(cal_tsc & 0xFFFFFFFFLL)); #elif defined(CONFIG_ARM) @@ -157,7 +157,7 @@ void ticklessTestTask(void) printk("end ticks : %d\n", end_ticks); printk("diff ticks : %d\n", diff_ticks); -#if defined(CONFIG_X86_32) +#if defined(CONFIG_X86) 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 0aa7b72f65b..4ce0f56d420 100644 --- a/samples/nanokernel/benchmark/footprint/src/test_asm_inline_gcc.h +++ b/samples/nanokernel/benchmark/footprint/src/test_asm_inline_gcc.h @@ -19,7 +19,7 @@ #ifndef _TEST_ASM_INLINE_GCC_H #define _TEST_ASM_INLINE_GCC_H -#if !defined(__GNUC__) || !defined(CONFIG_X86_32) +#if !defined(__GNUC__) || !defined(CONFIG_X86) #error test_asm_inline_gcc.h goes only with x86 GCC #endif diff --git a/samples/nanokernel/benchmark/object_footprint/src/test_asm_inline_gcc.h b/samples/nanokernel/benchmark/object_footprint/src/test_asm_inline_gcc.h index 0aa7b72f65b..4ce0f56d420 100644 --- a/samples/nanokernel/benchmark/object_footprint/src/test_asm_inline_gcc.h +++ b/samples/nanokernel/benchmark/object_footprint/src/test_asm_inline_gcc.h @@ -19,7 +19,7 @@ #ifndef _TEST_ASM_INLINE_GCC_H #define _TEST_ASM_INLINE_GCC_H -#if !defined(__GNUC__) || !defined(CONFIG_X86_32) +#if !defined(__GNUC__) || !defined(CONFIG_X86) #error test_asm_inline_gcc.h goes only with x86 GCC #endif