diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-10-30 06:54:53 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-10-30 06:54:53 +0000 |
| commit | b508a6dc5cae41a4dad9725d85115b890e75e4ac (patch) | |
| tree | 31ef615750ecb74131c7700c1ef56aeb286d4252 | |
| parent | 9e1b2331a3c7a991dfd40ac3005e9ea11cac57d4 (diff) | |
| download | upstream-b508a6dc5cae41a4dad9725d85115b890e75e4ac.tar.gz upstream-b508a6dc5cae41a4dad9725d85115b890e75e4ac.tar.bz2 upstream-b508a6dc5cae41a4dad9725d85115b890e75e4ac.zip | |
ar71xx: fix Kconfig symbol selection for RB95x/RB2011
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38596 3c298f89-4303-0410-b956-a3cf2f4a3e73
9 files changed, 17 insertions, 14 deletions
diff --git a/target/linux/ar71xx/patches-3.10/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.10/610-MIPS-ath79-openwrt-machines.patch index f68630e638..a19f52c318 100644 --- a/target/linux/ar71xx/patches-3.10/610-MIPS-ath79-openwrt-machines.patch +++ b/target/linux/ar71xx/patches-3.10/610-MIPS-ath79-openwrt-machines.patch @@ -190,7 +190,7 @@ 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 @@ -494,7 +494,7 @@ + +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 @@ -504,11 +504,14 @@ + +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" @@ -870,7 +873,7 @@ 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. @@ -905,7 +908,7 @@ 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 @@ -917,7 +920,7 @@ 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 diff --git a/target/linux/ar71xx/patches-3.10/620-MIPS-ath79-TL-MR10U-support.patch b/target/linux/ar71xx/patches-3.10/620-MIPS-ath79-TL-MR10U-support.patch index c3d577a8f7..c9d16b7ea8 100644 --- a/target/linux/ar71xx/patches-3.10/620-MIPS-ath79-TL-MR10U-support.patch +++ b/target/linux/ar71xx/patches-3.10/620-MIPS-ath79-TL-MR10U-support.patch @@ -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 diff --git a/target/linux/ar71xx/patches-3.10/621-MIPS-ath79-TL-WR710N-support.patch b/target/linux/ar71xx/patches-3.10/621-MIPS-ath79-TL-WR710N-support.patch index 22c812b399..022e10c79b 100644 --- a/target/linux/ar71xx/patches-3.10/621-MIPS-ath79-TL-WR710N-support.patch +++ b/target/linux/ar71xx/patches-3.10/621-MIPS-ath79-TL-WR710N-support.patch @@ -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 diff --git a/target/linux/ar71xx/patches-3.10/622-MIPS-ath79-WNR612v2-support.patch b/target/linux/ar71xx/patches-3.10/622-MIPS-ath79-WNR612v2-support.patch index 24a2d9bae7..a1ccba9d62 100644 --- a/target/linux/ar71xx/patches-3.10/622-MIPS-ath79-WNR612v2-support.patch +++ b/target/linux/ar71xx/patches-3.10/622-MIPS-ath79-WNR612v2-support.patch @@ -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 diff --git a/target/linux/ar71xx/patches-3.10/624-MIPS-ath79-WNR2200-support.patch b/target/linux/ar71xx/patches-3.10/624-MIPS-ath79-WNR2200-support.patch index 9f028acd47..f009278708 100644 --- a/target/linux/ar71xx/patches-3.10/624-MIPS-ath79-WNR2200-support.patch +++ b/target/linux/ar71xx/patches-3.10/624-MIPS-ath79-WNR2200-support.patch @@ -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 diff --git a/target/linux/ar71xx/patches-3.10/625-MIPS-ath79-add-tl-mr13u-support.patch b/target/linux/ar71xx/patches-3.10/625-MIPS-ath79-add-tl-mr13u-support.patch index b960a6dd27..64ef563050 100644 --- a/target/linux/ar71xx/patches-3.10/625-MIPS-ath79-add-tl-mr13u-support.patch +++ b/target/linux/ar71xx/patches-3.10/625-MIPS-ath79-add-tl-mr13u-support.patch @@ -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 diff --git a/target/linux/ar71xx/patches-3.10/626-MIPS-ath79-add-MyNet-600-support.patch b/target/linux/ar71xx/patches-3.10/626-MIPS-ath79-add-MyNet-600-support.patch index 3b9ab6cb88..1056ff998f 100644 --- a/target/linux/ar71xx/patches-3.10/626-MIPS-ath79-add-MyNet-600-support.patch +++ b/target/linux/ar71xx/patches-3.10/626-MIPS-ath79-add-MyNet-600-support.patch @@ -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. diff --git a/target/linux/ar71xx/patches-3.10/627-MIPS-ath79-add-TEW-732BR-support.patch b/target/linux/ar71xx/patches-3.10/627-MIPS-ath79-add-TEW-732BR-support.patch index b45c350d4f..5e0f5bbda1 100644 --- a/target/linux/ar71xx/patches-3.10/627-MIPS-ath79-add-TEW-732BR-support.patch +++ b/target/linux/ar71xx/patches-3.10/627-MIPS-ath79-add-TEW-732BR-support.patch @@ -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 diff --git a/target/linux/ar71xx/patches-3.10/631-MIPS-ath79-add-BHU-BXU2000n2-A1-support.patch b/target/linux/ar71xx/patches-3.10/631-MIPS-ath79-add-BHU-BXU2000n2-A1-support.patch index 8ebaa28805..912386996b 100644 --- a/target/linux/ar71xx/patches-3.10/631-MIPS-ath79-add-BHU-BXU2000n2-A1-support.patch +++ b/target/linux/ar71xx/patches-3.10/631-MIPS-ath79-add-BHU-BXU2000n2-A1-support.patch @@ -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 |