[kernel] resync kernel patches

[openwrt.git] / target / Config.in

diff --git a/target/Config.in b/target/Config.in
index f205040..6506312 100644 (file)
--- a/target/Config.in
+++ b/target/Config.in
@@ -1,135 +1,4 @@
-choice
-       prompt "Target System"
-       default LINUX_2_4_BRCM
-       
-config LINUX_2_6_ARUBA
-       bool "Aruba [2.6]"
-       select mips
-       select LINUX_2_6
-       select PCI_SUPPORT
-       help
-          Build firmware images for Aruba boards 
-
-config LINUX_2_4_AR531X
-       bool "Atheros AR531x [2.4]"
-       select mips
-       select LINUX_2_4
-       help
-         Build firmware images for Atheros AR531x based boards
-         (e.g. Netgear WGT624, Linksys WRT55AG)
-
-config LINUX_2_4_BRCM
-       bool "Broadcom BCM47xx/53xx [2.4]"
-       select mipsel
-       select PCI_SUPPORT
-       select PCMCIA_SUPPORT
-       help
-         Build firmware images for Broadcom based routers
-         (e.g. Linksys WRT54G(S), Asus WL-500g, Motorola WR850G)
-         
-         This one builds the generic .trx images, activate one of the
-         options below for creating device specific files for use 
-         with TFTP client too. 
-
-config LINUX_2_6_BRCM
-       bool "Broadcom BCM47xx/53xx [2.6]"
-       select mipsel
-       select LINUX_2_6
-       select PCI_SUPPORT
-       #select PCMCIA_SUPPORT
-       help
-         Build firmware images for Broadcom based routers
-         (e.g. Netgear WGT634u)
-
-config LINUX_2_4_AR7
-       bool "TI AR7 [2.4]"
-       select mipsel
-       help
-         Build firmware images for TI AR7 based routers (w.g. Linksys WAG54G v2)
-
-config LINUX_2_4_X86
-       bool "x86 [2.4]"
-       select i386
-       select LINUX_2_4
-       select PCMCIA_SUPPORT
-       help
-         Build firmware images for x86 based boards
-         (e.g. Soekris net4521 and net4801, PC Engines WRAP...)
-
-config LINUX_2_6_X86
-       bool "x86 [2.6]"
-       select i386
-       select LINUX_2_6
-       select PCMCIA_SUPPORT
-       help
-         Build firmware images for x86 based boards
-         (e.g. Soekris net4521 and net4801, PC Engines WRAP...)
-
-config LINUX_2_6_AU1000
-       bool "au1000 [2.6]"
-       select mipsel
-       select LINUX_2_6
-       select PCMCIA_SUPPORT
-       help
-         Build firmware for AMD Alchemy 1500 boards
-         (e.g. 4G-Systems Mesh/Access Cube ...)
-
-if DEVEL
-
-config LINUX_2_6_ARM
-       bool "UNSUPPORTED little-endian arm platform"
-       select LINUX_2_6
-       select arm
-
-config LINUX_2_6_ARMEB
-       bool "UNSUPPORTED big-endian arm platform"
-       select LINUX_2_6
-       select armeb
-
-config LINUX_2_6_CRIS
-       bool "UNSUPPORTED cris platform"
-       select LINUX_2_6
-       select cris
-
-config LINUX_2_6_M68K
-       bool "UNSUPPORTED m68k platform"
-       select LINUX_2_6
-       select m68k
-
-config LINUX_2_6_PPC
-       bool "UNSUPPORTED powerpc platform"
-       select LINUX_2_6
-       select powerpc
-
-config LINUX_2_6_SH3
-       bool "UNSUPPORTED little-endian sh3 platform"
-       select LINUX_2_6
-       select sh3
-
-config LINUX_2_6_SH3EB
-       bool "UNSUPPORTED big-endian sh3 platform"
-       select LINUX_2_6
-       select sh3eb
-
-config LINUX_2_6_SH4
-       bool "UNSUPPORTED little-endian sh4 platform"
-       select LINUX_2_6
-       select sh4
-
-config LINUX_2_6_SH4EB
-       bool "UNSUPPORTED big-endian sh4 platform"
-       select LINUX_2_6
-       select sh4eb
-
-config LINUX_2_6_SPARC
-       bool "UNSUPPORTED sparc platform"
-       select LINUX_2_6
-       select sparc
-
-endif
-
-endchoice
-
+source "tmp/.config-target.in"
 
 # Kernel/Hardware features
 
@@ -139,19 +8,58 @@ 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
 
 config PCMCIA_SUPPORT
        bool
 
+config USB_SUPPORT
+       bool
+
+config BIG_ENDIAN
+       bool
+
+config USES_INITRAMFS
+       bool
+
+config USES_SQUASHFS
+       bool
+
+config USES_JFFS2
+       bool
+
+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
 
 config mipsel
@@ -161,6 +69,11 @@ config arm
        bool
 
 config armeb
+       select BIG_ENDIAN
+       bool
+
+config avr32
+       select BIG_ENDIAN
        bool
 
 config cris
@@ -170,37 +83,46 @@ config m68k
        bool
 
 config powerpc
+       select BIG_ENDIAN
        bool
 
 config sh3
        bool
 
 config sh3eb
+       select BIG_ENDIAN
        bool
 
 config sh4
        bool
 
 config sh4eb
+       select BIG_ENDIAN
        bool
 
 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 || !DEVEL
+       default "mipsel"  if mipsel
        default "powerpc" if powerpc
        default "sh3"     if sh3
        default "sh3eb"   if sh3eb
        default "sh4"     if sh4
        default "sh4eb"   if sh4eb
        default "sparc"   if sparc
-
+       default "x86_64"  if x86_64