Clean up x86 support

target/device/Config.in

@@ -9,10 +9,6 @@ source "target/device/ARMLTD/Config.in"
 source "target/device/Atmel/Config.in"
 source "target/device/KwikByte/Config.in"
 source "target/device/valka/Config.in"
-
-comment "Generic Architecture support"
-	depends on BR2_i386
-
 source "target/device/x86/Config.in"
 
 # This must be last

target/device/x86/Config.in

@@ -1,6 +1,27 @@
-comment "Generic x86 Device Support"
+menuconfig BR2_TARGET_X86
+	bool "Generic x86 Device Support"
 	depends on BR2_i386
 
-comment "Package support"
-	depends on BR2_TARGET_AMD_ALCHEMY
+if BR2_TARGET_X86
+
+choice
+	prompt "Pentium (or later) Controller board"
+	help
+
+config BR2_TARGET_I386
+	bool "i386"
+	depends on BR2_i386
+	default y
+
+endchoice
+
+config BR2_BOARD_NAME
+	string
+	default "i386"		if BR2_TARGET_I386
+
+config BR2_BOARD_PATH
+	string "Board Path"
+	default "target/device/x86/$(BR2_BOARD_NAME)"
+
+endif
 

target/device/x86/i386/Makefile.in

@@ -1,14 +1,3 @@
-# BR2_BOARD_PATH:=target/device/x86/i386
-BOARD_PATH:=target/device/x86/i386
-
-ifeq ($(strip $(BR2_PACKAGE_LINUX_KCONFIG)),)
-ifndef LINUX26_KCONFIG
-LINUX26_KCONFIG=$(BOARD_PATH)/linux26.config
-endif
-else
-LINUX26_KCONFIG=$(strip $(BR2_PACKAGE_LINUX_KCONFIG))
-endif
-
 ifeq ($(strip $(BR2_PACKAGE_LINUX_FORMAT)),)
 ifndef LINUX26_FORMAT
 LINUX26_FORMAT=bzImage