fix BR2_ and CONFIG_ issues

SVN-Revision: 3769

diff --git a/openwrt/Config.in b/openwrt/Config.in
index 71f05689770f64127f77e6b8efccd1f4eff6e2af..71db916c6e6d1df0b19feb7a3b0c6ea3e3c168ab 100644 (file)
--- a/openwrt/Config.in
+++ b/openwrt/Config.in
@@ -34,5 +34,6 @@ config JLEVEL
            Number of jobs to run simultanesouly
 
 source "toolchain/Config.in"
+source "target/linux/Config.in"
 source ".config.in"
 

diff --git a/openwrt/target/Config.in b/openwrt/target/Config.in
index 7f07ff0ac102923a5e6876a3667533a13c181a24..f20504031cc4108b51082046b30e113a1ff08cc4 100644 (file)
--- a/openwrt/target/Config.in
+++ b/openwrt/target/Config.in
@@ -74,7 +74,7 @@ config LINUX_2_6_AU1000
          Build firmware for AMD Alchemy 1500 boards
          (e.g. 4G-Systems Mesh/Access Cube ...)
 
-if CONFIG_DEVEL
+if DEVEL
 
 config LINUX_2_6_ARM
        bool "UNSUPPORTED little-endian arm platform"
@@ -195,7 +195,7 @@ config ARCH
        default "i386"    if i386
        default "m68k"    if m68k
        default "mips"    if mips
-       default "mipsel"  if mipsel || !CONFIG_DEVEL
+       default "mipsel"  if mipsel || !DEVEL
        default "powerpc" if powerpc
        default "sh3"     if sh3
        default "sh3eb"   if sh3eb

diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in
index 6c7f5385e926e8b79726cc0e725cb0a2aedff605..5257c78ad0b30aa9aa6f700bb2fb62da7d8c9841 100644 (file)
--- a/openwrt/target/linux/Config.in
+++ b/openwrt/target/linux/Config.in
@@ -1,19 +1,19 @@
 menu "Target Root Filesystem"
 
-       config BR2_TARGET_ROOTFS_JFFS2
+       config TARGET_ROOTFS_JFFS2
                bool "jffs2"
                default y
                help
                  Build a jffs2 root filesystem
 
-       config BR2_TARGET_ROOTFS_SQUASHFS_LZMA
+       config TARGET_ROOTFS_SQUASHFS_LZMA
                bool "squashfs-lzma"
                default y
-               depends !BR2_LINUX_2_6_ARUBA
+               depends !LINUX_2_6_ARUBA
                help
                  Build a squashfs-lzma root filesystem
 
-       config BR2_TARGET_ROOTFS_TGZ
+       config TARGET_ROOTFS_TGZ
                bool "tgz"
                default y
                help
@@ -25,88 +25,90 @@ menu "Kernel Configuration / Device Support"
 
 comment "Device specific configuration"
 
+source "target/linux/*-2.[46]/Config.in"
+
 comment "Kernel modules"
 
 menu "Networking modules"
 
-config BR2_PACKAGE_KMOD_ATM
+config PACKAGE_KMOD_ATM
        prompt "kmod-atm.......................... ATM support"
        tristate
-       default y if BR2_LINUX_2_4_AR7
+       default y if LINUX_2_4_AR7
        default m
        help
          ATM support
 
-config BR2_PACKAGE_KMOD_GRE
+config PACKAGE_KMOD_GRE
        prompt "kmod-gre.......................... GRE tunneling driver"
        tristate
        default m
        help
          Kernel support for GRE tunnels
        
-config BR2_PACKAGE_KMOD_IMQ
+config PACKAGE_KMOD_IMQ
         prompt "kmod-imq.......................... Intermediate Queueing device"
         tristate
         default m
         help
           Kernel support for the Intermediate Queueing device
 
-config BR2_PACKAGE_KMOD_IPV6
+config PACKAGE_KMOD_IPV6
        prompt "kmod-ipv6......................... IPv6 support"
        tristate
        default m
        help
          Kernel modules for IPv6 protocol support
 
-config BR2_PACKAGE_KMOD_PPP
+config PACKAGE_KMOD_PPP
        prompt "kmod-ppp.......................... PPP support"
        tristate
        default m
        help
          Kernel support for PPP
 
-config BR2_PACKAGE_KMOD_MPPE
+config PACKAGE_KMOD_MPPE
        prompt   "kmod-mppe....................... PPP MPPE/MPPC module"
        tristate
        default m
-       depends BR2_PACKAGE_KMOD_PPP
-       select BR2_PACKAGE_KMOD_CRYPTO
+       depends PACKAGE_KMOD_PPP
+       select PACKAGE_KMOD_CRYPTO
        help
          Support for Microsoft PPP Encryption/Compression
 
-config BR2_PACKAGE_KMOD_PPPOATM
+config PACKAGE_KMOD_PPPOATM
        prompt   "kmod-pppoatm.................... PPPoA (PPP over ATM) kernel support"
        tristate
-       default y if BR2_LINUX_2_4_AR7
+       default y if LINUX_2_4_AR7
        default m
-       depends BR2_PACKAGE_KMOD_PPP
-       select BR2_PACKAGE_KMOD_ATM
+       depends PACKAGE_KMOD_PPP
+       select PACKAGE_KMOD_ATM
        help
          Support for PPP over ATM
 
-config BR2_PACKAGE_KMOD_PPPOE
+config PACKAGE_KMOD_PPPOE
        prompt   "kmod-pppoe...................... PPPoE (PPP over Ethernet) kernel support"
        tristate
        default m
-       depends BR2_PACKAGE_KMOD_PPP
+       depends PACKAGE_KMOD_PPP
        help
          Support for PPP over Ethernet
 
-config BR2_PACKAGE_KMOD_RING
+config PACKAGE_KMOD_RING
        prompt "kmod-ring......................... PF Ring"
        tristate
        default m
        help
          PF Ring
 
-config BR2_PACKAGE_KMOD_SCHED
+config PACKAGE_KMOD_SCHED
        prompt "kmod-sched........................ Traffic schedulers"
        tristate
        default m
        help
          Kernel schedulers for IP traffic
 
-config BR2_PACKAGE_KMOD_TUN
+config PACKAGE_KMOD_TUN
        prompt "kmod-tun.......................... Universal TUN/TAP driver"
        tristate
        default m
@@ -117,44 +119,44 @@ endmenu
 
 menu "Filtering/Firewalling"
 
-config BR2_PACKAGE_KMOD_ARPTABLES
+config PACKAGE_KMOD_ARPTABLES
        prompt "kmod-arptables.................... ARP firewalling support"
        tristate
        default m
        help
          Kernel modules for ARP firewalling
 
-config BR2_PACKAGE_KMOD_EBTABLES
+config PACKAGE_KMOD_EBTABLES
        prompt "kmod-ebtables..................... Ethernet Bridge firewalling support"
        tristate
        default m
        help
          Kernel modules for bridge firewalling
 
-config BR2_PACKAGE_KMOD_IPTABLES
+config PACKAGE_KMOD_IPTABLES
        prompt "kmod-iptables..................... Core Netfilter modules for IPv4 firewalling"
        tristate
        default y
        help
          Kernel modules for IPv4 firewalling
 
-config BR2_PACKAGE_KMOD_IPTABLES_EXTRA
+config PACKAGE_KMOD_IPTABLES_EXTRA
        prompt "kmod-iptables-extra............... Extra Netfilter modules for IPv4 firewalling (meta-package)"
        tristate
        default m
-       select BR2_PACKAGE_KMOD_IPT_CONNTRACK
-       select BR2_PACKAGE_KMOD_IPT_FILTER
-       select BR2_PACKAGE_KMOD_IPT_IPOPT
-       select BR2_PACKAGE_KMOD_IPT_IPSEC
-       select BR2_PACKAGE_KMOD_IPT_NAT
-       select BR2_PACKAGE_KMOD_IPT_NAT_EXTRA
-       select BR2_PACKAGE_KMOD_IPT_QUEUE
-       select BR2_PACKAGE_KMOD_IPT_ULOG
-       select BR2_PACKAGE_KMOD_IPT_EXTRA
+       select PACKAGE_KMOD_IPT_CONNTRACK
+       select PACKAGE_KMOD_IPT_FILTER
+       select PACKAGE_KMOD_IPT_IPOPT
+       select PACKAGE_KMOD_IPT_IPSEC
+       select PACKAGE_KMOD_IPT_NAT
+       select PACKAGE_KMOD_IPT_NAT_EXTRA
+       select PACKAGE_KMOD_IPT_QUEUE
+       select PACKAGE_KMOD_IPT_ULOG
+       select PACKAGE_KMOD_IPT_EXTRA
        help
          Extra Netfilter kernel modules for IPv4 firewalling (meta-package)
 
-config BR2_PACKAGE_KMOD_IPT_CONNTRACK
+config PACKAGE_KMOD_IPT_CONNTRACK
        prompt "kmod-ipt-conntrack................ Netfilter modules for connection tracking"
        tristate
        default m
@@ -166,7 +168,7 @@ config BR2_PACKAGE_KMOD_IPT_CONNTRACK
            * ipt_helper
            * ipt_connmark/CONNMARK
 
-config BR2_PACKAGE_KMOD_IPT_FILTER
+config PACKAGE_KMOD_IPT_FILTER
        prompt "kmod-ipt-filter................... Netfilter modules for packet content inspection"
        tristate
        default m
@@ -177,7 +179,7 @@ config BR2_PACKAGE_KMOD_IPT_FILTER
            * ipt_ipp2p
            * ipt_layer7
 
-config BR2_PACKAGE_KMOD_IPT_IPOPT
+config PACKAGE_KMOD_IPT_IPOPT
        prompt "kmod-ipt-ipopt.................... Netfilter modules for matching/changing IP packet options"
        tristate
        default m
@@ -194,7 +196,7 @@ config BR2_PACKAGE_KMOD_IPT_IPOPT
            * ipt_ttl/TTL
            * ipt_unclean
 
-config BR2_PACKAGE_KMOD_IPT_IPSEC
+config PACKAGE_KMOD_IPT_IPSEC
        prompt "kmod-ipt-ipsec.................... Netfilter modules for matching IPsec packets"
        tristate
        default m
@@ -205,7 +207,7 @@ config BR2_PACKAGE_KMOD_IPT_IPSEC
            * ipt_ah
            * ipt_esp
 
-config BR2_PACKAGE_KMOD_IPT_NAT
+config PACKAGE_KMOD_IPT_NAT
        prompt "kmod-ipt-nat...................... Netfilter modules for different NAT targets"
        tristate
        default m
@@ -215,7 +217,7 @@ config BR2_PACKAGE_KMOD_IPT_NAT
          Includes: 
            * ipt_REDIRECT
 
-config BR2_PACKAGE_KMOD_IPT_NAT_EXTRA
+config PACKAGE_KMOD_IPT_NAT_EXTRA
        prompt "kmod-ipt-nat-extra................ Extra Netfilter NAT modules for special protocols"
        tristate
        default m
@@ -233,7 +235,7 @@ config BR2_PACKAGE_KMOD_IPT_NAT_EXTRA
            * ip_nat_snmp_basic
            * ip_conntrack_tftp
 
-config BR2_PACKAGE_KMOD_IPT_QUEUE
+config PACKAGE_KMOD_IPT_QUEUE
        prompt "kmod-ipt-queue.................... Netfilter module for user-space packet queueing"
        tristate
        default m
@@ -243,7 +245,7 @@ config BR2_PACKAGE_KMOD_IPT_QUEUE
          Includes:
            * ipt_QUEUE
 
-config BR2_PACKAGE_KMOD_IPT_ULOG
+config PACKAGE_KMOD_IPT_ULOG
        prompt "kmod-ipt-ulog..................... Netfilter module for user-space packet logging"
        tristate
        default m
@@ -253,7 +255,7 @@ config BR2_PACKAGE_KMOD_IPT_ULOG
          Includes:
            * ipt_ULOG
 
-config BR2_PACKAGE_KMOD_IPT_EXTRA
+config PACKAGE_KMOD_IPT_EXTRA
        prompt "kmod-ipt-extra.................... Other extra Netfilter modules"
        tristate
        default m
@@ -267,11 +269,11 @@ config BR2_PACKAGE_KMOD_IPT_EXTRA
            * ipt_pkttype
            * ipt_recent
 
-config BR2_PACKAGE_KMOD_IP6TABLES
+config PACKAGE_KMOD_IP6TABLES
        prompt "kmod-ip6tables.................... Kernel modules for ip6tables"
        tristate
        default m
-       depends BR2_PACKAGE_KMOD_IPV6
+       depends PACKAGE_KMOD_IPV6
        help
          IPv6 firewalling support
 
@@ -279,11 +281,11 @@ endmenu
 
 menu "Block devices support"
 
-config BR2_PACKAGE_KMOD_IDE
+config PACKAGE_KMOD_IDE
        prompt "kmod-ide.......................... IDE support"
        tristate
        default m
-       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_BRCM
+       depends LINUX_2_4_X86 || LINUX_2_6_X86 || LINUX_2_4_BRCM || LINUX_2_6_BRCM
        help
          Kernel modules for IDE support
          useful for usb mass storage devices (e.g. on WL-HDD)
@@ -292,16 +294,16 @@ config BR2_PACKAGE_KMOD_IDE
            - ide-core
            - ide-detect
            - ide-disk
-           - pdc202xx_old
+           - pdc202old
 
-config BR2_PACKAGE_KMOD_LOOP
+config PACKAGE_KMOD_LOOP
        prompt "kmod-loop......................... Loop mount support"
        tristate
        default m
        help
          Kernel module for loop mount support
 
-config BR2_PACKAGE_KMOD_NBD
+config PACKAGE_KMOD_NBD
        prompt "kmod-nbd.......................... Network Block Device"
        tristate
        default m
@@ -310,45 +312,45 @@ config BR2_PACKAGE_KMOD_NBD
 
 endmenu
 
-config BR2_PACKAGE_KMOD_CRYPTO
+config PACKAGE_KMOD_CRYPTO
        prompt "CryptoAPI modules"
        tristate
        default m
-       select BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE
+       select BUSYBOX_FEATURE_CHECK_TAINTED_MODULE
        help
          Kernel modules for cryptographic algorithms
 
 menu "Filesystems support"
 
-config BR2_PACKAGE_KMOD_FS_CIFS
+config PACKAGE_KMOD_FS_CIFS
        prompt "kmod-fs-cifs...................... CIFS support"
        tristate
        default m
        help
          Kernel modules for CIFS support
 
-config BR2_PACKAGE_KMOD_FS_EXT2
+config PACKAGE_KMOD_FS_EXT2
        prompt "kmod-fs-ext2...................... EXT2 filesystem support"
        tristate
        default m
        help
          Kernel modules for EXT2 filesystem support
 
-config BR2_PACKAGE_KMOD_FS_EXT3
+config PACKAGE_KMOD_FS_EXT3
        prompt "kmod-fs-ext3...................... EXT3 filesystem support"
        tristate
        default m
        help
          Kernel modules for EXT3 filesystem support
 
-config BR2_PACKAGE_KMOD_FS_HFSPLUS
+config PACKAGE_KMOD_FS_HFSPLUS
        prompt "kmod-fs-hfsplus................... HFS+ filesystem support"
        tristate
        default m
        help
          Kernel modules for HFS+ filesystem support
 
-config BR2_PACKAGE_KMOD_FS_NFS
+config PACKAGE_KMOD_FS_NFS
        prompt "kmod-fs-nfs....................... NFS support"
        tristate
        default m
@@ -356,7 +358,7 @@ config BR2_PACKAGE_KMOD_FS_NFS
          Kernel modules for NFS support
          Includes lockd, nfs and sunrpc
 
-config BR2_PACKAGE_KMOD_FS_VFAT
+config PACKAGE_KMOD_FS_VFAT
        prompt "kmod-fs-vfat...................... VFAT filesystem support"
        tristate
        default m
@@ -364,7 +366,7 @@ config BR2_PACKAGE_KMOD_FS_VFAT
          Kernel modules for VFAT filesystem support
          useful for usb mass storage devices
 
-config BR2_PACKAGE_KMOD_FS_XFS
+config PACKAGE_KMOD_FS_XFS
        prompt "kmod-fs-xfs....................... XFS filesystem support"
        tristate
        default m
@@ -375,13 +377,13 @@ endmenu
 
 menu "Multimedia devices support"
 
-config BR2_PACKAGE_KMOD_PWC
+config PACKAGE_KMOD_PWC
        prompt "kmod-pwc.......................... Kernel driver for USB Philips Cameras"
        tristate
-       depends BR2_PACKAGE_KMOD_USB
+       depends PACKAGE_KMOD_USB
        default m
 
-config BR2_PACKAGE_KMOD_SOUNDCORE
+config PACKAGE_KMOD_SOUNDCORE
        prompt "kmod-soundcore.................... Soundcard support"
        tristate
        default n
@@ -389,7 +391,7 @@ config BR2_PACKAGE_KMOD_SOUNDCORE
          Base support for soundcards
          Requires either USB soundcard support (OSS) or ALSA package to be useful
 
-config BR2_PACKAGE_KMOD_VIDEODEV
+config PACKAGE_KMOD_VIDEODEV
        prompt "kmod-videodev..................... Video (For Linux) kernel support"
        tristate
        default m
@@ -398,62 +400,62 @@ endmenu
 
 menu "Native Language support"
 
-config BR2_PACKAGE_KMOD_NLS_BASE
+config PACKAGE_KMOD_NLS_BASE
        prompt "kmod-nls-base..................... Native Language support"
        tristate
        default m
        help
          Kernel native language support
 
-config BR2_PACKAGE_KMOD_NLS_CP437
+config PACKAGE_KMOD_NLS_CP437
        prompt   "kmod-nls-cp437.................. Codepage 437 (United States, Canada)"
        tristate
        default m
-       depends BR2_PACKAGE_KMOD_NLS_BASE
+       depends PACKAGE_KMOD_NLS_BASE
        help
          Kernel native language support
 
-config BR2_PACKAGE_KMOD_NLS_CP850
+config PACKAGE_KMOD_NLS_CP850
        prompt   "kmod-nls-cp850.................. Codepage 850 (Europe)"
        tristate
        default m
-       depends BR2_PACKAGE_KMOD_NLS_BASE
+       depends PACKAGE_KMOD_NLS_BASE
        help
          Kernel native language support
 
-config BR2_PACKAGE_KMOD_NLS_ISO8859_1
+config PACKAGE_KMOD_NLS_ISO8859_1
        prompt   "kmod-nls-iso8859-1.............. NLS ISO 8859-1 (Latin 1; Western European Languages)"
        tristate
        default m
-       depends BR2_PACKAGE_KMOD_NLS_BASE
+       depends PACKAGE_KMOD_NLS_BASE
        help
          Kernel native language support
 
-config BR2_PACKAGE_KMOD_NLS_ISO8859_15
+config PACKAGE_KMOD_NLS_ISO8859_15
        prompt   "kmod-nls-iso8859-15............. NLS ISO 8859-15 (Latin 15; Western European Languages with Euro)"
        tristate
        default m
-       depends BR2_PACKAGE_KMOD_NLS_BASE
+       depends PACKAGE_KMOD_NLS_BASE
        help
          Kernel native language support
 
-config BR2_PACKAGE_KMOD_NLS_UTF8
+config PACKAGE_KMOD_NLS_UTF8
        prompt   "kmod-nls-utf8................... NLS UTF8"
        tristate
        default m
-       depends BR2_PACKAGE_KMOD_NLS_BASE
+       depends PACKAGE_KMOD_NLS_BASE
        help
          Kernel native language support
 
 endmenu
 
 menu "Network devices support"
-       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86
+       depends LINUX_2_4_X86 || LINUX_2_6_X86
 
-config BR2_PACKAGE_KMOD_NET_3C59X
+config PACKAGE_KMOD_NET_3C59X
        prompt "kmod-net-3c59x.................... 3Com 3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" Ethernet kernel support"
        tristate
-       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86
+       depends LINUX_2_4_X86 || LINUX_2_6_X86
        default m
        help
          This option enables driver support for a large number of 10mbps and 
@@ -465,19 +467,19 @@ config BR2_PACKAGE_KMOD_NET_3C59X
           * "Tornado"   (3c905)                                  PCI
           * "Hurricane" (3c555/3cSOHO)                           PCI
 
-config BR2_PACKAGE_KMOD_NET_8139TOO
+config PACKAGE_KMOD_NET_8139TOO
        prompt "kmod-net-8139too.................. RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support"
        tristate
-       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86
+       depends LINUX_2_4_X86 || LINUX_2_6_X86
        default m
        help
          This is a driver for the Fast Ethernet PCI network cards based on 
          the RTL8139 chips.
 
-config BR2_PACKAGE_KMOD_NET_AIRO
+config PACKAGE_KMOD_NET_AIRO
        prompt "kmod-net-airo..................... Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards kernel support"
        tristate
-       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86
+       depends LINUX_2_4_X86 || LINUX_2_6_X86
        default m
        help
          This is the standard Linux driver to support Cisco/Aironet ISA and 
@@ -490,18 +492,18 @@ config BR2_PACKAGE_KMOD_NET_AIRO
          and Cisco proprietary API, so both the Linux Wireless Tools and the 
          Cisco Linux utilities can be used to configure the card.
 
-config BR2_PACKAGE_KMOD_NET_E100
+config PACKAGE_KMOD_NET_E100
        prompt "kmod-net-e100..................... Intel(R) PRO/100+ cards kernel support"
        tristate
-       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86
+       depends LINUX_2_4_X86 || LINUX_2_6_X86
        default m
        help
          Intel(R) PRO/100+ cards kernel support
 
-config BR2_PACKAGE_KMOD_NET_HERMES
+config PACKAGE_KMOD_NET_HERMES
        prompt "kmod-net-hermes................... Hermes chipset 802.11b support (Orinoco/Prism2/Symbol) kernel support"
        tristate
-       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86
+       depends LINUX_2_4_X86 || LINUX_2_6_X86
        default m
        help
          A driver for 802.11b wireless cards based based on the "Hermes" or 
@@ -514,11 +516,11 @@ config BR2_PACKAGE_KMOD_NET_HERMES
          MA401, LinkSys WPC-11, D-Link DWL-650, 3Com AirConnect, Intel 
          PRO/Wireless, and Symbol Spectrum24 High Rate amongst others.
 
-config BR2_PACKAGE_KMOD_NET_HERMES_PCI
+config PACKAGE_KMOD_NET_HERMES_PCI
        prompt   "kmod-net-hermes-pci............. Intersil Prism 2.5 PCI 802.11b adaptor support"
        tristate
        default m
-       depends BR2_PACKAGE_KMOD_NET_HERMES
+       depends PACKAGE_KMOD_NET_HERMES
        help
          Enable support for PCI and mini-PCI 802.11b wireless NICs based on 
          the Prism 2.5 chipset.  These are true PCI cards, not the 802.11b 
@@ -526,11 +528,11 @@ config BR2_PACKAGE_KMOD_NET_HERMES_PCI
          common.  Some of the built-in wireless adaptors in laptops are of 
          this variety.
 
-config BR2_PACKAGE_KMOD_NET_HERMES_PLX
+config PACKAGE_KMOD_NET_HERMES_PLX
        prompt   "kmod-net-hermes-plx............. Hermes in PLX9052 based PCI adaptor (Netgear MA301, etc.) kernel support"
        tristate
        default m
-       depends BR2_PACKAGE_KMOD_NET_HERMES
+       depends PACKAGE_KMOD_NET_HERMES
        help
          Enable support for PCMCIA cards supported by the "Hermes" (aka 
          orinoco_cs) driver when used in PLX9052 based PCI adaptors.  These 
@@ -539,20 +541,20 @@ config BR2_PACKAGE_KMOD_NET_HERMES_PLX
          802.11b PCMCIA cards can be used in desktop machines.  The Netgear 
          MA301 is such an adaptor.
 
-config BR2_PACKAGE_KMOD_NET_NATSEMI
+config PACKAGE_KMOD_NET_NATSEMI
        prompt "kmod-net-natsemi.................. National Semiconductor DP8381x series PCI Ethernet kernel support"
        tristate
-       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86
+       depends LINUX_2_4_X86 || LINUX_2_6_X86
        default m
        help
          This driver is for the National Semiconductor DP83810 series, 
          which is used in cards from PureData, NetGear, Linksys 
          and others, including the 83815 chip.
 
-config BR2_PACKAGE_KMOD_NET_PRISM54
+config PACKAGE_KMOD_NET_PRISM54
        prompt "kmod-net-prism54.................. Intersil Prism GT/Duette/Indigo PCI/PCMCIA cards kernel support"
        tristate
-       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_BRCM
+       depends LINUX_2_4_X86 || LINUX_2_6_X86 || LINUX_2_4_BRCM || LINUX_2_6_BRCM
        default m
        help
          Enable PCI and Cardbus support for the following chipset based cards: 
@@ -591,135 +593,135 @@ config BR2_PACKAGE_KMOD_NET_PRISM54
 endmenu
 
 menu "PCMCIA/CardBus support"
-       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_BRCM
+       depends LINUX_2_4_X86 || LINUX_2_6_X86 || LINUX_2_4_BRCM || LINUX_2_6_BRCM
 
-config BR2_PACKAGE_KMOD_PCMCIA_CORE
+config PACKAGE_KMOD_PCMCIA_CORE
        prompt "kmod-pcmcia-core.................. PCMCIA/CardBus support"
-       depends BR2_LINUX_PCMCIA_SUPPORT
+       depends LINUX_PCMCIA_SUPPORT
        tristate
-       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_BRCM
+       depends LINUX_2_4_X86 || LINUX_2_6_X86 || LINUX_2_4_BRCM || LINUX_2_6_BRCM
        default m
 
-config BR2_PACKAGE_KMOD_PCMCIA_SERIAL
+config PACKAGE_KMOD_PCMCIA_SERIAL
        prompt   "kmod-pcmcia-serial.............. PCMCIA/CardBus serial device support"
        tristate
        default m
-       depends BR2_PACKAGE_KMOD_PCMCIA_CORE
+       depends PACKAGE_KMOD_PCMCIA_CORE
 
 endmenu
 
 menu "USB support"
 
-config BR2_PACKAGE_KMOD_USB
+config PACKAGE_KMOD_USB
        prompt "kmod-usb-core..................... USB support"
        tristate
-       default n if BR2_LINUX_2_4_AR531X
+       default n if LINUX_2_4_AR531X
        default m
 
-config BR2_PACKAGE_KMOD_USB_UHCI 
+config PACKAGE_KMOD_USB_UHCI 
        prompt   "kmod-usb-uhci................... Support for UHCI controllers"
        tristate
-       default n if BR2_LINUX_2_6_AU1000
-       depends BR2_PACKAGE_KMOD_USB
-       select BR2_PACKAGE_KMOD_USB_CONTROLLER
+       default n if LINUX_2_6_AU1000
+       depends PACKAGE_KMOD_USB
+       select PACKAGE_KMOD_USB_CONTROLLER
 
-config BR2_PACKAGE_KMOD_USB_OHCI
+config PACKAGE_KMOD_USB_OHCI
        prompt   "kmod-usb-ohci................... Support for OHCI controllers"
        tristate
        default m
-       depends BR2_PACKAGE_KMOD_USB
-       select BR2_PACKAGE_KMOD_USB_CONTROLLER
+       depends PACKAGE_KMOD_USB
+       select PACKAGE_KMOD_USB_CONTROLLER
 
-config BR2_PACKAGE_KMOD_USB2
+config PACKAGE_KMOD_USB2
        prompt   "kmod-usb2....................... Support for USB 2.0 controllers"
        tristate
-       default n if BR2_LINUX_2_6_AU1000
-       depends BR2_PACKAGE_KMOD_USB
-       select BR2_PACKAGE_KMOD_USB_CONTROLLER
+       default n if LINUX_2_6_AU1000
+       depends PACKAGE_KMOD_USB
+       select PACKAGE_KMOD_USB_CONTROLLER
 
-config BR2_PACKAGE_KMOD_USB_CONTROLLER
+config PACKAGE_KMOD_USB_CONTROLLER
        tristate
-       depends on BR2_PACKAGE_KMOD_USB_UHCI || BR2_PACKAGE_KMOD_USB_OHCI || BR2_PACKAGE_KMOD_USB2
+       depends on PACKAGE_KMOD_USB_UHCI || PACKAGE_KMOD_USB_OHCI || PACKAGE_KMOD_USB2
        default n
 
-config BR2_PACKAGE_KMOD_USB_ACM
+config PACKAGE_KMOD_USB_ACM
        prompt "kmod-usb-acm...................... Support for USB modems/isdn controllers"
        tristate
        default m
-       depends BR2_PACKAGE_KMOD_USB_CONTROLLER
+       depends PACKAGE_KMOD_USB_CONTROLLER
 
-config BR2_PACKAGE_KMOD_USB_AUDIO
+config PACKAGE_KMOD_USB_AUDIO
        prompt "kmod-usb-audio.................... Support for USB soundcards"
        tristate
        default m
-       depends BR2_PACKAGE_KMOD_USB_CONTROLLER
-       select BR2_PACKAGE_KMOD_SOUNDCORE
+       depends PACKAGE_KMOD_USB_CONTROLLER
+       select PACKAGE_KMOD_SOUNDCORE
 
-config BR2_PACKAGE_KMOD_USB_PRINTER
+config PACKAGE_KMOD_USB_PRINTER
        prompt "kmod-usb-printer.................. Support for USB printers"
        tristate
        default m
-       depends BR2_PACKAGE_KMOD_USB_CONTROLLER
+       depends PACKAGE_KMOD_USB_CONTROLLER
 
-config BR2_PACKAGE_KMOD_USB_SERIAL
+config PACKAGE_KMOD_USB_SERIAL
        prompt "kmod-usb-serial................... Support for USB-to-serial converters"
        tristate
        default m
-       depends BR2_PACKAGE_KMOD_USB_CONTROLLER
+       depends PACKAGE_KMOD_USB_CONTROLLER
 
-config BR2_PACKAGE_KMOD_USB_SERIAL_BELKIN
+config PACKAGE_KMOD_USB_SERIAL_BELKIN
        prompt   "kmod-usb-serial-belkin.......... Support for Belkin USB-to-serial converters"
        tristate
        default m
-       depends BR2_PACKAGE_KMOD_USB_SERIAL
+       depends PACKAGE_KMOD_USB_SERIAL
 
-config BR2_PACKAGE_KMOD_USB_SERIAL_FTDI
+config PACKAGE_KMOD_USB_SERIAL_FTDI
        prompt   "kmod-usb-serial-ftdi............ Support for FTDI USB-to-serial converterr"
        tristate
        default m
-       depends BR2_PACKAGE_KMOD_USB_SERIAL
+       depends PACKAGE_KMOD_USB_SERIAL
 
-config BR2_PACKAGE_KMOD_USB_SERIAL_MCT_U232
+config PACKAGE_KMOD_USB_SERIAL_MCT_U232
        prompt   "kmod-usb-serial-mct-u232........ Support for Magic Control Technology USB-to-Serial converters"
        tristate
        default m
-       depends BR2_PACKAGE_KMOD_USB_SERIAL
+       depends PACKAGE_KMOD_USB_SERIAL
 
-config BR2_PACKAGE_KMOD_USB_SERIAL_PL2303
+config PACKAGE_KMOD_USB_SERIAL_PL2303
        prompt   "kmod-usb-serial-pl2303.......... Support for Prolific PL2303 USB-to-Serial converters"
        tristate
        default m
-       depends BR2_PACKAGE_KMOD_USB_SERIAL
+       depends PACKAGE_KMOD_USB_SERIAL
 
-config BR2_PACKAGE_KMOD_USB_SERIAL_VISOR
+config PACKAGE_KMOD_USB_SERIAL_VISOR
        prompt   "kmod-usb-serial-visor........... Support for Handspring Visor / Palm m50x / Sony Clie Driver"
        tristate
        default m
-       depends BR2_PACKAGE_KMOD_USB_SERIAL
+       depends PACKAGE_KMOD_USB_SERIAL
 
-config BR2_PACKAGE_KMOD_USB_STORAGE
+config PACKAGE_KMOD_USB_STORAGE
        prompt "kmod-usb-storage.................. Support for USB storage devices"
        tristate
        default m
-       depends BR2_PACKAGE_KMOD_USB_CONTROLLER
+       depends PACKAGE_KMOD_USB_CONTROLLER
 
-config BR2_PACKAGE_KMOD_USB_ATM
+config PACKAGE_KMOD_USB_ATM
         prompt "kmod-usb-atm...................... Support for USB ATM devices"
        tristate
        default m
-       depends BR2_PACKAGE_KMOD_USB_CONTROLLER
+       depends PACKAGE_KMOD_USB_CONTROLLER
 
-config BR2_PACKAGE_KMOD_USB_ATM_SPEEDTOUCH
+config PACKAGE_KMOD_USB_ATM_SPEEDTOUCH
         prompt   "kmod-usb-atm-speedtouch......... Support for USB Speedtouch ADSL modem"
        tristate
        default m
-       depends BR2_PACKAGE_KMOD_USB_ATM
+       depends PACKAGE_KMOD_USB_ATM
 
 endmenu
 
 menu "Misc. devices support"
 
-config BR2_PACKAGE_KMOD_AX25
+config PACKAGE_KMOD_AX25
        prompt "kmod-ax25......................... AX25 support"
        tristate
        default m
@@ -728,33 +730,33 @@ config BR2_PACKAGE_KMOD_AX25
          
          This package contains both the AX25 layer 2 support (ax25) and AX25 KISS driver (mkiss)
 
-config BR2_PACKAGE_KMOD_BLUETOOTH
+config PACKAGE_KMOD_BLUETOOTH
        prompt "kmod-bluetooth.................... Bluetooth drivers and network stack"
        tristate
        default m
-       default n if BR2_LINUX_2_4_AR531X
+       default n if LINUX_2_4_AR531X
        help
          Bluetooth drivers and network stack
 
-config BR2_PACKAGE_KMOD_LP
+config PACKAGE_KMOD_LP
        prompt "kmod-lp........................... Parallel port and lp support"
        tristate
        default m
        help
          Kernel modules for line printer and parallel port support
 
-config BR2_PACKAGE_KMOD_SOFTDOG
+config PACKAGE_KMOD_SOFTDOG
        prompt "kmod-softdog...................... Software watchdog"
        tristate
        default m
        help
          Kernel modules for software watchdog driver
 
-config BR2_PACKAGE_KMOD_WD1100
+config PACKAGE_KMOD_WD1100
        prompt "kmod-wd1100....................... Soekris net4801 watchdog"
        tristate
        default y
-       depends BR2_LINUX_2_4_X86
+       depends LINUX_2_4_X86
        help
          Driver for the NatSemi SC1x00 series Watchdog 
          found on Soekris net4801 boards

diff --git a/openwrt/target/linux/ar7-2.4/Config.in b/openwrt/target/linux/ar7-2.4/Config.in
index 9d1fe7b81393071ff3d5826193eb4ff705f0a964..57d06c01b5792e511b5a725685e99f8b2d505339 100644 (file)
--- a/openwrt/target/linux/ar7-2.4/Config.in
+++ b/openwrt/target/linux/ar7-2.4/Config.in
@@ -1,27 +1,27 @@
-config BR2_PACKAGE_KMOD_CPMAC
+config PACKAGE_KMOD_CPMAC
        prompt "kmod-cpmac........................ AR7 CPMAC Network Driver"
        tristate
        default y
-       depends BR2_LINUX_2_4_AR7
+       depends LINUX_2_4_AR7
        help
          Driver for the AR7 CPMAC network chip
 
-config BR2_PACKAGE_KMOD_SANGAM_ATM_A
+config PACKAGE_KMOD_SANGAM_ATM_A
        prompt "kmod-sangam-atm-annex-a........... AR7 Sangam ADSL Driver (Annex A)"
        tristate
        default m
-       depends BR2_LINUX_2_4_AR7
-       select BR2_PACKAGE_KMOD_ATM
+       depends LINUX_2_4_AR7
+       select PACKAGE_KMOD_ATM
        help
          ATM driver for the Sangam ADSL chip on AR7
          Annex A version
 
-config BR2_PACKAGE_KMOD_SANGAM_ATM_B
+config PACKAGE_KMOD_SANGAM_ATM_B
        prompt "kmod-sangam-atm-annex-b........... AR7 Sangam ADSL Driver (Annex B)"
        tristate
        default y
-       depends BR2_LINUX_2_4_AR7
-       select BR2_PACKAGE_KMOD_ATM
+       depends LINUX_2_4_AR7
+       select PACKAGE_KMOD_ATM
        help
          ATM driver for the Sangam ADSL chip on AR7
          Annex B version

diff --git a/openwrt/target/linux/aruba-2.6/Config.in b/openwrt/target/linux/aruba-2.6/Config.in
index c1fab56464e0041a20337bf6ca0afd39781c1581..b66e8f65519ab8e7463cf447d5752a81c3f3a75c 100644 (file)
--- a/openwrt/target/linux/aruba-2.6/Config.in
+++ b/openwrt/target/linux/aruba-2.6/Config.in
@@ -1,4 +1,4 @@
-config BR2_ARUBA_RAMDISK
+config ARUBA_RAMDISK
        prompt "ramdisk support"
-       depends BR2_LINUX_2_6_ARUBA
+       depends LINUX_2_6_ARUBA
        bool

diff --git a/openwrt/target/linux/aruba-2.6/Makefile b/openwrt/target/linux/aruba-2.6/Makefile
index 24330c08f1dbd1a9c5700bb658739a587f4039ad..b5b220d0f2cbd102f5df90ef22b308138a05fc2f 100644 (file)
--- a/openwrt/target/linux/aruba-2.6/Makefile
+++ b/openwrt/target/linux/aruba-2.6/Makefile
@@ -14,7 +14,7 @@ include ../kernel.mk
 $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
        [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE)
        [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches $(MAKE_TRACE)
-ifeq ($(BR2_ARUBA_RAMDISK),y)
+ifeq ($(CONFIG_ARUBA_RAMDISK),y)
        @$(CP) config-ramdisk $(LINUX_DIR)/.config
 else
        @$(CP) config $(LINUX_DIR)/.config

diff --git a/openwrt/target/linux/brcm-2.4/Config.in b/openwrt/target/linux/brcm-2.4/Config.in
index c344a97e816b484098beea1364a5f3852e75b81c..181014f7b3e97d620c1a5480fd72d4e6850595d0 100644 (file)
--- a/openwrt/target/linux/brcm-2.4/Config.in
+++ b/openwrt/target/linux/brcm-2.4/Config.in
@@ -1,15 +1,15 @@
-config BR2_PACKAGE_KMOD_BRCM_WL
+config PACKAGE_KMOD_BRCM_WL
        prompt "kmod-brcm-wl...................... Broadcom Wireless Network Driver"
        tristate
-       depends BR2_LINUX_2_4_BRCM
+       depends LINUX_2_4_BRCM
        default y
        help
          Proprietary driver for Broadcom Wireless chipsets
 
-config BR2_PACKAGE_KMOD_BRCM_WL2
+config PACKAGE_KMOD_BRCM_WL2
        prompt "kmod-brcm-wl2..................... Broadcom Wireless Network Driver (new)"
        tristate
-       depends BR2_LINUX_2_4_BRCM
+       depends LINUX_2_4_BRCM
        default m
        help
          Proprietary driver for Broadcom Wireless chipsets

diff --git a/openwrt/target/linux/image/Makefile b/openwrt/target/linux/image/Makefile
index af7cd0e8d5755eccd5028655ce78192162d0c48c..ce807b3027990c489a94ebc66169fcd7fa2bf077 100644 (file)
--- a/openwrt/target/linux/image/Makefile
+++ b/openwrt/target/linux/image/Makefile
@@ -2,15 +2,15 @@ include $(TOPDIR)/rules.mk
 
 KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
 
-ifeq ($(BR2_TARGET_ROOTFS_JFFS2),y)
+ifeq ($(CONFIG_TARGET_ROOTFS_JFFS2),y)
 include ./jffs2.mk
 endif
 
-ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS_LZMA),y)
+ifeq ($(CONFIG_TARGET_ROOTFS_SQUASHFS_LZMA),y)
 include ./squashfs.mk
 endif
 
-ifeq ($(BR2_TARGET_ROOTFS_TGZ),y)
+ifeq ($(CONFIG_TARGET_ROOTFS_TGZ),y)
 include ./tgz.mk
 endif
 

diff --git a/openwrt/target/linux/image/aruba/Makefile b/openwrt/target/linux/image/aruba/Makefile
index a2cceaf0c1cf81e9d4def62f5c12f766a86221f6..0ddde20266c7a463606430994470ec867a3e2f2c 100644 (file)
--- a/openwrt/target/linux/image/aruba/Makefile
+++ b/openwrt/target/linux/image/aruba/Makefile
@@ -36,7 +36,7 @@ ifeq ($(FS),jffs2-4MB)
 $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari: $(KDIR)/loader.elf
        ./addVersion -n ArubaOS $(KDIR)/loader.elf $@ version
 
-ifneq ($(BR2_ARUBA_RAMDISK),y)
+ifneq ($(CONFIG_ARUBA_RAMDISK),y)
 $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari $(KDIR)/root.$(FS)
        @dd if=$< of=$@.tmp bs=655360 conv=sync
        @cat $(KDIR)/root.$(FS) >> $@.tmp

diff --git a/openwrt/target/linux/image/jffs2.mk b/openwrt/target/linux/image/jffs2.mk
index 1b0c3a778f3929b3f6bdb651c8ff296ae4f10d5a..7df3aedbcf56f495f8ec8daabf71308a1572a695 100644 (file)
--- a/openwrt/target/linux/image/jffs2.mk
+++ b/openwrt/target/linux/image/jffs2.mk
@@ -1,4 +1,4 @@
-ifneq ($(BR2_mips),y)
+ifneq ($(CONFIG_mips),y)
 JFFS2OPTS :=  --pad --little-endian --squash
 else
 JFFS2OPTS :=  --pad --big-endian --squash

diff --git a/openwrt/target/linux/package/Makefile b/openwrt/target/linux/package/Makefile
index 45211c1c8b044c0379fafa4c2020d8072d7a22ce..792fb7bd6749699b7775e512aec5c77a00f04531 100644 (file)
--- a/openwrt/target/linux/package/Makefile
+++ b/openwrt/target/linux/package/Makefile
@@ -3,22 +3,22 @@ include $(TOPDIR)/rules.mk
 include ../rules.mk
 
 package-y += base-files
-package-$(BR2_PACKAGE_KMOD_ALSA) += alsa
-package-$(BR2_PACKAGE_KMOD_FUSE) += fuse
-package-$(BR2_PACKAGE_KMOD_HOSTAP) += hostap
-package-$(BR2_PACKAGE_KMOD_BCM43XX_STANDALONE) += bcm43xx-standalone
-package-$(BR2_PACKAGE_KMOD_IEEE80211_DSCAPE) += ieee80211-dscape
-package-$(BR2_PACKAGE_KMOD_MADWIFI) += madwifi
-package-$(BR2_PACKAGE_KMOD_MADWIFI_OLD) += madwifi-old
-package-$(BR2_PACKAGE_KMOD_MINI_FO) += mini_fo
-package-$(BR2_PACKAGE_KMOD_OPENSWAN) += openswan
-package-$(BR2_PACKAGE_KMOD_SHFS) += shfs
-package-$(BR2_PACKAGE_KMOD_SPCA5XX) += spca5xx
-package-$(BR2_PACKAGE_KMOD_SWITCH) += switch
-package-$(BR2_PACKAGE_KMOD_UEAGLE_ATM) += ueagle-atm
-package-$(BR2_PACKAGE_KMOD_DIAG) += diag
-package-$(BR2_PACKAGE_KMOD_WLCOMPAT) += wlcompat
-package-$(BR2_PACKAGE_KMOD_ZD1211) += zd1211
+package-$(CONFIG_PACKAGE_KMOD_ALSA) += alsa
+package-$(CONFIG_PACKAGE_KMOD_FUSE) += fuse
+package-$(CONFIG_PACKAGE_KMOD_HOSTAP) += hostap
+package-$(CONFIG_PACKAGE_KMOD_BCM43XX_STANDALONE) += bcm43xx-standalone
+package-$(CONFIG_PACKAGE_KMOD_IEEE80211_DSCAPE) += ieee80211-dscape
+package-$(CONFIG_PACKAGE_KMOD_MADWIFI) += madwifi
+package-$(CONFIG_PACKAGE_KMOD_MADWIFI_OLD) += madwifi-old
+package-$(CONFIG_PACKAGE_KMOD_MINI_FO) += mini_fo
+package-$(CONFIG_PACKAGE_KMOD_OPENSWAN) += openswan
+package-$(CONFIG_PACKAGE_KMOD_SHFS) += shfs
+package-$(CONFIG_PACKAGE_KMOD_SPCA5XX) += spca5xx
+package-$(CONFIG_PACKAGE_KMOD_SWITCH) += switch
+package-$(CONFIG_PACKAGE_KMOD_UEAGLE_ATM) += ueagle-atm
+package-$(CONFIG_PACKAGE_KMOD_DIAG) += diag
+package-$(CONFIG_PACKAGE_KMOD_WLCOMPAT) += wlcompat
+package-$(CONFIG_PACKAGE_KMOD_ZD1211) += zd1211
 
 bcm43xx-standalone-compile: ieee80211-dscape-compile
 wlcompat-compile: base-files-compile

diff --git a/openwrt/target/linux/package/alsa/Config.in b/openwrt/target/linux/package/alsa/Config.in
index df4da0b7d1dcf6bc5087cdda347942fb0e0a25e7..55d9abd1c474a5816a4bdfc4801f4c72330aef98 100644 (file)
--- a/openwrt/target/linux/package/alsa/Config.in
+++ b/openwrt/target/linux/package/alsa/Config.in
@@ -1,9 +1,9 @@
-config BR2_PACKAGE_KMOD_ALSA
+config PACKAGE_KMOD_ALSA
        prompt "kmod-alsa......................... Alsa Sound Drivers"
        tristate
-    depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_X86 || BR2_LINUX_2_6_BRCM
-       depends BR2_PACKAGE_KMOD_USB_CONTROLLER
-       select BR2_PACKAGE_KMOD_SOUNDCORE
-       default m if CONFIG_DEVEL
+    depends LINUX_2_4_X86 || LINUX_2_4_BRCM || LINUX_2_6_X86 || LINUX_2_6_BRCM
+       depends PACKAGE_KMOD_USB_CONTROLLER
+       select PACKAGE_KMOD_SOUNDCORE
+       default m if DEVEL
        help
          Alsa Drivers for USB Soundcards

diff --git a/openwrt/target/linux/package/bcm43xx-standalone/Config.in b/openwrt/target/linux/package/bcm43xx-standalone/Config.in
index 5e15f8121c3347eedc72a6ad73eebb5782fd1041..84a4702cf2c258b71b20eaa02f24fa2e689e86f5 100644 (file)
--- a/openwrt/target/linux/package/bcm43xx-standalone/Config.in
+++ b/openwrt/target/linux/package/bcm43xx-standalone/Config.in
@@ -1,8 +1,8 @@
-config BR2_PACKAGE_KMOD_BCM43XX_STANDALONE
+config PACKAGE_KMOD_BCM43XX_STANDALONE
        prompt "kmod-bcm43xx-standalone............... Free Broadcom 43xx wireless driver (devicescape stack)"
        tristate
-       depends BR2_LINUX_2_6_BRCM
-       select BR2_PACKAGE_KMOD_IEEE80211_DSCAPE
+       depends LINUX_2_6_BRCM
+       select PACKAGE_KMOD_IEEE80211_DSCAPE
        default n
        help
          Free driver for the Broadcom 43xx wireless chipset

diff --git a/openwrt/target/linux/package/diag/Config.in b/openwrt/target/linux/package/diag/Config.in
index 70f726c5b683ffc1de5644eeea44dd3aac6adc9c..80cba50cf2dac3706c186f030e4ee3f52b6302cf 100644 (file)
--- a/openwrt/target/linux/package/diag/Config.in
+++ b/openwrt/target/linux/package/diag/Config.in
@@ -1,7 +1,7 @@
-config BR2_PACKAGE_KMOD_DIAG
+config PACKAGE_KMOD_DIAG
        prompt "kmod-diag......................... Driver for router LEDs and Buttons"
        tristate
-       depends BR2_LINUX_2_4_BRCM
+       depends LINUX_2_4_BRCM
        default y
        help
          Driver for router LEDs and Buttons

diff --git a/openwrt/target/linux/package/fuse/Config.in b/openwrt/target/linux/package/fuse/Config.in
index 8fbb34c079e111732a347b8fcf646c5c4de4c767..d51229522b090ca49eeed31a996ffaaa53b91a01 100644 (file)
--- a/openwrt/target/linux/package/fuse/Config.in
+++ b/openwrt/target/linux/package/fuse/Config.in
@@ -1,7 +1,7 @@
-config BR2_PACKAGE_KMOD_FUSE
+config PACKAGE_KMOD_FUSE
        prompt "kmod-fuse......................... FUSE kernel module"
        tristate
-       default m if CONFIG_DEVEL
+       default m if DEVEL
        help
          With FUSE it is possible to implement a fully functional 
          filesystem in a userspace program.

diff --git a/openwrt/target/linux/package/hostap/Config.in b/openwrt/target/linux/package/hostap/Config.in
index 767b4593163fa48a3ce70450e95d406323da59b1..39b49d4c4bd2ecddd3a836f5a7cc24f28eebe842 100644 (file)
--- a/openwrt/target/linux/package/hostap/Config.in
+++ b/openwrt/target/linux/package/hostap/Config.in
@@ -1,8 +1,8 @@
-config BR2_PACKAGE_KMOD_HOSTAP
+config PACKAGE_KMOD_HOSTAP
        prompt "kmod-hostap....................... Host AP support for Prism2/2.5/3 IEEE 802.11b"
        tristate
-       depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_4_BRCM
-       default m if CONFIG_DEVEL
+       depends LINUX_2_4_X86 || LINUX_2_4_BRCM
+       default m if DEVEL
        help
          A driver for 802.11b wireless cards based on Intersil Prism2/2.5/3
          chipset. This driver supports so called Host AP mode that allows
@@ -14,11 +14,11 @@ config BR2_PACKAGE_KMOD_HOSTAP
          
          http://hostap.epitest.fi/
 
-config BR2_PACKAGE_KMOD_HOSTAP_PCI
+config PACKAGE_KMOD_HOSTAP_PCI
        prompt   "kmod-hostap-pci................. Host AP driver for Prism2.5 PCI adaptors"
        tristate
-       default m if CONFIG_DEVEL
-       depends BR2_PACKAGE_KMOD_HOSTAP
+       default m if DEVEL
+       depends PACKAGE_KMOD_HOSTAP
        help
          Host AP support for Prism2/2.5/3 IEEE 802.11b" is required for this
          driver and its help text includes more information about the Host AP
@@ -26,11 +26,11 @@ config BR2_PACKAGE_KMOD_HOSTAP_PCI
          
          http://hostap.epitest.fi/
 
-config BR2_PACKAGE_KMOD_HOSTAP_PLX
+config PACKAGE_KMOD_HOSTAP_PLX
        prompt   "kmod-hostap-plx................. Host AP driver for Prism2/2.5/3 in PLX9052 based PCI adaptors"
        tristate
-       default m if CONFIG_DEVEL
-       depends BR2_PACKAGE_KMOD_HOSTAP
+       default m if DEVEL
+       depends PACKAGE_KMOD_HOSTAP
        help
          Host AP support for Prism2/2.5/3 IEEE 802.11b" is required for this
          driver and its help text includes more information about the Host AP

diff --git a/openwrt/target/linux/package/ieee80211-dscape/Config.in b/openwrt/target/linux/package/ieee80211-dscape/Config.in
index a440ee26079959ad821f12c49802d9421f1d211f..d747ed2fbabcc643e5bcb4e961ce0e28f0333b0d 100644 (file)
--- a/openwrt/target/linux/package/ieee80211-dscape/Config.in
+++ b/openwrt/target/linux/package/ieee80211-dscape/Config.in
@@ -1,8 +1,8 @@
-config BR2_PACKAGE_KMOD_IEEE80211_DSCAPE
+config PACKAGE_KMOD_IEEE80211_DSCAPE
        prompt "kmod-ieee80211-dscape............. IEEE 802.11 stack (devicescape)"
        tristate
        default n
-       depends BR2_LINUX_2_6_BRCM || BR2_LINUX_2_6_X86
+       depends LINUX_2_6_BRCM || LINUX_2_6_X86
        
        help
          IEEE 802.11 stack (devicescape)

diff --git a/openwrt/target/linux/package/madwifi-old/Config.in b/openwrt/target/linux/package/madwifi-old/Config.in
index 115ce03f607fe23b28b9c0f27157e8573594ea97..ec0385540dd9dcd41c740a1dc4c624feafc358e6 100644 (file)
--- a/openwrt/target/linux/package/madwifi-old/Config.in
+++ b/openwrt/target/linux/package/madwifi-old/Config.in
@@ -1,7 +1,7 @@
-config BR2_PACKAGE_KMOD_MADWIFI_OLD
+config PACKAGE_KMOD_MADWIFI_OLD
        prompt "kmod-madwifi-old.................. (old) Atheros Wifi driver"
        tristate
-       default m if CONFIG_DEVEL
+       default m if DEVEL
        default n
        help
          Madwifi-old driver for Atheros wireless adapters

diff --git a/openwrt/target/linux/package/madwifi-old/Makefile b/openwrt/target/linux/package/madwifi-old/Makefile
index 25c64df50a3052206a5385551875f7a87403e625..7d369722aae6b1e02f2f37265da2dd09b5c657ef 100644 (file)
--- a/openwrt/target/linux/package/madwifi-old/Makefile
+++ b/openwrt/target/linux/package/madwifi-old/Makefile
@@ -26,10 +26,10 @@ endif
 
 BUS := PCI
 
-ifneq ($(BR2_LINUX_2_4_AR531X),)
+ifneq ($(CONFIG_LINUX_2_4_AR531X),)
        BUS := AHB
 endif
-# ifneq ($(BR2_LINUX_2_6_ARUBA),)
+# ifneq ($(CONFIG_LINUX_2_6_ARUBA),)
 #      BUS := PCI AHB  # no suitable HAL for AHB yet.
 # endif
 

diff --git a/openwrt/target/linux/package/madwifi/Config.in b/openwrt/target/linux/package/madwifi/Config.in
index b554e672fd34bb080b69c463cddfdabfef165cee..6eda342f8184058a6295ec65e15ded0541c9eadf 100644 (file)
--- a/openwrt/target/linux/package/madwifi/Config.in
+++ b/openwrt/target/linux/package/madwifi/Config.in
@@ -1,8 +1,8 @@
-config BR2_PACKAGE_KMOD_MADWIFI
+config PACKAGE_KMOD_MADWIFI
        prompt "kmod-madwifi...................... Atheros Wifi driver"
        tristate
-       default y if BR2_LINUX_2_6_BRCM || BR2_LINUX_2_6_ARUBA || BR2_LINUX_2_4_AR531X
-       default m if CONFIG_DEVEL
+       default y if LINUX_2_6_BRCM || LINUX_2_6_ARUBA || LINUX_2_4_AR531X
+       default m if DEVEL
        default n
        help
          Driver for Atheros 802.11a/b/g MiniPCI cards

diff --git a/openwrt/target/linux/package/madwifi/Makefile b/openwrt/target/linux/package/madwifi/Makefile
index fcdac9097fc05ca91f9bcfc004dc15a75880e7f4..d42372b52ecfceb9deafe84921f5887eb9ee87b5 100644 (file)
--- a/openwrt/target/linux/package/madwifi/Makefile
+++ b/openwrt/target/linux/package/madwifi/Makefile
@@ -26,10 +26,10 @@ endif
 
 BUS := PCI
 
-ifneq ($(BR2_LINUX_2_4_AR531X),)
+ifneq ($(CONFIG_LINUX_2_4_AR531X),)
        BUS := AHB
 endif
-ifneq ($(BR2_LINUX_2_6_ARUBA),)
+ifneq ($(CONFIG_LINUX_2_6_ARUBA),)
        BUS := PCI AHB  # no suitable HAL for AHB yet.
 endif
 

diff --git a/openwrt/target/linux/package/mini_fo/Config.in b/openwrt/target/linux/package/mini_fo/Config.in
index a92ff9785a056837b925fba9697786259e311940..a280ff56a8d8d4e26a9634175c2793a285ec993d 100644 (file)
--- a/openwrt/target/linux/package/mini_fo/Config.in
+++ b/openwrt/target/linux/package/mini_fo/Config.in
@@ -1,6 +1,6 @@
-config BR2_PACKAGE_KMOD_MINI_FO
+config PACKAGE_KMOD_MINI_FO
        prompt "kmod-mini_fo...................... mini fanout overlay file system"
        tristate
-       default m if CONFIG_DEVEL
+       default m if DEVEL
        help
          The mini fanout overlay file system.

diff --git a/openwrt/target/linux/package/openswan/Config.in b/openwrt/target/linux/package/openswan/Config.in
index 59a943f8e46b01f16764daaa3c68304aa8dd5c00..faf0f8f4a61e2bfd01eaa1a8816b5eeca4b5268a 100644 (file)
--- a/openwrt/target/linux/package/openswan/Config.in
+++ b/openwrt/target/linux/package/openswan/Config.in
@@ -1,7 +1,7 @@
-config BR2_PACKAGE_KMOD_OPENSWAN
+config PACKAGE_KMOD_OPENSWAN
        prompt "kmod-openswan..................... Openswan kernel module"
        tristate
-       default m if CONFIG_DEVEL
+       default m if DEVEL
        help
          Openswan is an implementation of IPsec for Linux.
          

diff --git a/openwrt/target/linux/package/shfs/Config.in b/openwrt/target/linux/package/shfs/Config.in
index 61bd54b5e59b81748c674608ae8fa79bb32ac8f5..71cc327073a0174ceff1d88349df422991f27f4f 100644 (file)
--- a/openwrt/target/linux/package/shfs/Config.in
+++ b/openwrt/target/linux/package/shfs/Config.in
@@ -1,7 +1,7 @@
-config BR2_PACKAGE_KMOD_SHFS
+config PACKAGE_KMOD_SHFS
        prompt "kmod-shfs......................... Shell FileSystem kernel module (ShFS) kernel module"
        tristate
-       default m if CONFIG_DEVEL
+       default m if DEVEL
        help
          ShFS is a simple and easy to use Linux kernel module which 
          allows you to mount remote filesystems using a plain shell 

diff --git a/openwrt/target/linux/package/spca5xx/Config.in b/openwrt/target/linux/package/spca5xx/Config.in
index 6d504823f1c96fd66b6339e851c90744e47ebf3a..729e6b00944ca74a38608fe4fc689bfac3a2617e 100644 (file)
--- a/openwrt/target/linux/package/spca5xx/Config.in
+++ b/openwrt/target/linux/package/spca5xx/Config.in
@@ -1,7 +1,7 @@
-config BR2_PACKAGE_KMOD_SPCA5XX
+config PACKAGE_KMOD_SPCA5XX
        prompt "kmod-spca5xx...................... Kernel driver for SPCA5XX based USB cameras"
        tristate
-       default m if CONFIG_DEVEL
+       default m if DEVEL
        help
          Kernel driver for SPCA5XX based USB cameras
          

diff --git a/openwrt/target/linux/package/switch/Config.in b/openwrt/target/linux/package/switch/Config.in
index 407d5deb6893773396fa8892e6cd62983cb65de3..0ff2aa1aba9667d497ad8b5d85d31fefe4d2e101 100644 (file)
--- a/openwrt/target/linux/package/switch/Config.in
+++ b/openwrt/target/linux/package/switch/Config.in
@@ -1,8 +1,8 @@
-config BR2_PACKAGE_KMOD_SWITCH
+config PACKAGE_KMOD_SWITCH
        prompt "kmod-switch....................... Kernel driver for ROBO and ADMTEK SWITCH"
        tristate
-       default y if BR2_LINUX_2_6_BRCM || BR2_LINUX_2_4_BRCM
-       default m if CONFIG_DEVEL
+       default y if LINUX_2_6_BRCM || LINUX_2_4_BRCM
+       default m if DEVEL
        default n
        help
          Kernel driver for ROBO and ADMTEK switches.

diff --git a/openwrt/target/linux/package/ueagle-atm/Config.in b/openwrt/target/linux/package/ueagle-atm/Config.in
index 17b619cef810b6d119f0098a3bd4909569b7d733..c92fc2f7248dba001de648978ff9d65fd9d35787 100644 (file)
--- a/openwrt/target/linux/package/ueagle-atm/Config.in
+++ b/openwrt/target/linux/package/ueagle-atm/Config.in
@@ -1,8 +1,8 @@
-config BR2_PACKAGE_KMOD_UEAGLE_ATM
+config PACKAGE_KMOD_UEAGLE_ATM
        prompt "kmod-ueagle-atm.................... Kernel driver for Eagle 8051 based USB ADSL modems"
        tristate
-       depends BR2_LINUX_2_6_BRCM
-       default m if CONFIG_DEVEL
+       depends LINUX_2_6_BRCM
+       default m if DEVEL
        help
          Kernel driver for Eagle 8051 USB ADSL modems
          

diff --git a/openwrt/target/linux/package/wlcompat/Config.in b/openwrt/target/linux/package/wlcompat/Config.in
index 1e5f5e79e073d2c0dfa0ee4dc0045d4aae8ca1f1..904d1e6645955db866931f8922829b2194decb31 100644 (file)
--- a/openwrt/target/linux/package/wlcompat/Config.in
+++ b/openwrt/target/linux/package/wlcompat/Config.in
@@ -1,17 +1,17 @@
-config BR2_PACKAGE_KMOD_WLCOMPAT
+config PACKAGE_KMOD_WLCOMPAT
        prompt "kmod-wlcompat..................... Wrapper providing Wireless Extensions for Broadcom wl module"
        tristate
        default y
-       depends BR2_PACKAGE_KMOD_BRCM_WL || BR2_PACKAGE_KMOD_BRCM_WL2
+       depends PACKAGE_KMOD_BRCM_WL || PACKAGE_KMOD_BRCM_WL2
        help
          A wrapper module, that provides Wireless Extension support for the
          proprietary Broadcom wl module.
 
-config BR2_PACKAGE_KMOD_WLCOMPAT_DEBUG
+config PACKAGE_KMOD_WLCOMPAT_DEBUG
        prompt "kmod-wlcompat-debug............... Wrapper providing Wireless Extensions for Broadcom wl module (debug)"
        tristate
        default m
-       depends BR2_PACKAGE_KMOD_BRCM_WL || BR2_PACKAGE_KMOD_BRCM_WL2
+       depends PACKAGE_KMOD_BRCM_WL || PACKAGE_KMOD_BRCM_WL2
        help
          A wrapper module, that provides Wireless Extension support for the
          proprietary Broadcom wl module. (debug version)

diff --git a/openwrt/target/linux/package/zd1211/Config.in b/openwrt/target/linux/package/zd1211/Config.in
index 2852c84e558f8211da49d1c8902f5c7ae0dff545..cadfa4f5dd8aabb5667ac7c73cb7cc33b1b30b60 100644 (file)
--- a/openwrt/target/linux/package/zd1211/Config.in
+++ b/openwrt/target/linux/package/zd1211/Config.in
@@ -1,8 +1,8 @@
-config BR2_PACKAGE_KMOD_ZD1211
+config PACKAGE_KMOD_ZD1211
        prompt "kmod-zd12111...................... Driver for Zydas 1211 based devices"
        tristate
-       depends BR2_LINUX_2_6
-       default m if CONFIG_DEVEL
+       depends LINUX_2_6
+       default m if DEVEL
        help
          Linux driver for the ZyDAS ZD1211 802.11b/g USB-WLAN-Chip. 
          Initially contributed by ZyDAS, this driver is actively maintained 

diff --git a/openwrt/target/linux/rules.mk b/openwrt/target/linux/rules.mk
index 1ebe28b6ac5b75e56621724aea84700898af22a7..8490d110de8c4962dbc67bcc5ff5f8695fadda11 100644 (file)
--- a/openwrt/target/linux/rules.mk
+++ b/openwrt/target/linux/rules.mk
@@ -54,10 +54,10 @@ PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_
 I_$(1) := $(KMOD_BUILD_DIR)/ipkg/$(2)
 
 ifeq ($$(KDEPEND_$(1)),m)
-ifneq ($(BR2_PACKAGE_KMOD_$(1)),)
+ifneq ($(CONFIG_PACKAGE_KMOD_$(1)),)
 TARGETS += $$(PKG_$(1))
 endif
-ifeq ($(BR2_PACKAGE_KMOD_$(1)),y)
+ifeq ($(CONFIG_PACKAGE_KMOD_$(1)),y)
 INSTALL_TARGETS += $$(PKG_$(1))
 endif
 endif

diff --git a/openwrt/target/sdk/Config.in b/openwrt/target/sdk/Config.in
index f70810ba02d20644c5b4dcbc638f9baf00d9a5cc..343352ad05006e1cb101ff352a37fbf50eabd1d1 100644 (file)
--- a/openwrt/target/sdk/Config.in
+++ b/openwrt/target/sdk/Config.in
@@ -1,6 +1,6 @@
-config BR2_PACKAGE_SDK
+config PACKAGE_SDK
        bool "OpenWrt SDK"
-       default y if CONFIG_DEVEL
+       default y if DEVEL
        help
          Build an OpenWrt SDK.
          This is essentially a stripped-down version of the buildroot

diff --git a/openwrt/target/sdk/Makefile b/openwrt/target/sdk/Makefile
index 3f62aec1155f27f848d63d968d734add27aac38b..cfcf8c5e058d8da0a9c86def5a734d4f35afff37 100644 (file)
--- a/openwrt/target/sdk/Makefile
+++ b/openwrt/target/sdk/Makefile
@@ -27,7 +27,7 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2:
        $(CP) ./files/README.SDK $(SDK_BUILD_DIR)/
        $(CP) ./files/depend.mk $(SDK_BUILD_DIR)/package/
        $(CP) $(TOPDIR)/package/rules.mk $(SDK_BUILD_DIR)/package/
-       egrep '^BR2_(ARCH|WGET|STAGING|JLEVEL|LARGEFILE|TARGET_OPT)' $(TOPDIR)/.config > $(SDK_BUILD_DIR)/.config
+       egrep '^CONFIG_(ARCH|WGET|STAGING|JLEVEL|LARGEFILE|TARGET_OPT)' $(TOPDIR)/.config > $(SDK_BUILD_DIR)/.config
        find $(SDK_BUILD_DIR) -name .svn | xargs rm -rf 
        find $(SDK_BUILD_DIR) -name CVS | xargs rm -rf 
        (cd $(BUILD_DIR); \

diff --git a/openwrt/toolchain/binutils/Makefile b/openwrt/toolchain/binutils/Makefile
index 1b205715e348b865962c0dce57f0d34ec3370380..7d405664bb0fe398894e06a3b6a7aad192ebe732 100644 (file)
--- a/openwrt/toolchain/binutils/Makefile
+++ b/openwrt/toolchain/binutils/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 # build binutils for use on the host system
 #
 #############################################################
-BINUTILS_VERSION:=$(strip $(subst ",, $(BR2_BINUTILS_VERSION)))
+BINUTILS_VERSION:=$(strip $(subst ",, $(CONFIG_BINUTILS_VERSION)))
 #"
 
 BINUTILS_SITE:=http://www.fr.kernel.org/pub/linux/devel/binutils \

diff --git a/openwrt/toolchain/gcc/Makefile b/openwrt/toolchain/gcc/Makefile
index 26e17ad61e28ad31a7e8b2433a446907d4a81e68..cf60d7505033991f38025e7943f8cca59e6df54a 100644 (file)
--- a/openwrt/toolchain/gcc/Makefile
+++ b/openwrt/toolchain/gcc/Makefile
@@ -37,10 +37,10 @@ GCC_STRIP_HOST_BINARIES:=true
 #
 #############################################################
 
-ifeq ($(BR2_INSTALL_LIBGCJ),y)
+ifeq ($(CONFIG_INSTALL_LIBGCJ),y)
 TARGET_LANGUAGES:=c,c++,java
 else
-ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
+ifeq ($(CONFIG_INSTALL_LIBSTDCPP),y)
 TARGET_LANGUAGES:=c,c++
 else
 TARGET_LANGUAGES:=c
@@ -71,7 +71,7 @@ $(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked
        # We can dispense with the custom spec files, as well as libfloat for the arm case.
        # However, we still need a patch for arm.  There's a similar patch for gcc 3.3.x
        # which needs to be integrated so we can kill of libfloat for good.
-ifeq ($(BR2_SOFT_FLOAT),y)
+ifeq ($(CONFIG_SOFT_FLOAT),y)
 ifeq ("$(strip $(ARCH))","arm")
        $(SCRIPT_DIR)/patch-kernel.sh $(GCC_DIR) ./$(GCC_VERSION) arm-softfloat.patch.conditional
 endif
@@ -175,7 +175,7 @@ gcc-install: $(GCC_BUILD_DIR2)/.compiled
        #
        # Now for the ugly 3.3.x soft float hack...
        #
-ifeq ($(BR2_SOFT_FLOAT),y)
+ifeq ($(CONFIG_SOFT_FLOAT),y)
 ifeq ($(findstring 3.3.,$(GCC_VERSION)),3.3.)
        # Make sure we have a soft float specs file for this arch
        if [ ! -f ./$(GCC_VERSION)/specs-$(ARCH)-soft-float ] ; then \

diff --git a/openwrt/toolchain/gdb/Config.in b/openwrt/toolchain/gdb/Config.in
index 574a398bb8d071253b98d216a07c3c7dbc36d625..f8560cbd907fcb21b2e539e115626ac1996e04bd 100644 (file)
--- a/openwrt/toolchain/gdb/Config.in
+++ b/openwrt/toolchain/gdb/Config.in
@@ -1,6 +1,6 @@
 comment "Gdb Options"
 
-config BR2_PACKAGE_GDB_CLIENT
+config PACKAGE_GDB_CLIENT
        bool "Build gdb client for the Host"
        default n
        help

diff --git a/openwrt/toolchain/uClibc/Makefile b/openwrt/toolchain/uClibc/Makefile
index d77f554a12bad29d7e760708d0952afa0f2acccd..19ab0326f648e45afa31c05bd7ffdcc6a884dce1 100644 (file)
--- a/openwrt/toolchain/uClibc/Makefile
+++ b/openwrt/toolchain/uClibc/Makefile
@@ -6,10 +6,10 @@ include $(TOPDIR)/rules.mk
 #
 #############################################################
 
-ifeq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y)
+ifeq ($(CONFIG_UCLIBC_VERSION_SNAPSHOT),y)
 # Be aware that this changes daily....
 UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc
-UCLIBC_SOURCE:=uClibc-$(strip $(subst ",, $(BR2_USE_UCLIBC_SNAPSHOT))).tar.bz2
+UCLIBC_SOURCE:=uClibc-$(strip $(subst ",, $(CONFIG_USE_UCLIBC_SNAPSHOT))).tar.bz2
 #"
 UCLIBC_SITE:=http://www.uclibc.org/downloads/snapshots
 UCLIBC_VER:=PKG_VERSION:=0.${shell date +"%G%m%d"}
@@ -50,13 +50,13 @@ $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.unpacked
        $(CP) ./files/config.$(ARCH) $(UCLIBC_DIR)/.config
        $(SED) 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"$(LINUX_HEADERS_DIR)\",g' \
                $(UCLIBC_DIR)/.config
-ifeq ($(BR2_LARGEFILE),y)
+ifeq ($(CONFIG_LARGEFILE),y)
        $(SED) 's,^.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=y,g' $(UCLIBC_DIR)/.config
 else
        $(SED) 's,^.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=n,g' $(UCLIBC_DIR)/.config
 endif
        $(SED) 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g' $(UCLIBC_DIR)/.config
-ifeq ($(BR2_SOFT_FLOAT),y)
+ifeq ($(CONFIG_SOFT_FLOAT),y)
        $(SED) 's,.*HAS_FPU.*,HAS_FPU=n\nUCLIBC_HAS_FLOATS=y\nUCLIBC_HAS_SOFT_FLOAT=y,g' $(UCLIBC_DIR)/.config
 endif
        mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/include