add gcc4 fixes, remove the NEC FC20X2JA driver patch from lcd4linux temporary

[openwrt.git] / openwrt / Config.in

diff --git a/openwrt/Config.in b/openwrt/Config.in
index c93b1f1..99f9c9c 100644 (file)
--- a/openwrt/Config.in
+++ b/openwrt/Config.in
@@ -1,6 +1,6 @@
 #
 
 #
 

-mainmenu "OpenWRT Configuration"
+mainmenu "OpenWrt Configuration"

 
 config MODULES
        bool
 
 config MODULES
        bool


@@ -10,53 +10,52 @@ config BR2_HAVE_DOT_CONFIG
        bool
        default y
 
        bool
        default y
 

+# Supported architectures
+
+config BR2_i386
+       tristate
+       
+config BR2_mips
+       tristate
+

 config BR2_mipsel
 config BR2_mipsel

-       bool
-       default y
+       tristate
+
+# Unsupported architectures

 
 

-choice
-       prompt "Target Architecture" if CONFIG_DEVEL
+if CONFIG_DEVEL

 
 config BR2_arm
 
 config BR2_arm

-       bool "arm"
+       tristate

 
 config BR2_armeb
 
 config BR2_armeb

-       bool "armeb"
+       tristate

 
 config BR2_cris
 
 config BR2_cris

-       bool "cris"
-
-config BR2_i386
-       bool "i386"
+       tristate

 
 config BR2_m68k
 
 config BR2_m68k

-       bool "m68k"
-
-config BR2_mipseb
-       bool "mipseb"
-
-config BR2_mipsel
-       bool "mipsel"
+       tristate

 
 config BR2_powerpc
 
 config BR2_powerpc

-       bool "powerpc"
+       tristate

 
 config BR2_sh3
 
 config BR2_sh3

-       bool "sh3"
+       tristate

 
 config BR2_sh3eb
 
 config BR2_sh3eb

-       bool "sh3eb"
+       tristate

 
 config BR2_sh4
 
 config BR2_sh4

-       bool "sh4"
+       tristate

 
 config BR2_sh4eb
 
 config BR2_sh4eb

-       bool "sh4eb"
+       tristate

 
 config BR2_sparc
 
 config BR2_sparc

-       bool "sparc"
+       tristate

 
 

-endchoice
+endif

 
 config BR2_ARCH
        string
 
 config BR2_ARCH
        string


@@ -65,7 +64,7 @@ config BR2_ARCH
        default "cris"    if BR2_cris
        default "i386"    if BR2_i386
        default "m68k"    if BR2_m68k
        default "cris"    if BR2_cris
        default "i386"    if BR2_i386
        default "m68k"    if BR2_m68k

-       default "mipseb"  if BR2_mipseb
+       default "mips"    if BR2_mips

        default "mipsel"  if BR2_mipsel || !CONFIG_DEVEL
        default "powerpc" if BR2_powerpc
        default "sh3"     if BR2_sh3
        default "mipsel"  if BR2_mipsel || !CONFIG_DEVEL
        default "powerpc" if BR2_powerpc
        default "sh3"     if BR2_sh3


@@ -87,6 +86,7 @@ config BR2_JLEVEL
        int
        default "1"
 
        int
        default "1"
 

+source "target/Config.in"

 source "toolchain/Config.in"
 source "package/Config.in"
 source "toolchain/Config.in"
 source "package/Config.in"

-source "target/Config.in"
+source "target/linux/Config.in"