patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

kconfig: define architecture as a kconfig variable

Browse source 
Do not depend on environment variables and use a kconfig variable
for defining the architecture.

In addition, remove the X86_32 variable, it just duplicates X86 for
not good reason, at least until start supporting MCUs with 64bit.

Change-Id: Ia001db81ed007e6a43f34506fed9be1345b88a4b
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2015-10-09 06:20:52 -04:00
parent b2bbf5a7b7
commit 77ba3c3b8b
41 changed files with 112 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Kconfig.zephyr
View file

@ -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"

26
arch/Kconfig
View file

@ -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"

24
arch/arc/Kconfig
View file

@ -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

21
arch/arm/Kconfig
View file

@ -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

17
arch/x86/Kconfig
View file

@ -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

2
arch/x86/configs/arduino_101_defconfig
View file

@ -1,4 +1,4 @@
CONFIG_X86_32=y
CONFIG_X86=y
CONFIG_PLATFORM_QUARK_SE_X86=y
CONFIG_CPU_MINUTEIA=y
CONFIG_CONSOLE=y

2
arch/x86/configs/basic_atom_defconfig
View file

@ -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

2
arch/x86/configs/basic_minuteia_defconfig
View file

@ -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

2
arch/x86/configs/galileo_defconfig
View file

@ -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

2
arch/x86/configs/quark_d2000_defconfig
View file

@ -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

2
arch/x86/configs/quark_se-x86_defconfig
View file

@ -1,4 +1,4 @@
CONFIG_X86_32=y
CONFIG_X86=y
CONFIG_PLATFORM_QUARK_SE_X86=y
CONFIG_CPU_MINUTEIA=y
CONFIG_CONSOLE=y

2
arch/x86/defconfig
View file

@ -1,4 +1,4 @@
CONFIG_X86_32=y
CONFIG_X86=y
CONFIG_PLATFORM_IA32=y
CONFIG_CPU_MINUTEIA=y
CONFIG_HPET_TIMER=y

2
arch/x86/include/asm_inline.h
View file

@ -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

10
doc/collaboration/code/doxygen/irq_test_common_commented.h
View file

@ -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;
}

2
drivers/aio/aio_static_irq_stubs.S
View file

@ -22,7 +22,7 @@
#define _ASMLANGUAGE
#ifdef CONFIG_X86_32
#ifdef CONFIG_X86
#include <arch/x86/asm.h>
#include <drivers/ioapic.h>
#endif

2
drivers/ethernet/eth_static_irq_stubs.S
View file

@ -22,7 +22,7 @@
#define _ASMLANGUAGE
#ifdef CONFIG_X86_32
#ifdef CONFIG_X86
#include <arch/x86/asm.h>
#include <drivers/ioapic.h>
#endif

2
drivers/gpio/gpio_static_irq_stubs.S
View file

@ -22,7 +22,7 @@
#define _ASMLANGUAGE
#ifdef CONFIG_X86_32
#ifdef CONFIG_X86
#include <arch/x86/asm.h>
#include <drivers/ioapic.h>
#endif

2
drivers/i2c/i2c_static_irq_stubs.S
View file

@ -22,7 +22,7 @@
#define _ASMLANGUAGE
#ifdef CONFIG_X86_32
#ifdef CONFIG_X86
#include <arch/x86/asm.h>
#include <drivers/ioapic.h>
#endif

4
drivers/interrupt_controller/Kconfig
View file

@ -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

2
drivers/ipi/ipi_static_irq_stubs.S
View file

@ -16,7 +16,7 @@
#define _ASMLANGUAGE
#ifdef CONFIG_X86_32
#ifdef CONFIG_X86
#include <arch/x86/asm.h>
#include <drivers/ioapic.h>
#endif

4
drivers/pci/Kconfig
View file

@ -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.

2
drivers/random/Kconfig
View file

@ -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

2
drivers/spi/spi_static_irq_stubs.S
View file

@ -15,7 +15,7 @@
*/
#define _ASMLANGUAGE
#ifdef CONFIG_X86_32
#ifdef CONFIG_X86
#include <arch/x86/asm.h>
#include <drivers/ioapic.h>
#endif

6
drivers/timer/Kconfig
View file

@ -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.

2
include/arch/cpu.h
View file

@ -19,7 +19,7 @@
#ifndef __ARCHCPU_H__
#define __ARCHCPU_H__
#if defined(CONFIG_X86_32)
#if defined(CONFIG_X86)
#include <arch/x86/arch.h>
#elif defined(CONFIG_ARM)
#include <arch/arm/arch.h>

4
include/linker-defs.h
View file

@ -33,7 +33,7 @@
#include <sections.h>
/* include platform dependent linker-defs */
#ifdef CONFIG_X86_32
#ifdef CONFIG_X86
#include <arch/x86/linker-defs-arch.h>
#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

2
include/sections.h
View file

@ -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 */

2
include/toolchain/common.h
View file

@ -69,7 +69,7 @@
#ifdef _ASMLANGUAGE
#ifdef CONFIG_X86_32
#ifdef CONFIG_X86
#ifdef PERF_OPT
#define PERFOPT_ALIGN .balign 16

2
include/toolchain/gcc.h
View file

@ -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 \

2
kernel/microkernel/k_irq.c
View file

@ -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)

4
kernel/nanokernel/nano_init.c
View file

@ -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 { \

4
misc/Kconfig
View file

@ -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

8
samples/include/irq_test_common.h
View file

@ -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;
}

2
samples/microkernel/benchmark/footprint/src/test_asm_inline_gcc.h
View file

@ -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

2
samples/microkernel/benchmark/latency_measure/src/test_asm_inline_gcc.h
View file

@ -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

2
samples/microkernel/test/test_static_idt/src/test_asm_inline_gcc.h
View file

@ -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

2
samples/microkernel/test/test_task_irq/src/raise_int.c
View file

@ -26,7 +26,7 @@
#include <stdint.h>
#if defined(CONFIG_X86_32)
#if defined(CONFIG_X86)
static void genInt0(void)
{

2
samples/microkernel/test/test_task_irq/src/test_device.c
View file

@ -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

6
samples/microkernel/test/test_tickless/src/test_tickless.c
View file

@ -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",

2
samples/nanokernel/benchmark/footprint/src/test_asm_inline_gcc.h
View file

@ -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

2
samples/nanokernel/benchmark/object_footprint/src/test_asm_inline_gcc.h
View file

@ -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