From 2ce8d308923cbc87b4b347d17db69650aa0cf160 Mon Sep 17 00:00:00 2001
From: Anas Nashif <anas.nashif@intel.com>
Date: Sat, 3 Oct 2015 10:24:57 -0400
Subject: [PATCH] remove nano/micro defconfigs, use 1 file only

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>
---
 Makefile.inc                                  | 21 ++++++------
 arch/arc/configs/generic_arc_defconfig        |  1 -
 arch/arc/configs/nano_generic_arc_defconfig   | 13 -------
 arch/arc/defconfig                            |  2 --
 arch/arm/configs/fsl_frdm_k64f_defconfig      |  2 ++
 .../configs/micro_basic_cortex_m3_defconfig   | 14 --------
 .../arm/configs/micro_fsl_frdm_k64f_defconfig | 14 --------
 .../configs/nano_basic_cortex_m3_defconfig    | 14 --------
 arch/arm/configs/nano_fsl_frdm_k64f_defconfig | 14 --------
 arch/arm/defconfig                            |  1 -
 arch/x86/configs/basic_atom_defconfig         |  2 +-
 arch/x86/configs/basic_minuteia_defconfig     |  1 +
 arch/x86/configs/galileo_defconfig            | 21 ++++++++++--
 arch/x86/configs/micro_basic_atom_defconfig   | 18 ----------
 .../configs/micro_basic_minuteia_defconfig    | 18 ----------
 arch/x86/configs/micro_galileo_defconfig      | 31 -----------------
 arch/x86/configs/nano_basic_atom_defconfig    | 19 -----------
 .../x86/configs/nano_basic_minuteia_defconfig | 19 -----------
 arch/x86/configs/nano_galileo_defconfig       | 34 -------------------
 arch/x86/defconfig                            |  1 -
 20 files changed, 33 insertions(+), 227 deletions(-)
 delete mode 100644 arch/arc/configs/nano_generic_arc_defconfig
 delete mode 100644 arch/arm/configs/micro_basic_cortex_m3_defconfig
 delete mode 100644 arch/arm/configs/micro_fsl_frdm_k64f_defconfig
 delete mode 100644 arch/arm/configs/nano_basic_cortex_m3_defconfig
 delete mode 100644 arch/arm/configs/nano_fsl_frdm_k64f_defconfig
 delete mode 100644 arch/x86/configs/micro_basic_atom_defconfig
 delete mode 100644 arch/x86/configs/micro_basic_minuteia_defconfig
 delete mode 100644 arch/x86/configs/micro_galileo_defconfig
 delete mode 100644 arch/x86/configs/nano_basic_atom_defconfig
 delete mode 100644 arch/x86/configs/nano_basic_minuteia_defconfig
 delete mode 100644 arch/x86/configs/nano_galileo_defconfig

diff --git a/Makefile.inc b/Makefile.inc
index 9b0c514d908..c5ec5042860 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -13,18 +13,15 @@ override O := $(shell readlink -f $(O))
 
 export ARCH MDEF_FILE QEMU_EXTRA_FLAGS PROJECT_BASE
 
-# FIXME: Simplify this, very ugly
-ifdef PLATFORM_CONFIG
 ifndef KERNEL_TYPE
-$(error KERNEL_TYPE is not defined!  Set it to either micro or nano)
+KERNEL_TYPE = micro
 endif
-ifndef KBUILD_DEFCONFIG
-KBUILD_DEFCONFIG=$(KERNEL_TYPE)_$(PLATFORM_CONFIG)_defconfig
-KBUILD_DEFCONFIG_PATH=$(ZEPHYR_BASE)/arch/$(ARCH)/configs/$(KBUILD_DEFCONFIG)
+
+ifdef PLATFORM_CONFIG
+KBUILD_DEFCONFIG_PATH=$(ZEPHYR_BASE)/arch/$(ARCH)/configs/$(PLATFORM_CONFIG)_defconfig
+export KBUILD_DEFCONFIG_PATH
 else
-KBUILD_DEFCONFIG_PATH=$(KBUILD_DEFCONFIG)
-endif
-export KBUILD_DEFCONFIG
+$(error PLATFORM_CONFIG is not defined!)
 endif
 
 SOURCE_DIR ?= $(PROJECT_BASE)/src/
@@ -69,9 +66,11 @@ initconfig: $(DOTCONFIG)
 %:
 	$(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 -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) \
 		PROJECT=$(PROJECT_BASE) oldconfig
 
diff --git a/arch/arc/configs/generic_arc_defconfig b/arch/arc/configs/generic_arc_defconfig
index fe5a99803e5..322f904fcb2 100644
--- a/arch/arc/configs/generic_arc_defconfig
+++ b/arch/arc/configs/generic_arc_defconfig
@@ -1,5 +1,4 @@
 CONFIG_ARC=y
-CONFIG_NANOKERNEL=y
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=32000000
 CONFIG_PLATFORM_GENERIC_ARC=y
 CONFIG_CPU_ARCEM4=y
diff --git a/arch/arc/configs/nano_generic_arc_defconfig b/arch/arc/configs/nano_generic_arc_defconfig
deleted file mode 100644
index 0519c172f39..00000000000
--- a/arch/arc/configs/nano_generic_arc_defconfig
+++ /dev/null
@@ -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
diff --git a/arch/arc/defconfig b/arch/arc/defconfig
index 0519c172f39..322f904fcb2 100644
--- a/arch/arc/defconfig
+++ b/arch/arc/defconfig
@@ -1,5 +1,3 @@
-CONFIG_NANOKERNEL=y
-CONFIG_NANO_TIMERS=y
 CONFIG_ARC=y
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=32000000
 CONFIG_PLATFORM_GENERIC_ARC=y
diff --git a/arch/arm/configs/fsl_frdm_k64f_defconfig b/arch/arm/configs/fsl_frdm_k64f_defconfig
index fa50aeae448..8fd28669517 100644
--- a/arch/arm/configs/fsl_frdm_k64f_defconfig
+++ b/arch/arm/configs/fsl_frdm_k64f_defconfig
@@ -1,4 +1,6 @@
+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
diff --git a/arch/arm/configs/micro_basic_cortex_m3_defconfig b/arch/arm/configs/micro_basic_cortex_m3_defconfig
deleted file mode 100644
index e03ea0d37cc..00000000000
--- a/arch/arm/configs/micro_basic_cortex_m3_defconfig
+++ /dev/null
@@ -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
diff --git a/arch/arm/configs/micro_fsl_frdm_k64f_defconfig b/arch/arm/configs/micro_fsl_frdm_k64f_defconfig
deleted file mode 100644
index 8fd28669517..00000000000
--- a/arch/arm/configs/micro_fsl_frdm_k64f_defconfig
+++ /dev/null
@@ -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
diff --git a/arch/arm/configs/nano_basic_cortex_m3_defconfig b/arch/arm/configs/nano_basic_cortex_m3_defconfig
deleted file mode 100644
index 183296b0aae..00000000000
--- a/arch/arm/configs/nano_basic_cortex_m3_defconfig
+++ /dev/null
@@ -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
diff --git a/arch/arm/configs/nano_fsl_frdm_k64f_defconfig b/arch/arm/configs/nano_fsl_frdm_k64f_defconfig
deleted file mode 100644
index d98365f6557..00000000000
--- a/arch/arm/configs/nano_fsl_frdm_k64f_defconfig
+++ /dev/null
@@ -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
diff --git a/arch/arm/defconfig b/arch/arm/defconfig
index ed90dded793..fe9e3909a4d 100644
--- a/arch/arm/defconfig
+++ b/arch/arm/defconfig
@@ -1,4 +1,3 @@
-CONFIG_MICROKERNEL=y
 CONFIG_ARM=y
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=12000000
 CONFIG_PLATFORM_TI_LM3S6965=y
diff --git a/arch/x86/configs/basic_atom_defconfig b/arch/x86/configs/basic_atom_defconfig
index 0608307fb84..9494da068b5 100644
--- a/arch/x86/configs/basic_atom_defconfig
+++ b/arch/x86/configs/basic_atom_defconfig
@@ -1,7 +1,7 @@
 CONFIG_X86_32=y
-CONFIG_MICROKERNEL=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
diff --git a/arch/x86/configs/basic_minuteia_defconfig b/arch/x86/configs/basic_minuteia_defconfig
index fe55bf21ae3..51a19bc718d 100644
--- a/arch/x86/configs/basic_minuteia_defconfig
+++ b/arch/x86/configs/basic_minuteia_defconfig
@@ -1,6 +1,7 @@
 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
diff --git a/arch/x86/configs/galileo_defconfig b/arch/x86/configs/galileo_defconfig
index bdd2b57327d..d5174e77c57 100644
--- a/arch/x86/configs/galileo_defconfig
+++ b/arch/x86/configs/galileo_defconfig
@@ -1,3 +1,5 @@
+CONFIG_NANO_TIMERS=y
+CONFIG_NANO_TIMEOUTS=y
 CONFIG_X86_32=y
 CONFIG_PLATFORM_GALILEO=y
 CONFIG_CPU_MINUTEIA=y
@@ -5,9 +7,24 @@ 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_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
diff --git a/arch/x86/configs/micro_basic_atom_defconfig b/arch/x86/configs/micro_basic_atom_defconfig
deleted file mode 100644
index f431f995a08..00000000000
--- a/arch/x86/configs/micro_basic_atom_defconfig
+++ /dev/null
@@ -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
-
diff --git a/arch/x86/configs/micro_basic_minuteia_defconfig b/arch/x86/configs/micro_basic_minuteia_defconfig
deleted file mode 100644
index 57822c99b49..00000000000
--- a/arch/x86/configs/micro_basic_minuteia_defconfig
+++ /dev/null
@@ -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
-
diff --git a/arch/x86/configs/micro_galileo_defconfig b/arch/x86/configs/micro_galileo_defconfig
deleted file mode 100644
index c9d61e32a7c..00000000000
--- a/arch/x86/configs/micro_galileo_defconfig
+++ /dev/null
@@ -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
diff --git a/arch/x86/configs/nano_basic_atom_defconfig b/arch/x86/configs/nano_basic_atom_defconfig
deleted file mode 100644
index df89414e66f..00000000000
--- a/arch/x86/configs/nano_basic_atom_defconfig
+++ /dev/null
@@ -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
-
diff --git a/arch/x86/configs/nano_basic_minuteia_defconfig b/arch/x86/configs/nano_basic_minuteia_defconfig
deleted file mode 100644
index ce294157104..00000000000
--- a/arch/x86/configs/nano_basic_minuteia_defconfig
+++ /dev/null
@@ -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
-
diff --git a/arch/x86/configs/nano_galileo_defconfig b/arch/x86/configs/nano_galileo_defconfig
deleted file mode 100644
index f70f475ce21..00000000000
--- a/arch/x86/configs/nano_galileo_defconfig
+++ /dev/null
@@ -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
diff --git a/arch/x86/defconfig b/arch/x86/defconfig
index db61cf06266..fe55bf21ae3 100644
--- a/arch/x86/defconfig
+++ b/arch/x86/defconfig
@@ -1,4 +1,3 @@
-CONFIG_MICROKERNEL=y
 CONFIG_X86_32=y
 CONFIG_PLATFORM_IA32=y
 CONFIG_CPU_MINUTEIA=y