ar71xx: merge nand scan patch

[openwrt.git] / target / Config.in

diff --git a/target/Config.in b/target/Config.in
index 8bfeb83..9e0263e 100644 (file)
--- a/target/Config.in
+++ b/target/Config.in
@@ -2,22 +2,22 @@ source "tmp/.config-target.in"
 
 # Kernel/Hardware features
 
-config LINUX_2_4
-       bool
-
-config LINUX_2_6
+config HAS_SPE_FPU
+       depends powerpc
+       select HAS_FPU
        bool
 
 config HAS_FPU
        bool
 
-config DISPLAY_SUPPORT
+config AUDIO_SUPPORT
        bool
 
 config GPIO_SUPPORT
        bool
 
 config PCI_SUPPORT
+       select AUDIO_SUPPORT
        bool
 
 config PCIE_SUPPORT
@@ -27,6 +27,10 @@ config PCMCIA_SUPPORT
        bool
 
 config USB_SUPPORT
+       select AUDIO_SUPPORT
+       bool
+
+config USB_GADGET_SUPPORT
        bool
 
 config BIG_ENDIAN
@@ -41,20 +45,40 @@ config USES_SQUASHFS
 config USES_JFFS2
        bool
 
-config USES_EXT2
+config USES_EXT4
        bool
 
-config USES_TGZ
+config USES_TARGZ
        bool
 
 config USES_CPIOGZ
        bool
 
-config PROFILE_KCONFIG 
+config USES_UBIFS
+       bool
+
+config PROFILE_KCONFIG
+       bool
+
+config NOMMU
        bool
 
 # Architecture selection
 
+config arm
+       bool
+
+config armeb
+       select BIG_ENDIAN
+       bool
+
+config avr32
+       select BIG_ENDIAN
+       bool
+
+config cris
+       bool
+
 config i386
        bool
 
@@ -62,7 +86,6 @@ config i686
        bool 
 
 config m68k
-       select BIG_ENDIAN
        bool
 
 config mips
@@ -79,24 +102,11 @@ config mips64
 config mips64el
        bool
 
-config arm
-       bool
-
-config armeb
+config powerpc
        select BIG_ENDIAN
        bool
 
-config avr32
-       select BIG_ENDIAN
-       bool
-
-config cris
-       bool
-
-config m68k
-       bool
-
-config powerpc
+config powerpc64
        select BIG_ENDIAN
        bool
 
@@ -118,27 +128,32 @@ config sparc
        select BIG_ENDIAN
        bool
 
+config ubicom32
+       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
-       default "mips64"  if mips64
-       default "mips64el" if mips64el
-       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
+       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
+       default "mips64"    if mips64
+       default "mips64el"  if mips64el
+       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 "ubicom32"  if ubicom32
+       default "x86_64"    if x86_64