[kernel] resync kernel patches

[openwrt.git] / target / Config.in

diff --git a/target/Config.in b/target/Config.in
index 0ed1d0c..6506312 100644 (file)
--- a/target/Config.in
+++ b/target/Config.in
@@ -1,64 +1,5 @@
-choice
-       prompt "Target System"
-       default LINUX_2_4_BRCM
-
 source "tmp/.config-target.in"
 
-if DEVEL
-
-config LINUX_2_6_ARM
-       bool "UNSUPPORTED little-endian arm platform"
-       depends BROKEN
-       select LINUX_2_6
-       select arm
-
-config LINUX_2_6_CRIS
-       bool "UNSUPPORTED cris platform"
-       depends BROKEN
-       select LINUX_2_6
-       select cris
-
-config LINUX_2_6_M68K
-       bool "UNSUPPORTED m68k platform"
-       depends BROKEN
-       select LINUX_2_6
-       select m68k
-
-config LINUX_2_6_SH3
-       bool "UNSUPPORTED little-endian sh3 platform"
-       depends BROKEN
-       select LINUX_2_6
-       select sh3
-
-config LINUX_2_6_SH3EB
-       bool "UNSUPPORTED big-endian sh3 platform"
-       depends BROKEN
-       select LINUX_2_6
-       select sh3eb
-
-config LINUX_2_6_SH4
-       bool "UNSUPPORTED little-endian sh4 platform"
-       depends BROKEN
-       select LINUX_2_6
-       select sh4
-
-config LINUX_2_6_SH4EB
-       bool "UNSUPPORTED big-endian sh4 platform"
-       depends BROKEN
-       select LINUX_2_6
-       select sh4eb
-
-config LINUX_2_6_SPARC
-       bool "UNSUPPORTED sparc platform"
-       depends BROKEN
-       select LINUX_2_6
-       select sparc
-
-endif
-
-endchoice
-
-
 # Kernel/Hardware features
 
 config LINUX_2_4
@@ -67,6 +8,15 @@ config LINUX_2_4
 config LINUX_2_6
        bool
 
+config HAS_FPU
+       bool
+
+config DISPLAY_SUPPORT
+       bool
+
+config GPIO_SUPPORT
+       bool
+
 config PCI_SUPPORT
        bool
 
@@ -76,10 +26,10 @@ config PCMCIA_SUPPORT
 config USB_SUPPORT
        bool
 
-config ATM_SUPPORT
+config BIG_ENDIAN
        bool
 
-config BIG_ENDIAN
+config USES_INITRAMFS
        bool
 
 config USES_SQUASHFS
@@ -91,11 +41,23 @@ config USES_JFFS2
 config USES_EXT2
        bool
 
+config USES_TGZ
+       bool
+
+config USES_CPIOGZ
+       bool
+
+config PROFILE_KCONFIG 
+       bool
+
 # Architecture selection
 
 config i386
        bool
-       
+
+config i686
+       bool 
+
 config mips
        select BIG_ENDIAN
        bool
@@ -110,6 +72,10 @@ config armeb
        select BIG_ENDIAN
        bool
 
+config avr32
+       select BIG_ENDIAN
+       bool
+
 config cris
        bool
 
@@ -138,12 +104,17 @@ config sparc
        select BIG_ENDIAN
        bool
 
+config x86_64
+       bool
+
 config ARCH
        string
        default "arm"     if arm
        default "armeb"   if armeb
+       default "avr32"   if avr32
        default "cris"    if cris
        default "i386"    if i386
+       default "i686"    if i686
        default "m68k"    if m68k
        default "mips"    if mips
        default "mipsel"  if mipsel
@@ -153,4 +124,5 @@ config ARCH
        default "sh4"     if sh4
        default "sh4eb"   if sh4eb
        default "sparc"   if sparc
+       default "x86_64"  if x86_64