diff --git a/arch/x86/configs/micro_generic_pc_atom_n28xx_defconfig b/arch/x86/configs/micro_generic_pc_atom_n28xx_defconfig
index 7aa2dc3aeb4..cdfdb088b7d 100644
--- a/arch/x86/configs/micro_generic_pc_atom_n28xx_defconfig
+++ b/arch/x86/configs/micro_generic_pc_atom_n28xx_defconfig
@@ -1,7 +1,9 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Tiny Mountain Build Options
+# Tiny Mountain/x86 Configuration
 #
+CONFIG_X86_32=y
+CONFIG_ARCH_DEFCONFIG="arch/x86/defconfig"
 # CONFIG_NANOKERNEL is not set
 CONFIG_MICROKERNEL=y
 
@@ -51,6 +53,28 @@ CONFIG_TIMESLICE_PRIORITY=0
 # CONFIG_ADVANCED_POWER_MANAGEMENT is not set
 CONFIG_PRINTK=y
 
+#
+# General Setup
+#
+# CONFIG_EXPERIMENTAL is not set
+CONFIG_CROSS_COMPILE=""
+
+#
+# Compile and Link Features
+#
+CONFIG_COMPILER_OPT=""
+CONFIG_MINIMAL_LIBC=y
+
+#
+# Debugging Options
+#
+# CONFIG_STDOUT_CONSOLE is not set
+# CONFIG_ASSERT is not set
+
+#
+# System Monitoring Options
+#
+
 #
 # x86 Core Options
 #
@@ -71,10 +95,6 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
 # CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
 # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
 
-#
-# Floating Point Options
-#
-
 #
 # BSP General Configuration
 #
@@ -83,10 +103,6 @@ CONFIG_BSP_ATOM_N28XX=y
 # CONFIG_BSP_PCPENTIUM4 is not set
 # CONFIG_BSP_QUARK is not set
 CONFIG_BSP_GENERIC_PC=y
-
-#
-# Intel Processor
-#
 # CONFIG_CPU_MINUTEIA is not set
 CONFIG_CPU_PENTIUM4=y
 # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set
@@ -97,8 +113,6 @@ CONFIG_CPU_PENTIUM4=y
 CONFIG_ISA_IA32=y
 CONFIG_HARDWARE_BP_SUPPORTED=y
 # CONFIG_TICKLESS_IDLE_UNSUPPORTED is not set
-# CONFIG_CMOV_UNSUPPORTED is not set
-# CONFIG_CPU_FLOAT_UNSUPPORTED is not set
 # CONFIG_CPU_SSE_UNSUPPORTED is not set
 CONFIG_CACHE_LINE_SIZE=64
 
@@ -108,18 +122,14 @@ CONFIG_CACHE_LINE_SIZE=64
 # CONFIG_DYNAMIC_INT_STUBS is not set
 # CONFIG_PROT_MODE_SWITCH_PROMPT is not set
 # CONFIG_ADVANCED_IDLE_SUPPORTED is not set
-
-#
-# Boot Sequence Options
-#
 CONFIG_BOOTLOADER_UNKNOWN=y
-# CONFIG_PIC is not set
 CONFIG_SHUTOFF_PIC=y
 
 #
 # Floating Point Options
 #
 # CONFIG_FLOAT is not set
+# CONFIG_PCI is not set
 CONFIG_CUSTOM_RANDOM_GENERATOR=y
 CONFIG_BSP_DIR="generic_pc"
 CONFIG_LOAPIC_TIMER_FREQ=150000000
@@ -144,41 +154,22 @@ CONFIG_IOAPIC=y
 CONFIG_LOAPIC=y
 
 #
-# General Setup
+# Device Drivers
 #
-CONFIG_CROSS_COMPILE=""
-CONFIG_MINIMAL_LIBC=y
-
-#
-# Debugging Options
-#
-# CONFIG_STDOUT_CONSOLE is not set
-# CONFIG_ASSERT is not set
-
-#
-# System Monitoring Options
-#
-
-#
-# Compile and Link Features
-#
-CONFIG_COMPILER_OPT=""
-# CONFIG_BLUETOOTH is not set
-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
+
+#
+# Serial Drivers
+#
+CONFIG_NS16550=y
+# CONFIG_K20_UART is not set
+# CONFIG_STELLARIS_UART is not set
+# CONFIG_UART_INTERRUPT_DRIVEN is not set
 # CONFIG_PIT is not set
-CONFIG_DRV_INTCTL=y
-# CONFIG_DRV_PCI is not set
-# CONFIG_DRV_RANDOM is not set
 
 #
 # Random Generation Configuration
 #
 # CONFIG_TEST_RANDOM_GENERATOR is not set
-# CONFIG_EXPERIMENTAL is not set
+# CONFIG_BLUETOOTH is not set
+CONFIG_DEFCONFIG_LIST="$ARCH_DEFCONFIG"
diff --git a/arch/x86/configs/micro_generic_pc_minuteia_defconfig b/arch/x86/configs/micro_generic_pc_minuteia_defconfig
index 98e3058ee89..2f6e098023d 100644
--- a/arch/x86/configs/micro_generic_pc_minuteia_defconfig
+++ b/arch/x86/configs/micro_generic_pc_minuteia_defconfig
@@ -1,7 +1,9 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Tiny Mountain Build Options
+# Tiny Mountain/x86 Configuration
 #
+CONFIG_X86_32=y
+CONFIG_ARCH_DEFCONFIG="arch/x86/defconfig"
 # CONFIG_NANOKERNEL is not set
 CONFIG_MICROKERNEL=y
 
@@ -51,6 +53,28 @@ CONFIG_TIMESLICE_PRIORITY=0
 # CONFIG_ADVANCED_POWER_MANAGEMENT is not set
 CONFIG_PRINTK=y
 
+#
+# General Setup
+#
+# CONFIG_EXPERIMENTAL is not set
+CONFIG_CROSS_COMPILE=""
+
+#
+# Compile and Link Features
+#
+CONFIG_COMPILER_OPT=""
+CONFIG_MINIMAL_LIBC=y
+
+#
+# Debugging Options
+#
+# CONFIG_STDOUT_CONSOLE is not set
+# CONFIG_ASSERT is not set
+
+#
+# System Monitoring Options
+#
+
 #
 # x86 Core Options
 #
@@ -79,10 +103,6 @@ CONFIG_BSP_PCMINUTEIA=y
 # CONFIG_BSP_PCPENTIUM4 is not set
 # CONFIG_BSP_QUARK is not set
 CONFIG_BSP_GENERIC_PC=y
-
-#
-# Intel Processor
-#
 CONFIG_CPU_MINUTEIA=y
 # CONFIG_CPU_PENTIUM4 is not set
 # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set
@@ -104,12 +124,9 @@ CONFIG_CACHE_LINE_SIZE=0
 # CONFIG_DYNAMIC_INT_STUBS is not set
 # CONFIG_PROT_MODE_SWITCH_PROMPT is not set
 # CONFIG_ADVANCED_IDLE_SUPPORTED is not set
-
-#
-# Boot Sequence Options
-#
 CONFIG_BOOTLOADER_UNKNOWN=y
 CONFIG_PIC=y
+# CONFIG_PCI is not set
 # CONFIG_CUSTOM_RANDOM_GENERATOR is not set
 CONFIG_BSP_DIR="generic_pc"
 
@@ -130,41 +147,22 @@ CONFIG_EXTRA_SERIAL_PORT=y
 # CONFIG_LOAPIC is not set
 
 #
-# General Setup
+# Device Drivers
 #
-CONFIG_CROSS_COMPILE=""
-CONFIG_MINIMAL_LIBC=y
-
-#
-# Debugging Options
-#
-# CONFIG_STDOUT_CONSOLE is not set
-# CONFIG_ASSERT is not set
-
-#
-# System Monitoring Options
-#
-
-#
-# Compile and Link Features
-#
-CONFIG_COMPILER_OPT=""
-# CONFIG_BLUETOOTH is not set
-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
+
+#
+# Serial Drivers
+#
+CONFIG_NS16550=y
+# CONFIG_K20_UART is not set
+# CONFIG_STELLARIS_UART is not set
+# CONFIG_UART_INTERRUPT_DRIVEN is not set
 CONFIG_PIT=y
-CONFIG_DRV_INTCTL=y
-# CONFIG_DRV_PCI is not set
-# CONFIG_DRV_RANDOM is not set
 
 #
 # Random Generation Configuration
 #
 # CONFIG_TEST_RANDOM_GENERATOR is not set
-# CONFIG_EXPERIMENTAL is not set
+# CONFIG_BLUETOOTH is not set
+CONFIG_DEFCONFIG_LIST="$ARCH_DEFCONFIG"
diff --git a/arch/x86/configs/micro_generic_pc_pentium4_defconfig b/arch/x86/configs/micro_generic_pc_pentium4_defconfig
index bfa96f80000..fbdd21f45dc 100644
--- a/arch/x86/configs/micro_generic_pc_pentium4_defconfig
+++ b/arch/x86/configs/micro_generic_pc_pentium4_defconfig
@@ -1,7 +1,9 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Tiny Mountain Build Options
+# Tiny Mountain/x86 Configuration
 #
+CONFIG_X86_32=y
+CONFIG_ARCH_DEFCONFIG="arch/x86/defconfig"
 # CONFIG_NANOKERNEL is not set
 CONFIG_MICROKERNEL=y
 
@@ -51,6 +53,28 @@ CONFIG_TIMESLICE_PRIORITY=0
 # CONFIG_ADVANCED_POWER_MANAGEMENT is not set
 CONFIG_PRINTK=y
 
+#
+# General Setup
+#
+# CONFIG_EXPERIMENTAL is not set
+CONFIG_CROSS_COMPILE=""
+
+#
+# Compile and Link Features
+#
+CONFIG_COMPILER_OPT=""
+CONFIG_MINIMAL_LIBC=y
+
+#
+# Debugging Options
+#
+# CONFIG_STDOUT_CONSOLE is not set
+# CONFIG_ASSERT is not set
+
+#
+# System Monitoring Options
+#
+
 #
 # x86 Core Options
 #
@@ -71,10 +95,6 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
 # CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
 # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
 
-#
-# Floating Point Options
-#
-
 #
 # BSP General Configuration
 #
@@ -83,10 +103,6 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
 CONFIG_BSP_PCPENTIUM4=y
 # CONFIG_BSP_QUARK is not set
 CONFIG_BSP_GENERIC_PC=y
-
-#
-# Intel Processor
-#
 # CONFIG_CPU_MINUTEIA is not set
 CONFIG_CPU_PENTIUM4=y
 # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set
@@ -97,8 +113,6 @@ CONFIG_CPU_PENTIUM4=y
 CONFIG_ISA_IA32=y
 CONFIG_HARDWARE_BP_SUPPORTED=y
 # CONFIG_TICKLESS_IDLE_UNSUPPORTED is not set
-# CONFIG_CMOV_UNSUPPORTED is not set
-# CONFIG_CPU_FLOAT_UNSUPPORTED is not set
 # CONFIG_CPU_SSE_UNSUPPORTED is not set
 CONFIG_CACHE_LINE_SIZE=64
 
@@ -108,10 +122,6 @@ CONFIG_CACHE_LINE_SIZE=64
 # CONFIG_DYNAMIC_INT_STUBS is not set
 # CONFIG_PROT_MODE_SWITCH_PROMPT is not set
 # CONFIG_ADVANCED_IDLE_SUPPORTED is not set
-
-#
-# Boot Sequence Options
-#
 CONFIG_BOOTLOADER_UNKNOWN=y
 CONFIG_PIC=y
 
@@ -119,6 +129,7 @@ CONFIG_PIC=y
 # Floating Point Options
 #
 # CONFIG_FLOAT is not set
+# CONFIG_PCI is not set
 # CONFIG_CUSTOM_RANDOM_GENERATOR is not set
 CONFIG_BSP_DIR="generic_pc"
 
@@ -139,41 +150,22 @@ CONFIG_EXTRA_SERIAL_PORT=y
 # CONFIG_LOAPIC is not set
 
 #
-# General Setup
+# Device Drivers
 #
-CONFIG_CROSS_COMPILE=""
-CONFIG_MINIMAL_LIBC=y
-
-#
-# Debugging Options
-#
-# CONFIG_STDOUT_CONSOLE is not set
-# CONFIG_ASSERT is not set
-
-#
-# System Monitoring Options
-#
-
-#
-# Compile and Link Features
-#
-CONFIG_COMPILER_OPT=""
-# CONFIG_BLUETOOTH is not set
-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
+
+#
+# Serial Drivers
+#
+CONFIG_NS16550=y
+# CONFIG_K20_UART is not set
+# CONFIG_STELLARIS_UART is not set
+# CONFIG_UART_INTERRUPT_DRIVEN is not set
 CONFIG_PIT=y
-CONFIG_DRV_INTCTL=y
-# CONFIG_DRV_PCI is not set
-# CONFIG_DRV_RANDOM is not set
 
 #
 # Random Generation Configuration
 #
 # CONFIG_TEST_RANDOM_GENERATOR is not set
-# CONFIG_EXPERIMENTAL is not set
+# CONFIG_BLUETOOTH is not set
+CONFIG_DEFCONFIG_LIST="$ARCH_DEFCONFIG"
diff --git a/arch/x86/configs/nano_generic_pc_atom_n28xx_defconfig b/arch/x86/configs/nano_generic_pc_atom_n28xx_defconfig
index 7fc8b9e71d8..efcd4ef072e 100644
--- a/arch/x86/configs/nano_generic_pc_atom_n28xx_defconfig
+++ b/arch/x86/configs/nano_generic_pc_atom_n28xx_defconfig
@@ -1,7 +1,9 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Tiny Mountain Build Options
+# Tiny Mountain/x86 Configuration
 #
+CONFIG_X86_32=y
+CONFIG_ARCH_DEFCONFIG="arch/x86/defconfig"
 CONFIG_NANOKERNEL=y
 # CONFIG_MICROKERNEL is not set
 
@@ -30,6 +32,28 @@ CONFIG_ISR_STACK_SIZE=2048
 # CONFIG_CONTEXT_CUSTOM_DATA is not set
 CONFIG_PRINTK=y
 
+#
+# General Setup
+#
+# CONFIG_EXPERIMENTAL is not set
+CONFIG_CROSS_COMPILE=""
+
+#
+# Compile and Link Features
+#
+CONFIG_COMPILER_OPT=""
+CONFIG_MINIMAL_LIBC=y
+
+#
+# Debugging Options
+#
+# CONFIG_STDOUT_CONSOLE is not set
+# CONFIG_ASSERT is not set
+
+#
+# System Monitoring Options
+#
+
 #
 # x86 Core Options
 #
@@ -50,10 +74,6 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
 # CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
 # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
 
-#
-# Floating Point Options
-#
-
 #
 # BSP General Configuration
 #
@@ -62,10 +82,6 @@ CONFIG_BSP_ATOM_N28XX=y
 # CONFIG_BSP_PCPENTIUM4 is not set
 # CONFIG_BSP_QUARK is not set
 CONFIG_BSP_GENERIC_PC=y
-
-#
-# Intel Processor
-#
 # CONFIG_CPU_MINUTEIA is not set
 CONFIG_CPU_PENTIUM4=y
 # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set
@@ -76,8 +92,6 @@ CONFIG_CPU_PENTIUM4=y
 CONFIG_ISA_IA32=y
 CONFIG_HARDWARE_BP_SUPPORTED=y
 # CONFIG_TICKLESS_IDLE_UNSUPPORTED is not set
-# CONFIG_CMOV_UNSUPPORTED is not set
-# CONFIG_CPU_FLOAT_UNSUPPORTED is not set
 # CONFIG_CPU_SSE_UNSUPPORTED is not set
 CONFIG_CACHE_LINE_SIZE=64
 
@@ -87,18 +101,14 @@ CONFIG_CACHE_LINE_SIZE=64
 # CONFIG_DYNAMIC_INT_STUBS is not set
 # CONFIG_PROT_MODE_SWITCH_PROMPT is not set
 # CONFIG_ADVANCED_IDLE_SUPPORTED is not set
-
-#
-# Boot Sequence Options
-#
 CONFIG_BOOTLOADER_UNKNOWN=y
-# CONFIG_PIC is not set
 CONFIG_SHUTOFF_PIC=y
 
 #
 # Floating Point Options
 #
 # CONFIG_FLOAT is not set
+# CONFIG_PCI is not set
 CONFIG_CUSTOM_RANDOM_GENERATOR=y
 CONFIG_BSP_DIR="generic_pc"
 CONFIG_LOAPIC_TIMER_FREQ=150000000
@@ -123,41 +133,22 @@ CONFIG_IOAPIC=y
 CONFIG_LOAPIC=y
 
 #
-# General Setup
+# Device Drivers
 #
-CONFIG_CROSS_COMPILE=""
-CONFIG_MINIMAL_LIBC=y
-
-#
-# Debugging Options
-#
-# CONFIG_STDOUT_CONSOLE is not set
-# CONFIG_ASSERT is not set
-
-#
-# System Monitoring Options
-#
-
-#
-# Compile and Link Features
-#
-CONFIG_COMPILER_OPT=""
-# CONFIG_BLUETOOTH is not set
-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
+
+#
+# Serial Drivers
+#
+CONFIG_NS16550=y
+# CONFIG_K20_UART is not set
+# CONFIG_STELLARIS_UART is not set
+# CONFIG_UART_INTERRUPT_DRIVEN is not set
 # CONFIG_PIT is not set
-CONFIG_DRV_INTCTL=y
-# CONFIG_DRV_PCI is not set
-# CONFIG_DRV_RANDOM is not set
 
 #
 # Random Generation Configuration
 #
 # CONFIG_TEST_RANDOM_GENERATOR is not set
-# CONFIG_EXPERIMENTAL is not set
+# CONFIG_BLUETOOTH is not set
+CONFIG_DEFCONFIG_LIST="$ARCH_DEFCONFIG"
diff --git a/arch/x86/configs/nano_generic_pc_minuteia_defconfig b/arch/x86/configs/nano_generic_pc_minuteia_defconfig
index da3f81b73c4..7ab542806c1 100644
--- a/arch/x86/configs/nano_generic_pc_minuteia_defconfig
+++ b/arch/x86/configs/nano_generic_pc_minuteia_defconfig
@@ -1,7 +1,9 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Tiny Mountain Build Options
+# Tiny Mountain/x86 Configuration
 #
+CONFIG_X86_32=y
+CONFIG_ARCH_DEFCONFIG="arch/x86/defconfig"
 CONFIG_NANOKERNEL=y
 # CONFIG_MICROKERNEL is not set
 
@@ -30,6 +32,28 @@ CONFIG_ISR_STACK_SIZE=2048
 # CONFIG_CONTEXT_CUSTOM_DATA is not set
 CONFIG_PRINTK=y
 
+#
+# General Setup
+#
+# CONFIG_EXPERIMENTAL is not set
+CONFIG_CROSS_COMPILE=""
+
+#
+# Compile and Link Features
+#
+CONFIG_COMPILER_OPT=""
+CONFIG_MINIMAL_LIBC=y
+
+#
+# Debugging Options
+#
+# CONFIG_STDOUT_CONSOLE is not set
+# CONFIG_ASSERT is not set
+
+#
+# System Monitoring Options
+#
+
 #
 # x86 Core Options
 #
@@ -58,10 +82,6 @@ CONFIG_BSP_PCMINUTEIA=y
 # CONFIG_BSP_PCPENTIUM4 is not set
 # CONFIG_BSP_QUARK is not set
 CONFIG_BSP_GENERIC_PC=y
-
-#
-# Intel Processor
-#
 CONFIG_CPU_MINUTEIA=y
 # CONFIG_CPU_PENTIUM4 is not set
 # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set
@@ -83,12 +103,9 @@ CONFIG_CACHE_LINE_SIZE=0
 # CONFIG_DYNAMIC_INT_STUBS is not set
 # CONFIG_PROT_MODE_SWITCH_PROMPT is not set
 # CONFIG_ADVANCED_IDLE_SUPPORTED is not set
-
-#
-# Boot Sequence Options
-#
 CONFIG_BOOTLOADER_UNKNOWN=y
 CONFIG_PIC=y
+# CONFIG_PCI is not set
 # CONFIG_CUSTOM_RANDOM_GENERATOR is not set
 CONFIG_BSP_DIR="generic_pc"
 
@@ -109,41 +126,22 @@ CONFIG_EXTRA_SERIAL_PORT=y
 # CONFIG_LOAPIC is not set
 
 #
-# General Setup
+# Device Drivers
 #
-CONFIG_CROSS_COMPILE=""
-CONFIG_MINIMAL_LIBC=y
-
-#
-# Debugging Options
-#
-# CONFIG_STDOUT_CONSOLE is not set
-# CONFIG_ASSERT is not set
-
-#
-# System Monitoring Options
-#
-
-#
-# Compile and Link Features
-#
-CONFIG_COMPILER_OPT=""
-# CONFIG_BLUETOOTH is not set
-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
+
+#
+# Serial Drivers
+#
+CONFIG_NS16550=y
+# CONFIG_K20_UART is not set
+# CONFIG_STELLARIS_UART is not set
+# CONFIG_UART_INTERRUPT_DRIVEN is not set
 CONFIG_PIT=y
-CONFIG_DRV_INTCTL=y
-# CONFIG_DRV_PCI is not set
-# CONFIG_DRV_RANDOM is not set
 
 #
 # Random Generation Configuration
 #
 # CONFIG_TEST_RANDOM_GENERATOR is not set
-# CONFIG_EXPERIMENTAL is not set
+# CONFIG_BLUETOOTH is not set
+CONFIG_DEFCONFIG_LIST="$ARCH_DEFCONFIG"
diff --git a/arch/x86/configs/nano_generic_pc_pentium4_defconfig b/arch/x86/configs/nano_generic_pc_pentium4_defconfig
index eca9c25f266..20d69b01f50 100644
--- a/arch/x86/configs/nano_generic_pc_pentium4_defconfig
+++ b/arch/x86/configs/nano_generic_pc_pentium4_defconfig
@@ -1,7 +1,9 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Tiny Mountain Build Options
+# Tiny Mountain/x86 Configuration
 #
+CONFIG_X86_32=y
+CONFIG_ARCH_DEFCONFIG="arch/x86/defconfig"
 CONFIG_NANOKERNEL=y
 # CONFIG_MICROKERNEL is not set
 
@@ -30,6 +32,28 @@ CONFIG_ISR_STACK_SIZE=2048
 # CONFIG_CONTEXT_CUSTOM_DATA is not set
 CONFIG_PRINTK=y
 
+#
+# General Setup
+#
+# CONFIG_EXPERIMENTAL is not set
+CONFIG_CROSS_COMPILE=""
+
+#
+# Compile and Link Features
+#
+CONFIG_COMPILER_OPT=""
+CONFIG_MINIMAL_LIBC=y
+
+#
+# Debugging Options
+#
+# CONFIG_STDOUT_CONSOLE is not set
+# CONFIG_ASSERT is not set
+
+#
+# System Monitoring Options
+#
+
 #
 # x86 Core Options
 #
@@ -50,10 +74,6 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
 # CONFIG_UNALIGNED_WRITE_UNSUPPORTED is not set
 # CONFIG_LOCK_INSTRUCTION_UNSUPPORTED is not set
 
-#
-# Floating Point Options
-#
-
 #
 # BSP General Configuration
 #
@@ -62,10 +82,6 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
 CONFIG_BSP_PCPENTIUM4=y
 # CONFIG_BSP_QUARK is not set
 CONFIG_BSP_GENERIC_PC=y
-
-#
-# Intel Processor
-#
 # CONFIG_CPU_MINUTEIA is not set
 CONFIG_CPU_PENTIUM4=y
 # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set
@@ -76,8 +92,6 @@ CONFIG_CPU_PENTIUM4=y
 CONFIG_ISA_IA32=y
 CONFIG_HARDWARE_BP_SUPPORTED=y
 # CONFIG_TICKLESS_IDLE_UNSUPPORTED is not set
-# CONFIG_CMOV_UNSUPPORTED is not set
-# CONFIG_CPU_FLOAT_UNSUPPORTED is not set
 # CONFIG_CPU_SSE_UNSUPPORTED is not set
 CONFIG_CACHE_LINE_SIZE=64
 
@@ -87,10 +101,6 @@ CONFIG_CACHE_LINE_SIZE=64
 # CONFIG_DYNAMIC_INT_STUBS is not set
 # CONFIG_PROT_MODE_SWITCH_PROMPT is not set
 # CONFIG_ADVANCED_IDLE_SUPPORTED is not set
-
-#
-# Boot Sequence Options
-#
 CONFIG_BOOTLOADER_UNKNOWN=y
 CONFIG_PIC=y
 
@@ -98,6 +108,7 @@ CONFIG_PIC=y
 # Floating Point Options
 #
 # CONFIG_FLOAT is not set
+# CONFIG_PCI is not set
 # CONFIG_CUSTOM_RANDOM_GENERATOR is not set
 CONFIG_BSP_DIR="generic_pc"
 
@@ -118,41 +129,22 @@ CONFIG_EXTRA_SERIAL_PORT=y
 # CONFIG_LOAPIC is not set
 
 #
-# General Setup
+# Device Drivers
 #
-CONFIG_CROSS_COMPILE=""
-CONFIG_MINIMAL_LIBC=y
-
-#
-# Debugging Options
-#
-# CONFIG_STDOUT_CONSOLE is not set
-# CONFIG_ASSERT is not set
-
-#
-# System Monitoring Options
-#
-
-#
-# Compile and Link Features
-#
-CONFIG_COMPILER_OPT=""
-# CONFIG_BLUETOOTH is not set
-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
+
+#
+# Serial Drivers
+#
+CONFIG_NS16550=y
+# CONFIG_K20_UART is not set
+# CONFIG_STELLARIS_UART is not set
+# CONFIG_UART_INTERRUPT_DRIVEN is not set
 CONFIG_PIT=y
-CONFIG_DRV_INTCTL=y
-# CONFIG_DRV_PCI is not set
-# CONFIG_DRV_RANDOM is not set
 
 #
 # Random Generation Configuration
 #
 # CONFIG_TEST_RANDOM_GENERATOR is not set
-# CONFIG_EXPERIMENTAL is not set
+# CONFIG_BLUETOOTH is not set
+CONFIG_DEFCONFIG_LIST="$ARCH_DEFCONFIG"
diff --git a/arch/x86/configs/nano_quark_defconfig b/arch/x86/configs/nano_quark_defconfig
index 37a4b5d20f3..8d042cbdbf0 100644
--- a/arch/x86/configs/nano_quark_defconfig
+++ b/arch/x86/configs/nano_quark_defconfig
@@ -1,7 +1,9 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Tiny Mountain Build Options
+# Tiny Mountain/x86 Configuration
 #
+CONFIG_X86_32=y
+CONFIG_ARCH_DEFCONFIG="arch/x86/defconfig"
 CONFIG_NANOKERNEL=y
 # CONFIG_MICROKERNEL is not set
 
@@ -30,6 +32,28 @@ CONFIG_ISR_STACK_SIZE=2048
 # CONFIG_CONTEXT_CUSTOM_DATA is not set
 CONFIG_PRINTK=y
 
+#
+# General Setup
+#
+# CONFIG_EXPERIMENTAL is not set
+CONFIG_CROSS_COMPILE=""
+
+#
+# Compile and Link Features
+#
+CONFIG_COMPILER_OPT=""
+CONFIG_MINIMAL_LIBC=y
+
+#
+# Debugging Options
+#
+# CONFIG_STDOUT_CONSOLE is not set
+# CONFIG_ASSERT is not set
+
+#
+# System Monitoring Options
+#
+
 #
 # x86 Core Options
 #
@@ -58,10 +82,6 @@ CONFIG_EOI_HANDLER_SUPPORTED=y
 # CONFIG_BSP_PCPENTIUM4 is not set
 CONFIG_BSP_QUARK=y
 # CONFIG_BSP_GENERIC_PC is not set
-
-#
-# Intel Processor
-#
 CONFIG_CPU_MINUTEIA=y
 # CONFIG_CPU_PENTIUM4 is not set
 # CONFIG_CPU_MIGHT_SUPPORT_CLFLUSH is not set
@@ -83,12 +103,9 @@ CONFIG_CACHE_LINE_SIZE=0
 # CONFIG_DYNAMIC_INT_STUBS is not set
 # CONFIG_PROT_MODE_SWITCH_PROMPT is not set
 # CONFIG_ADVANCED_IDLE_SUPPORTED is not set
-
-#
-# Boot Sequence Options
-#
 CONFIG_BOOTLOADER_UNKNOWN=y
 # CONFIG_SHUTOFF_PIC is not set
+CONFIG_PCI=y
 # CONFIG_CUSTOM_RANDOM_GENERATOR is not set
 CONFIG_BSP_DIR="quark"
 CONFIG_EXTRA_SERIAL_PORT=y
@@ -114,34 +131,22 @@ CONFIG_IOAPIC=y
 CONFIG_LOAPIC=y
 
 #
-# General Setup
+# Device Drivers
 #
-CONFIG_CROSS_COMPILE=""
-
-#
-# Debugging Options
-#
-# CONFIG_STDOUT_CONSOLE is not set
-# CONFIG_ASSERT is not set
-
-#
-# System Monitoring Options
-#
-
-#
-# Compile and Link Features
-#
-CONFIG_COMPILER_OPT=""
-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 is not set
-# CONFIG_DRV_INTCTL is not set
-# CONFIG_DRV_PCI is not set
-# CONFIG_DRV_RANDOM is not set
-# CONFIG_EXPERIMENTAL is not set
-CONFIG_PCI=y
+
+#
+# Serial Drivers
+#
+CONFIG_NS16550=y
+# CONFIG_K20_UART is not set
+# CONFIG_STELLARIS_UART is not set
+# CONFIG_UART_INTERRUPT_DRIVEN is not set
+# CONFIG_PIT is not set
+
+#
+# Random Generation Configuration
+#
+# CONFIG_TEST_RANDOM_GENERATOR is not set
+# CONFIG_BLUETOOTH is not set
+CONFIG_DEFCONFIG_LIST="$ARCH_DEFCONFIG"