aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-08-29 21:10:39 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-08-29 21:10:39 +0000
commit4ff324191fb5b92b0fa62e4d80c4f79f051ec395 (patch)
tree3c94aada79981aa7f8cbf567402837471bd00de7
parentf086c08c76e4a6893b4545b6e87a198efba33a43 (diff)
downloadupstream-4ff324191fb5b92b0fa62e4d80c4f79f051ec395.tar.gz
upstream-4ff324191fb5b92b0fa62e4d80c4f79f051ec395.tar.bz2
upstream-4ff324191fb5b92b0fa62e4d80c4f79f051ec395.zip
ar71xx: select m25p80 support instead of spi support where used by mach files (#17699)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 42331
-rw-r--r--target/linux/ar71xx/patches-3.10/610-MIPS-ath79-openwrt-machines.patch14
-rw-r--r--target/linux/ar71xx/patches-3.10/709-MIPS-ath79-add-NBG6716.patch2
-rw-r--r--target/linux/ar71xx/patches-3.10/718-MIPS-ath79-add-ESR1750-support.patch2
-rw-r--r--target/linux/ar71xx/patches-3.10/719-MIPS-ath79-add-ESR900-support.patch2
-rw-r--r--target/linux/ar71xx/patches-3.14/610-MIPS-ath79-openwrt-machines.patch14
-rw-r--r--target/linux/ar71xx/patches-3.14/709-MIPS-ath79-add-NBG6716.patch2
-rw-r--r--target/linux/ar71xx/patches-3.14/718-MIPS-ath79-add-ESR1750-support.patch2
-rw-r--r--target/linux/ar71xx/patches-3.14/719-MIPS-ath79-add-ESR900-support.patch2
8 files changed, 22 insertions, 18 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 3669f266ec..cba18a88c7 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
@@ -156,7 +156,7 @@
+ select SOC_AR71XX
+ select ATH79_DEV_ETH
+ select ATH79_DEV_GPIO_BUTTONS
-+ select ATH79_DEV_SPI
++ select ATH79_DEV_M25P80
+ select ATH79_DEV_USB
+
+config ATH79_MACH_HORNET_UB
@@ -225,7 +225,7 @@
+ select SOC_QCA955X
+ select ATH79_DEV_GPIO_BUTTONS
+ select ATH79_DEV_LEDS_GPIO
-+ select ATH79_DEV_SPI
++ select ATH79_DEV_M25P80
+ select ATH79_DEV_USB
+ select ATH79_DEV_WMAC
+ help
@@ -238,7 +238,7 @@
+ select ATH79_DEV_GPIO_BUTTONS
+ select ATH79_DEV_LEDS_GPIO
+ select ATH79_DEV_NFC
-+ select ATH79_DEV_SPI
++ select ATH79_DEV_M25P80
+ select ATH79_DEV_USB
+ select ATH79_DEV_WMAC
+ help
@@ -350,7 +350,7 @@
+ select ATH79_DEV_ETH
+ select ATH79_DEV_GPIO_BUTTONS
+ select ATH79_DEV_LEDS_GPIO
-+ select ATH79_DEV_SPI
++ select ATH79_DEV_M25P80
+ select ATH79_DEV_USB
+ select ATH79_DEV_WMAC
+
@@ -700,7 +700,8 @@
select ATH79_DEV_GPIO_BUTTONS
select ATH79_DEV_LEDS_GPIO
- select ATH79_DEV_NFC
- select ATH79_DEV_SPI
+- select ATH79_DEV_SPI
++ select ATH79_DEV_M25P80
select ATH79_DEV_USB
select ATH79_DEV_WMAC
- help
@@ -904,7 +905,8 @@
select ATH79_DEV_ETH
select ATH79_DEV_GPIO_BUTTONS
select ATH79_DEV_LEDS_GPIO
- select ATH79_DEV_SPI
+- select ATH79_DEV_SPI
++ select ATH79_DEV_M25P80
select ATH79_DEV_USB
- help
- Say 'Y' here if you want your kernel to support the
diff --git a/target/linux/ar71xx/patches-3.10/709-MIPS-ath79-add-NBG6716.patch b/target/linux/ar71xx/patches-3.10/709-MIPS-ath79-add-NBG6716.patch
index 5fb93f2301..8e1a94983c 100644
--- a/target/linux/ar71xx/patches-3.10/709-MIPS-ath79-add-NBG6716.patch
+++ b/target/linux/ar71xx/patches-3.10/709-MIPS-ath79-add-NBG6716.patch
@@ -27,7 +27,7 @@
+ select ATH79_DEV_ETH
+ select ATH79_DEV_GPIO_BUTTONS
+ select ATH79_DEV_LEDS_GPIO
-+ select ATH79_DEV_SPI
++ select ATH79_DEV_M25P80
+ select ATH79_DEV_NFC
+ select ATH79_DEV_USB
+ select ATH79_DEV_WMAC
diff --git a/target/linux/ar71xx/patches-3.10/718-MIPS-ath79-add-ESR1750-support.patch b/target/linux/ar71xx/patches-3.10/718-MIPS-ath79-add-ESR1750-support.patch
index 83ae616909..e52a7396da 100644
--- a/target/linux/ar71xx/patches-3.10/718-MIPS-ath79-add-ESR1750-support.patch
+++ b/target/linux/ar71xx/patches-3.10/718-MIPS-ath79-add-ESR1750-support.patch
@@ -10,7 +10,7 @@
+ select ATH79_DEV_ETH
+ select ATH79_DEV_GPIO_BUTTONS
+ select ATH79_DEV_LEDS_GPIO
-+ select ATH79_DEV_SPI
++ select ATH79_DEV_M25P80
+ select ATH79_DEV_USB
+ select ATH79_DEV_WMAC
+
diff --git a/target/linux/ar71xx/patches-3.10/719-MIPS-ath79-add-ESR900-support.patch b/target/linux/ar71xx/patches-3.10/719-MIPS-ath79-add-ESR900-support.patch
index a3c0f8f67e..cbb44727a9 100644
--- a/target/linux/ar71xx/patches-3.10/719-MIPS-ath79-add-ESR900-support.patch
+++ b/target/linux/ar71xx/patches-3.10/719-MIPS-ath79-add-ESR900-support.patch
@@ -20,7 +20,7 @@
+ select ATH79_DEV_ETH
+ select ATH79_DEV_GPIO_BUTTONS
+ select ATH79_DEV_LEDS_GPIO
-+ select ATH79_DEV_SPI
++ select ATH79_DEV_M25P80
+ select ATH79_DEV_USB
+ select ATH79_DEV_WMAC
+
diff --git a/target/linux/ar71xx/patches-3.14/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.14/610-MIPS-ath79-openwrt-machines.patch
index 3669f266ec..cba18a88c7 100644
--- a/target/linux/ar71xx/patches-3.14/610-MIPS-ath79-openwrt-machines.patch
+++ b/target/linux/ar71xx/patches-3.14/610-MIPS-ath79-openwrt-machines.patch
@@ -156,7 +156,7 @@
+ select SOC_AR71XX
+ select ATH79_DEV_ETH
+ select ATH79_DEV_GPIO_BUTTONS
-+ select ATH79_DEV_SPI
++ select ATH79_DEV_M25P80
+ select ATH79_DEV_USB
+
+config ATH79_MACH_HORNET_UB
@@ -225,7 +225,7 @@
+ select SOC_QCA955X
+ select ATH79_DEV_GPIO_BUTTONS
+ select ATH79_DEV_LEDS_GPIO
-+ select ATH79_DEV_SPI
++ select ATH79_DEV_M25P80
+ select ATH79_DEV_USB
+ select ATH79_DEV_WMAC
+ help
@@ -238,7 +238,7 @@
+ select ATH79_DEV_GPIO_BUTTONS
+ select ATH79_DEV_LEDS_GPIO
+ select ATH79_DEV_NFC
-+ select ATH79_DEV_SPI
++ select ATH79_DEV_M25P80
+ select ATH79_DEV_USB
+ select ATH79_DEV_WMAC
+ help
@@ -350,7 +350,7 @@
+ select ATH79_DEV_ETH
+ select ATH79_DEV_GPIO_BUTTONS
+ select ATH79_DEV_LEDS_GPIO
-+ select ATH79_DEV_SPI
++ select ATH79_DEV_M25P80
+ select ATH79_DEV_USB
+ select ATH79_DEV_WMAC
+
@@ -700,7 +700,8 @@
select ATH79_DEV_GPIO_BUTTONS
select ATH79_DEV_LEDS_GPIO
- select ATH79_DEV_NFC
- select ATH79_DEV_SPI
+- select ATH79_DEV_SPI
++ select ATH79_DEV_M25P80
select ATH79_DEV_USB
select ATH79_DEV_WMAC
- help
@@ -904,7 +905,8 @@
select ATH79_DEV_ETH
select ATH79_DEV_GPIO_BUTTONS
select ATH79_DEV_LEDS_GPIO
- select ATH79_DEV_SPI
+- select ATH79_DEV_SPI
++ select ATH79_DEV_M25P80
select ATH79_DEV_USB
- help
- Say 'Y' here if you want your kernel to support the
diff --git a/target/linux/ar71xx/patches-3.14/709-MIPS-ath79-add-NBG6716.patch b/target/linux/ar71xx/patches-3.14/709-MIPS-ath79-add-NBG6716.patch
index 5fb93f2301..8e1a94983c 100644
--- a/target/linux/ar71xx/patches-3.14/709-MIPS-ath79-add-NBG6716.patch
+++ b/target/linux/ar71xx/patches-3.14/709-MIPS-ath79-add-NBG6716.patch
@@ -27,7 +27,7 @@
+ select ATH79_DEV_ETH
+ select ATH79_DEV_GPIO_BUTTONS
+ select ATH79_DEV_LEDS_GPIO
-+ select ATH79_DEV_SPI
++ select ATH79_DEV_M25P80
+ select ATH79_DEV_NFC
+ select ATH79_DEV_USB
+ select ATH79_DEV_WMAC
diff --git a/target/linux/ar71xx/patches-3.14/718-MIPS-ath79-add-ESR1750-support.patch b/target/linux/ar71xx/patches-3.14/718-MIPS-ath79-add-ESR1750-support.patch
index 83ae616909..e52a7396da 100644
--- a/target/linux/ar71xx/patches-3.14/718-MIPS-ath79-add-ESR1750-support.patch
+++ b/target/linux/ar71xx/patches-3.14/718-MIPS-ath79-add-ESR1750-support.patch
@@ -10,7 +10,7 @@
+ select ATH79_DEV_ETH
+ select ATH79_DEV_GPIO_BUTTONS
+ select ATH79_DEV_LEDS_GPIO
-+ select ATH79_DEV_SPI
++ select ATH79_DEV_M25P80
+ select ATH79_DEV_USB
+ select ATH79_DEV_WMAC
+
diff --git a/target/linux/ar71xx/patches-3.14/719-MIPS-ath79-add-ESR900-support.patch b/target/linux/ar71xx/patches-3.14/719-MIPS-ath79-add-ESR900-support.patch
index a3c0f8f67e..cbb44727a9 100644
--- a/target/linux/ar71xx/patches-3.14/719-MIPS-ath79-add-ESR900-support.patch
+++ b/target/linux/ar71xx/patches-3.14/719-MIPS-ath79-add-ESR900-support.patch
@@ -20,7 +20,7 @@
+ select ATH79_DEV_ETH
+ select ATH79_DEV_GPIO_BUTTONS
+ select ATH79_DEV_LEDS_GPIO
-+ select ATH79_DEV_SPI
++ select ATH79_DEV_M25P80
+ select ATH79_DEV_USB
+ select ATH79_DEV_WMAC
+