michaelh/zephyr
1
0
Fork 0
Code Releases Activity

remove nano/micro defconfigs, use 1 file only

Browse source 
Do not use micro_* or nano_* defconfigs, instead maintain platform
in one single defconfig and merge nano or micro support on top.

Change-Id: I0d5184f37865ed8312e516e48cf5a8584a287dfe
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2015-10-03 10:24:57 -04:00
commit 2ce8d30892
20 changed files with 33 additions and 227 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Makefile.inc
View file

@ -13,18 +13,15 @@ override O := $(shell readlink -f $(O))
export ARCH MDEF_FILE QEMU_EXTRA_FLAGS PROJECT_BASE export ARCH MDEF_FILE QEMU_EXTRA_FLAGS PROJECT_BASE
# FIXME: Simplify this, very ugly
ifdef PLATFORM_CONFIG
ifndef KERNEL_TYPE ifndef KERNEL_TYPE
$(error KERNEL_TYPE is not defined! Set it to either micro or nano) KERNEL_TYPE = micro
endif endif
ifndef KBUILD_DEFCONFIG
KBUILD_DEFCONFIG=$(KERNEL_TYPE)_$(PLATFORM_CONFIG)_defconfig ifdef PLATFORM_CONFIG
KBUILD_DEFCONFIG_PATH=$(ZEPHYR_BASE)/arch/$(ARCH)/configs/$(KBUILD_DEFCONFIG) KBUILD_DEFCONFIG_PATH=$(ZEPHYR_BASE)/arch/$(ARCH)/configs/$(PLATFORM_CONFIG)_defconfig
export KBUILD_DEFCONFIG_PATH
else else
KBUILD_DEFCONFIG_PATH=$(KBUILD_DEFCONFIG) $(error PLATFORM_CONFIG is not defined!)
endif
export KBUILD_DEFCONFIG
endif endif
SOURCE_DIR ?= $(PROJECT_BASE)/src/ SOURCE_DIR ?= $(PROJECT_BASE)/src/
@ -69,9 +66,11 @@ initconfig: $(DOTCONFIG)
%: %:
$(Q)$(call zephyrmake,$(O),$@) $(Q)$(call zephyrmake,$(O),$@)
$(DOTCONFIG): $(CONF_FILE) KERNEL_CONFIG = $(ZEPHYR_BASE)/kernel/configs/$(KERNEL_TYPE).config
$(DOTCONFIG): $(KBUILD_DEFCONFIG_PATH) $(CONF_FILE)
$(Q)$(CONFIG_SHELL) $(ZEPHYR_BASE)/scripts/kconfig/merge_config.sh \ $(Q)$(CONFIG_SHELL) $(ZEPHYR_BASE)/scripts/kconfig/merge_config.sh \
-q -m -O $(O) $(KBUILD_DEFCONFIG_PATH) $< -q -m -O $(O) $(KBUILD_DEFCONFIG_PATH) $(KERNEL_CONFIG) $(CONF_FILE)
$(Q)yes "" | $(MAKE) $(S) -C $(ZEPHYR_BASE) O=$(O) \ $(Q)yes "" | $(MAKE) $(S) -C $(ZEPHYR_BASE) O=$(O) \
PROJECT=$(PROJECT_BASE) oldconfig PROJECT=$(PROJECT_BASE) oldconfig

1
arch/arc/configs/generic_arc_defconfig
View file

@ -1,5 +1,4 @@
CONFIG_ARC=y CONFIG_ARC=y
CONFIG_NANOKERNEL=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=32000000 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=32000000
CONFIG_PLATFORM_GENERIC_ARC=y CONFIG_PLATFORM_GENERIC_ARC=y
CONFIG_CPU_ARCEM4=y CONFIG_CPU_ARCEM4=y

13
arch/arc/configs/nano_generic_arc_defconfig
View file

@ -1,13 +0,0 @@
CONFIG_NANOKERNEL=y
CONFIG_NANO_TIMERS=y
CONFIG_ARC=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=32000000
CONFIG_PLATFORM_GENERIC_ARC=y
CONFIG_CPU_ARCEM4=y
CONFIG_CPU_ARCV2=y
CONFIG_RAM_START=0xa8000000
CONFIG_RAM_SIZE=0x14000
CONFIG_SERIAL=y
CONFIG_NS16550=y
CONFIG_ARCV2_INTERRUPT_UNIT=y
CONFIG_ARCV2_TIMER=y

2
arch/arc/defconfig
View file

@ -1,5 +1,3 @@
CONFIG_NANOKERNEL=y
CONFIG_NANO_TIMERS=y
CONFIG_ARC=y CONFIG_ARC=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=32000000 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=32000000
CONFIG_PLATFORM_GENERIC_ARC=y CONFIG_PLATFORM_GENERIC_ARC=y

2
arch/arm/configs/fsl_frdm_k64f_defconfig
View file

@ -1,4 +1,6 @@
CONFIG_MICROKERNEL=y
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_MICROKERNEL=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=120000000 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=120000000
CONFIG_PLATFORM_FSL_FRDM_K64F=y CONFIG_PLATFORM_FSL_FRDM_K64F=y
CONFIG_CONSOLE=y CONFIG_CONSOLE=y

14
arch/arm/configs/micro_basic_cortex_m3_defconfig
View file

@ -1,14 +0,0 @@
CONFIG_MICROKERNEL=y
CONFIG_ARM=y
CONFIG_MICROKERNEL=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=12000000
CONFIG_PLATFORM_TI_LM3S6965=y
CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y
CONFIG_UART_CONSOLE_INDEX=0
CONFIG_UART_CONSOLE_BAUDRATE=115200
CONFIG_SERIAL=y
CONFIG_CORTEX_M_SYSTICK=y
CONFIG_FLASH_SIZE=256
CONFIG_SRAM_SIZE=64
CONFIG_STELLARIS_UART=y

14
arch/arm/configs/micro_fsl_frdm_k64f_defconfig
View file

@ -1,14 +0,0 @@
CONFIG_MICROKERNEL=y
CONFIG_ARM=y
CONFIG_MICROKERNEL=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=120000000
CONFIG_PLATFORM_FSL_FRDM_K64F=y
CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y
CONFIG_UART_CONSOLE_INDEX=0
CONFIG_UART_CONSOLE_BAUDRATE=115200
CONFIG_SERIAL=y
CONFIG_CORTEX_M_SYSTICK=y
CONFIG_FLASH_SIZE=1024
CONFIG_SRAM_SIZE=192
CONFIG_K20_UART=y

14
arch/arm/configs/nano_basic_cortex_m3_defconfig
View file

@ -1,14 +0,0 @@
CONFIG_NANOKERNEL=y
CONFIG_NANO_TIMERS=y
CONFIG_ARM=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=12000000
CONFIG_PLATFORM_TI_LM3S6965=y
CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y
CONFIG_UART_CONSOLE_INDEX=0
CONFIG_UART_CONSOLE_BAUDRATE=115200
CONFIG_SERIAL=y
CONFIG_CORTEX_M_SYSTICK=y
CONFIG_FLASH_SIZE=256
CONFIG_SRAM_SIZE=64
CONFIG_STELLARIS_UART=y

14
arch/arm/configs/nano_fsl_frdm_k64f_defconfig
View file

@ -1,14 +0,0 @@
CONFIG_NANOKERNEL=y
CONFIG_NANO_TIMERS=y
CONFIG_ARM=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=120000000
CONFIG_PLATFORM_FSL_FRDM_K64F=y
CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y
CONFIG_UART_CONSOLE_INDEX=0
CONFIG_UART_CONSOLE_BAUDRATE=115200
CONFIG_SERIAL=y
CONFIG_CORTEX_M_SYSTICK=y
CONFIG_FLASH_SIZE=1024
CONFIG_SRAM_SIZE=192
CONFIG_K20_UART=y

1
arch/arm/defconfig
View file

@ -1,4 +1,3 @@
CONFIG_MICROKERNEL=y
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=12000000 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=12000000
CONFIG_PLATFORM_TI_LM3S6965=y CONFIG_PLATFORM_TI_LM3S6965=y

2
arch/x86/configs/basic_atom_defconfig
View file

@ -1,7 +1,7 @@
CONFIG_X86_32=y CONFIG_X86_32=y
CONFIG_MICROKERNEL=y
CONFIG_PLATFORM_IA32=y CONFIG_PLATFORM_IA32=y
CONFIG_CPU_ATOM=y CONFIG_CPU_ATOM=y
CONFIG_IA32_LEGACY_IO_PORTS=y
CONFIG_HPET_TIMER=y CONFIG_HPET_TIMER=y
CONFIG_HPET_TIMER_IRQ=2 CONFIG_HPET_TIMER_IRQ=2
CONFIG_HPET_TIMER_LEVEL_LOW=y CONFIG_HPET_TIMER_LEVEL_LOW=y

1
arch/x86/configs/basic_minuteia_defconfig
View file

@ -1,6 +1,7 @@
CONFIG_X86_32=y CONFIG_X86_32=y
CONFIG_PLATFORM_IA32=y CONFIG_PLATFORM_IA32=y
CONFIG_CPU_MINUTEIA=y CONFIG_CPU_MINUTEIA=y
CONFIG_IA32_LEGACY_IO_PORTS=y
CONFIG_HPET_TIMER=y CONFIG_HPET_TIMER=y
CONFIG_HPET_TIMER_IRQ=2 CONFIG_HPET_TIMER_IRQ=2
CONFIG_HPET_TIMER_LEVEL_LOW=n CONFIG_HPET_TIMER_LEVEL_LOW=n

21
arch/x86/configs/galileo_defconfig
View file

@ -1,3 +1,5 @@
CONFIG_NANO_TIMERS=y
CONFIG_NANO_TIMEOUTS=y
CONFIG_X86_32=y CONFIG_X86_32=y
CONFIG_PLATFORM_GALILEO=y CONFIG_PLATFORM_GALILEO=y
CONFIG_CPU_MINUTEIA=y CONFIG_CPU_MINUTEIA=y
@ -5,9 +7,24 @@ CONFIG_PCI_LEGACY_BRIDGE=y
CONFIG_CONSOLE=y CONFIG_CONSOLE=y
CONFIG_SERIAL=y CONFIG_SERIAL=y
CONFIG_NS16550=y CONFIG_NS16550=y
CONFIG_NS16550_PCI=y
CONFIG_UART_CONSOLE=y CONFIG_UART_CONSOLE=y
CONFIG_HPET_TIMER_LEVEL_LOW=y CONFIG_HPET_TIMER_LEVEL_LOW=y
CONFIG_SERIAL_INTERRUPT_LOW=y CONFIG_SERIAL_INTERRUPT_LOW=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
CONFIG_NS16550_PCI=y CONFIG_GPIO=y
CONFIG_GPIO_DW_0_IRQ_SHARED=y
CONFIG_I2C=y
CONFIG_I2C_DW=y
CONFIG_I2C_DW_0=y
CONFIG_I2C_DW_0_IRQ_SHARED=y
CONFIG_GPIO_PCAL9535A=y
CONFIG_GPIO_MMIO=y
CONFIG_GPIO_MMIO_0=y
CONFIG_GPIO_MMIO_0_ACCESS_IO=y
CONFIG_GPIO_MMIO_1=y
CONFIG_GPIO_MMIO_1_ACCESS_IO=y
CONFIG_I2C_DW_IRQ_LEVEL_LOW=y
CONFIG_SHARED_IRQ=y
CONFIG_SHARED_IRQ_0_LEVEL_LOW=y
CONFIG_SPI_INTEL_LEVEL_LOW=y

18
arch/x86/configs/micro_basic_atom_defconfig
View file

@ -1,18 +0,0 @@
CONFIG_MICROKERNEL=y
CONFIG_X86_32=y
CONFIG_PLATFORM_IA32=y
CONFIG_CPU_ATOM=y
CONFIG_IA32_LEGACY_IO_PORTS=y
CONFIG_HPET_TIMER=y
CONFIG_HPET_TIMER_IRQ=2
CONFIG_HPET_TIMER_LEVEL_LOW=y
CONFIG_HPET_TIMER_LEGACY_EMULATION=y
CONFIG_HPET_TIMER_RISING_EDGE=y
CONFIG_PIC_DISABLE=y
CONFIG_LOAPIC=y
CONFIG_CONSOLE=y
CONFIG_SERIAL=y
CONFIG_NS16550=y
CONFIG_UART_CONSOLE=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000

18
arch/x86/configs/micro_basic_minuteia_defconfig
View file

@ -1,18 +0,0 @@
CONFIG_MICROKERNEL=y
CONFIG_X86_32=y
CONFIG_PLATFORM_IA32=y
CONFIG_CPU_MINUTEIA=y
CONFIG_IA32_LEGACY_IO_PORTS=y
CONFIG_HPET_TIMER=y
CONFIG_HPET_TIMER_IRQ=2
CONFIG_HPET_TIMER_LEVEL_LOW=n
CONFIG_HPET_TIMER_LEGACY_EMULATION=y
CONFIG_HPET_TIMER_RISING_EDGE=n
CONFIG_PIC_DISABLE=y
CONFIG_LOAPIC=y
CONFIG_CONSOLE=y
CONFIG_SERIAL=y
CONFIG_NS16550=y
CONFIG_UART_CONSOLE=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000

31
arch/x86/configs/micro_galileo_defconfig
View file

@ -1,31 +0,0 @@
CONFIG_MICROKERNEL=y
CONFIG_NANO_TIMERS=y
CONFIG_NANO_TIMEOUTS=y
CONFIG_X86_32=y
CONFIG_PLATFORM_GALILEO=y
CONFIG_CPU_MINUTEIA=y
CONFIG_PCI_LEGACY_BRIDGE=y
CONFIG_CONSOLE=y
CONFIG_SERIAL=y
CONFIG_NS16550=y
CONFIG_NS16550_PCI=y
CONFIG_UART_CONSOLE=y
CONFIG_HPET_TIMER_LEVEL_LOW=y
CONFIG_SERIAL_INTERRUPT_LOW=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
CONFIG_GPIO=y
CONFIG_GPIO_DW_0_IRQ_SHARED=y
CONFIG_I2C=y
CONFIG_I2C_DW=y
CONFIG_I2C_DW_0=y
CONFIG_I2C_DW_0_IRQ_SHARED=y
CONFIG_GPIO_PCAL9535A=y
CONFIG_GPIO_MMIO=y
CONFIG_GPIO_MMIO_0=y
CONFIG_GPIO_MMIO_0_ACCESS_IO=y
CONFIG_GPIO_MMIO_1=y
CONFIG_GPIO_MMIO_1_ACCESS_IO=y
CONFIG_I2C_DW_IRQ_LEVEL_LOW=y
CONFIG_SHARED_IRQ=y
CONFIG_SHARED_IRQ_0_LEVEL_LOW=y
CONFIG_SPI_INTEL_LEVEL_LOW=y

19
arch/x86/configs/nano_basic_atom_defconfig
View file

@ -1,19 +0,0 @@
CONFIG_NANOKERNEL=y
CONFIG_NANO_TIMERS=y
CONFIG_X86_32=y
CONFIG_PLATFORM_IA32=y
CONFIG_CPU_ATOM=y
CONFIG_IA32_LEGACY_IO_PORTS=y
CONFIG_HPET_TIMER=y
CONFIG_HPET_TIMER_IRQ=2
CONFIG_HPET_TIMER_LEVEL_LOW=y
CONFIG_HPET_TIMER_LEGACY_EMULATION=y
CONFIG_HPET_TIMER_RISING_EDGE=y
CONFIG_PIC_DISABLE=y
CONFIG_LOAPIC=y
CONFIG_CONSOLE=y
CONFIG_SERIAL=y
CONFIG_NS16550=y
CONFIG_UART_CONSOLE=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000

19
arch/x86/configs/nano_basic_minuteia_defconfig
View file

@ -1,19 +0,0 @@
CONFIG_NANOKERNEL=y
CONFIG_NANO_TIMERS=y
CONFIG_X86_32=y
CONFIG_PLATFORM_IA32=y
CONFIG_CPU_MINUTEIA=y
CONFIG_IA32_LEGACY_IO_PORTS=y
CONFIG_HPET_TIMER=y
CONFIG_HPET_TIMER_IRQ=2
CONFIG_HPET_TIMER_LEVEL_LOW=n
CONFIG_HPET_TIMER_LEGACY_EMULATION=y
CONFIG_HPET_TIMER_RISING_EDGE=n
CONFIG_PIC_DISABLE=y
CONFIG_LOAPIC=y
CONFIG_CONSOLE=y
CONFIG_SERIAL=y
CONFIG_NS16550=y
CONFIG_UART_CONSOLE=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000

34
arch/x86/configs/nano_galileo_defconfig
View file

@ -1,34 +0,0 @@
CONFIG_NANOKERNEL=y
CONFIG_NANO_TIMERS=y
CONFIG_NANO_TIMEOUTS=y
CONFIG_X86_32=y
CONFIG_PLATFORM_GALILEO=y
CONFIG_CPU_MINUTEIA=y
CONFIG_PCI_LEGACY_BRIDGE=y
CONFIG_CONSOLE=y
CONFIG_SERIAL=y
CONFIG_NS16550=y
CONFIG_NS16550_PCI=y
CONFIG_UART_CONSOLE=y
CONFIG_HPET_TIMER_LEVEL_LOW=y
CONFIG_SERIAL_INTERRUPT_LOW=y
CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
CONFIG_I2C=y
CONFIG_I2C_DW=y
CONFIG_I2C_DW_0=y
CONFIG_I2C_DW_0_IRQ_SHARED=y
CONFIG_GPIO=y
CONFIG_GPIO_DW_0_IRQ_SHARED=y
CONFIG_GPIO_PCAL9535A=y
CONFIG_GPIO_PCAL9535A_0=y
CONFIG_GPIO_PCAL9535A_1=y
CONFIG_GPIO_PCAL9535A_2=y
CONFIG_GPIO_MMIO=y
CONFIG_GPIO_MMIO_0=y
CONFIG_GPIO_MMIO_0_ACCESS_IO=y
CONFIG_GPIO_MMIO_1=y
CONFIG_GPIO_MMIO_1_ACCESS_IO=y
CONFIG_I2C_DW_IRQ_LEVEL_LOW=y
CONFIG_SHARED_IRQ=y
CONFIG_SHARED_IRQ_0_LEVEL_LOW=y
CONFIG_SPI_INTEL_LEVEL_LOW=y

1
arch/x86/defconfig
View file

@ -1,4 +1,3 @@
CONFIG_MICROKERNEL=y
CONFIG_X86_32=y CONFIG_X86_32=y
CONFIG_PLATFORM_IA32=y CONFIG_PLATFORM_IA32=y
CONFIG_CPU_MINUTEIA=y CONFIG_CPU_MINUTEIA=y