diff --git a/arch/x86/configs/micro_generic_pc_defconfig b/arch/x86/configs/micro_generic_pc_defconfig
index fe59009a7cd..fe80401c2c9 100644
--- a/arch/x86/configs/micro_generic_pc_defconfig
+++ b/arch/x86/configs/micro_generic_pc_defconfig
@@ -9,7 +9,9 @@ CONFIG_MICROKERNEL=y
 # General Kernel Options
 #
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=100
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=150000000
+CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=1193180
+# CONFIG_TICKLESS_KERNEL is not set
+# CONFIG_INIT_STACKS is not set
 # CONFIG_XIP is not set
 CONFIG_ENHANCED_SECURITY=y
 
@@ -25,6 +27,7 @@ CONFIG_ENHANCED_SECURITY=y
 # CONFIG_BOOT_BANNER is not set
 CONFIG_MAIN_STACK_SIZE=1024
 CONFIG_ISR_STACK_SIZE=2048
+# CONFIG_CONTEXT_CUSTOM_DATA is not set
 
 #
 # Microkernel Options
@@ -33,7 +36,6 @@ CONFIG_ISR_STACK_SIZE=2048
 #
 # Core Microkernel Options
 #
-CONFIG_COMMAND_PACKET=y
 CONFIG_MICROKERNEL_SERVER_STACK_SIZE=1024
 CONFIG_MICROKERNEL_SERVER_PRIORITY=0
 CONFIG_PRIORITY_CEILING=0
@@ -80,7 +82,7 @@ CONFIG_PHYS_LOAD_ADDR=0x00100000
 #
 # Board Capabilities
 #
-# CONFIG_BOI_HANDLER_SUPPORTED is not set
+CONFIG_BOI_HANDLER_SUPPORTED=y
 CONFIG_EOI_HANDLER_SUPPORTED=y
 # CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
 # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
@@ -92,9 +94,9 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
 #
 # BSP General Configuration
 #
-CONFIG_BSP_ATOM_N28XX=y
+# CONFIG_BSP_ATOM_N28XX is not set
 # CONFIG_BSP_PCMINUTEIA is not set
-# CONFIG_BSP_PCPENTIUM4 is not set
+CONFIG_BSP_PCPENTIUM4=y
 # CONFIG_BSP_QUARK is not set
 CONFIG_BSP_GENERIC_PC=y
 
@@ -127,35 +129,35 @@ CONFIG_CACHE_LINE_SIZE=64
 # Boot Sequence Options
 #
 CONFIG_BOOTLOADER_UNKNOWN=y
-# CONFIG_PIC is not set
-CONFIG_SHUTOFF_PIC=y
+CONFIG_PIC=y
 
 #
 # Floating Point Options
 #
 # CONFIG_FLOAT is not set
-CONFIG_CUSTOM_RANDOM_GENERATOR=y
+# CONFIG_CUSTOM_RANDOM_GENERATOR is not set
 CONFIG_BSP_DIR="generic_pc"
-CONFIG_LOAPIC_TIMER_FREQ=150000000
 
 #
 # Serial Ports
 #
 CONFIG_EXTRA_SERIAL_PORT=y
-CONFIG_SERIAL_INTERRUPT_LEVEL=y
-# CONFIG_SERIAL_INTERRUPT_LOW is not set
 
 #
 # Timer Configuration
 #
 # CONFIG_HPET_TIMER is not set
-CONFIG_LOAPIC_TIMER=y
 
 #
 # Interrupt Controller Configuration
 #
-CONFIG_IOAPIC=y
-CONFIG_LOAPIC=y
+# CONFIG_IOAPIC is not set
+# CONFIG_LOAPIC is not set
+
+#
+# General Setup
+#
+CONFIG_CROSS_COMPILE=""
 
 #
 # Debugging Options
@@ -171,14 +173,15 @@ CONFIG_LOAPIC=y
 # Compile and Link Features
 #
 CONFIG_COMPILER_OPT=""
-CONFIG_SECTION_GARBAGE_COLLECTION=y
 CONFIG_DRV_CONSOLE=y
+# CONFIG_UART_INTERRUPT_DRIVEN is not set
+# CONFIG_CONSOLE_HANDLER is not set
 CONFIG_DRV_SERIAL=y
 CONFIG_DRV_NS16550=y
 # CONFIG_DRV_K20_UART is not set
 # CONFIG_DRV_STELLARIS_UART is not set
 CONFIG_DRV_TIMER=y
-# CONFIG_PIT is not set
+CONFIG_PIT=y
 CONFIG_DRV_INTCTL=y
 # CONFIG_DRV_PCI is not set
 # CONFIG_DRV_RANDOM is not set
diff --git a/arch/x86/configs/micro_quark_defconfig b/arch/x86/configs/micro_quark_defconfig
index 21828f49a4a..f27313e7f5a 100644
--- a/arch/x86/configs/micro_quark_defconfig
+++ b/arch/x86/configs/micro_quark_defconfig
@@ -10,6 +10,8 @@ CONFIG_MICROKERNEL=y
 #
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=100
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
+# CONFIG_TICKLESS_KERNEL is not set
+# CONFIG_INIT_STACKS is not set
 # CONFIG_XIP is not set
 CONFIG_ENHANCED_SECURITY=y
 
@@ -25,6 +27,7 @@ CONFIG_ENHANCED_SECURITY=y
 # CONFIG_BOOT_BANNER is not set
 CONFIG_MAIN_STACK_SIZE=1024
 CONFIG_ISR_STACK_SIZE=2048
+# CONFIG_CONTEXT_CUSTOM_DATA is not set
 
 #
 # Microkernel Options
@@ -33,7 +36,6 @@ CONFIG_ISR_STACK_SIZE=2048
 #
 # Core Microkernel Options
 #
-CONFIG_COMMAND_PACKET=y
 CONFIG_MICROKERNEL_SERVER_STACK_SIZE=1024
 CONFIG_MICROKERNEL_SERVER_PRIORITY=0
 CONFIG_PRIORITY_CEILING=0
@@ -148,6 +150,11 @@ CONFIG_HPET_TIMER=y
 CONFIG_IOAPIC=y
 # CONFIG_LOAPIC is not set
 
+#
+# General Setup
+#
+CONFIG_CROSS_COMPILE=""
+
 #
 # Debugging Options
 #
@@ -162,8 +169,9 @@ CONFIG_IOAPIC=y
 # Compile and Link Features
 #
 CONFIG_COMPILER_OPT=""
-CONFIG_SECTION_GARBAGE_COLLECTION=y
 CONFIG_DRV_CONSOLE=y
+# CONFIG_UART_INTERRUPT_DRIVEN is not set
+# CONFIG_CONSOLE_HANDLER is not set
 CONFIG_DRV_SERIAL=y
 CONFIG_DRV_NS16550=y
 # CONFIG_DRV_K20_UART is not set
diff --git a/arch/x86/configs/nano_generic_pc_defconfig b/arch/x86/configs/nano_generic_pc_defconfig
index 59c9d4a0b6f..2ca283eb577 100644
--- a/arch/x86/configs/nano_generic_pc_defconfig
+++ b/arch/x86/configs/nano_generic_pc_defconfig
@@ -9,7 +9,9 @@ CONFIG_NANOKERNEL=y
 # General Kernel Options
 #
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=100
-CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=150000000
+CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=1193180
+# CONFIG_TICKLESS_KERNEL is not set
+# CONFIG_INIT_STACKS is not set
 # CONFIG_XIP is not set
 CONFIG_ENHANCED_SECURITY=y
 
@@ -25,6 +27,7 @@ CONFIG_ENHANCED_SECURITY=y
 # CONFIG_BOOT_BANNER is not set
 CONFIG_MAIN_STACK_SIZE=1024
 CONFIG_ISR_STACK_SIZE=2048
+# CONFIG_CONTEXT_CUSTOM_DATA is not set
 CONFIG_PRINTK=y
 
 #
@@ -42,7 +45,7 @@ CONFIG_PHYS_LOAD_ADDR=0x00100000
 #
 # Board Capabilities
 #
-# CONFIG_BOI_HANDLER_SUPPORTED is not set
+CONFIG_BOI_HANDLER_SUPPORTED=y
 CONFIG_EOI_HANDLER_SUPPORTED=y
 # CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
 # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
@@ -54,9 +57,9 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
 #
 # BSP General Configuration
 #
-CONFIG_BSP_ATOM_N28XX=y
+# CONFIG_BSP_ATOM_N28XX is not set
 # CONFIG_BSP_PCMINUTEIA is not set
-# CONFIG_BSP_PCPENTIUM4 is not set
+CONFIG_BSP_PCPENTIUM4=y
 # CONFIG_BSP_QUARK is not set
 CONFIG_BSP_GENERIC_PC=y
 
@@ -89,35 +92,35 @@ CONFIG_CACHE_LINE_SIZE=64
 # Boot Sequence Options
 #
 CONFIG_BOOTLOADER_UNKNOWN=y
-# CONFIG_PIC is not set
-CONFIG_SHUTOFF_PIC=y
+CONFIG_PIC=y
 
 #
 # Floating Point Options
 #
 # CONFIG_FLOAT is not set
-CONFIG_CUSTOM_RANDOM_GENERATOR=y
+# CONFIG_CUSTOM_RANDOM_GENERATOR is not set
 CONFIG_BSP_DIR="generic_pc"
-CONFIG_LOAPIC_TIMER_FREQ=150000000
 
 #
 # Serial Ports
 #
 CONFIG_EXTRA_SERIAL_PORT=y
-CONFIG_SERIAL_INTERRUPT_LEVEL=y
-# CONFIG_SERIAL_INTERRUPT_LOW is not set
 
 #
 # Timer Configuration
 #
 # CONFIG_HPET_TIMER is not set
-CONFIG_LOAPIC_TIMER=y
 
 #
 # Interrupt Controller Configuration
 #
-CONFIG_IOAPIC=y
-CONFIG_LOAPIC=y
+# CONFIG_IOAPIC is not set
+# CONFIG_LOAPIC is not set
+
+#
+# General Setup
+#
+CONFIG_CROSS_COMPILE=""
 
 #
 # Debugging Options
@@ -133,14 +136,15 @@ CONFIG_LOAPIC=y
 # Compile and Link Features
 #
 CONFIG_COMPILER_OPT=""
-CONFIG_SECTION_GARBAGE_COLLECTION=y
 CONFIG_DRV_CONSOLE=y
+# CONFIG_UART_INTERRUPT_DRIVEN is not set
+# CONFIG_CONSOLE_HANDLER is not set
 CONFIG_DRV_SERIAL=y
 CONFIG_DRV_NS16550=y
 # CONFIG_DRV_K20_UART is not set
 # CONFIG_DRV_STELLARIS_UART is not set
 CONFIG_DRV_TIMER=y
-# CONFIG_PIT is not set
+CONFIG_PIT=y
 CONFIG_DRV_INTCTL=y
 # CONFIG_DRV_PCI is not set
 # CONFIG_DRV_RANDOM is not set
diff --git a/arch/x86/configs/nano_quark_defconfig b/arch/x86/configs/nano_quark_defconfig
index f52225932b4..a10a8d86349 100644
--- a/arch/x86/configs/nano_quark_defconfig
+++ b/arch/x86/configs/nano_quark_defconfig
@@ -10,6 +10,8 @@ CONFIG_NANOKERNEL=y
 #
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=100
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=25000000
+# CONFIG_TICKLESS_KERNEL is not set
+# CONFIG_INIT_STACKS is not set
 # CONFIG_XIP is not set
 CONFIG_ENHANCED_SECURITY=y
 
@@ -25,6 +27,7 @@ CONFIG_ENHANCED_SECURITY=y
 # CONFIG_BOOT_BANNER is not set
 CONFIG_MAIN_STACK_SIZE=1024
 CONFIG_ISR_STACK_SIZE=2048
+# CONFIG_CONTEXT_CUSTOM_DATA is not set
 CONFIG_PRINTK=y
 
 #
@@ -110,6 +113,11 @@ CONFIG_HPET_TIMER=y
 CONFIG_IOAPIC=y
 # CONFIG_LOAPIC is not set
 
+#
+# General Setup
+#
+CONFIG_CROSS_COMPILE=""
+
 #
 # Debugging Options
 #
@@ -124,8 +132,9 @@ CONFIG_IOAPIC=y
 # Compile and Link Features
 #
 CONFIG_COMPILER_OPT=""
-CONFIG_SECTION_GARBAGE_COLLECTION=y
 CONFIG_DRV_CONSOLE=y
+# CONFIG_UART_INTERRUPT_DRIVEN is not set
+# CONFIG_CONSOLE_HANDLER is not set
 CONFIG_DRV_SERIAL=y
 CONFIG_DRV_NS16550=y
 # CONFIG_DRV_K20_UART is not set