ar71xx: fix Kconfig symbol selection for RB95x/RB2011
authorGabor Juhos <juhosg@openwrt.org>
Wed, 30 Oct 2013 06:54:53 +0000 (06:54 +0000)
committerGabor Juhos <juhosg@openwrt.org>
Wed, 30 Oct 2013 06:54:53 +0000 (06:54 +0000)
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38596

target/linux/ar71xx/patches-3.10/610-MIPS-ath79-openwrt-machines.patch
target/linux/ar71xx/patches-3.10/620-MIPS-ath79-TL-MR10U-support.patch
target/linux/ar71xx/patches-3.10/621-MIPS-ath79-TL-WR710N-support.patch
target/linux/ar71xx/patches-3.10/622-MIPS-ath79-WNR612v2-support.patch
target/linux/ar71xx/patches-3.10/624-MIPS-ath79-WNR2200-support.patch
target/linux/ar71xx/patches-3.10/625-MIPS-ath79-add-tl-mr13u-support.patch
target/linux/ar71xx/patches-3.10/626-MIPS-ath79-add-MyNet-600-support.patch
target/linux/ar71xx/patches-3.10/627-MIPS-ath79-add-TEW-732BR-support.patch
target/linux/ar71xx/patches-3.10/631-MIPS-ath79-add-BHU-BXU2000n2-A1-support.patch

index f68630e..a19f52c 100644 (file)
  config ATH79_MACH_AP121
        bool "Atheros AP121 reference board"
        select SOC_AR933X
-@@ -11,62 +66,653 @@ config ATH79_MACH_AP121
+@@ -11,62 +66,656 @@ config ATH79_MACH_AP121
        select ATH79_DEV_M25P80
        select ATH79_DEV_USB
        select ATH79_DEV_WMAC
 +
 +config ATH79_MACH_RB95X
 +       bool "MikroTik RouterBOARD 95X support"
-+       select SOC_AR934x
++       select SOC_AR934X
 +       select ATH79_DEV_ETH
 +       select ATH79_DEV_NFC
 +       select ATH79_DEV_WMAC
 +
 +config ATH79_MACH_RB2011
 +      bool "MikroTik RouterBOARD 2011 support"
-+      select SOC_AR934x
++      select SOC_AR934X
 +      select ATH79_DEV_ETH
++      select ATH79_DEV_M25P80
 +      select ATH79_DEV_NFC
++      select ATH79_DEV_USB
 +      select ATH79_DEV_WMAC
 +      select ATH79_ROUTERBOOT
++      select RLE_DECOMPRESS
 +
 +config ATH79_MACH_WNDAP360
 +      bool "NETGEAR WNDAP360 board support"
  
  config ATH79_MACH_UBNT_XM
        bool "Ubiquiti Networks XM/UniFi boards"
-@@ -83,6 +729,34 @@ config ATH79_MACH_UBNT_XM
+@@ -83,6 +732,34 @@ config ATH79_MACH_UBNT_XM
          Say 'Y' here if you want your kernel to support the
          Ubiquiti Networks XM (rev 1.0) board.
  
  endmenu
  
  config SOC_AR71XX
-@@ -132,7 +806,10 @@ config ATH79_DEV_DSA
+@@ -132,7 +809,10 @@ config ATH79_DEV_DSA
  config ATH79_DEV_ETH
        def_bool n
  
        def_bool n
  
  config ATH79_DEV_GPIO_BUTTONS
-@@ -164,4 +841,7 @@ config ATH79_PCI_ATH9K_FIXUP
+@@ -164,4 +844,7 @@ config ATH79_PCI_ATH9K_FIXUP
  config ATH79_ROUTERBOOT
        def_bool n
  
index c3d577a..c9d16b7 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/ath79/Kconfig
 +++ b/arch/mips/ath79/Kconfig
-@@ -576,7 +576,7 @@ config ATH79_MACH_TL_WDR4300
+@@ -579,7 +579,7 @@ config ATH79_MACH_TL_WDR4300
        select ATH79_DEV_WMAC
  
  config ATH79_MACH_TL_WR703N
index 22c812b..022e10c 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/ath79/Kconfig
 +++ b/arch/mips/ath79/Kconfig
-@@ -576,7 +576,7 @@ config ATH79_MACH_TL_WDR4300
+@@ -579,7 +579,7 @@ config ATH79_MACH_TL_WDR4300
        select ATH79_DEV_WMAC
  
  config ATH79_MACH_TL_WR703N
index 24a2d9b..a1ccba9 100644 (file)
@@ -10,7 +10,7 @@
        ATH79_MACH_WRT160NL,            /* Linksys WRT160NL */
 --- a/arch/mips/ath79/Kconfig
 +++ b/arch/mips/ath79/Kconfig
-@@ -419,7 +419,7 @@ config ATH79_MACH_WNR2000
+@@ -422,7 +422,7 @@ config ATH79_MACH_WNR2000
        select ATH79_DEV_WMAC
  
  config ATH79_MACH_WNR2000_V3
index 9f028ac..f009278 100644 (file)
@@ -10,7 +10,7 @@
        ATH79_MACH_WPE72,               /* Compex WPE72 */
 --- a/arch/mips/ath79/Kconfig
 +++ b/arch/mips/ath79/Kconfig
-@@ -437,6 +437,16 @@ config ATH79_MACH_WNR2000_V3
+@@ -440,6 +440,16 @@ config ATH79_MACH_WNR2000_V3
        select ATH79_DEV_LEDS_GPIO
        select ATH79_DEV_M25P80
  
index b960a6d..64ef563 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/ath79/Kconfig
 +++ b/arch/mips/ath79/Kconfig
-@@ -535,6 +535,16 @@ config ATH79_MACH_TL_MR11U
+@@ -538,6 +538,16 @@ config ATH79_MACH_TL_MR11U
        select ATH79_DEV_USB
        select ATH79_DEV_WMAC
  
index 3b9ab6c..1056ff9 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/ath79/Kconfig
 +++ b/arch/mips/ath79/Kconfig
-@@ -759,6 +759,16 @@ config ATH79_MACH_UBNT_XM
+@@ -762,6 +762,16 @@ config ATH79_MACH_UBNT_XM
          Say 'Y' here if you want your kernel to support the
          Ubiquiti Networks XM (rev 1.0) board.
  
index b45c350..5e0f5bb 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/ath79/Kconfig
 +++ b/arch/mips/ath79/Kconfig
-@@ -735,6 +735,15 @@ config ATH79_MACH_TEW_712BR
+@@ -738,6 +738,15 @@ config ATH79_MACH_TEW_712BR
        select ATH79_DEV_WMAC
        select ATH79_NVRAM
  
index 8ebaa28..9123869 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/ath79/Kconfig
 +++ b/arch/mips/ath79/Kconfig
-@@ -826,6 +826,16 @@ config ATH79_MACH_CARAMBOLA2
+@@ -829,6 +829,16 @@ config ATH79_MACH_CARAMBOLA2
        select ATH79_DEV_USB
        select ATH79_DEV_WMAC