aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-09-12 06:53:48 +0000
committerJohn Crispin <john@openwrt.org>2014-09-12 06:53:48 +0000
commit6f874d84d503e235518a6e15873a174478ebf4b2 (patch)
treea9d6e1aa9d559ef7040392eee86d30d23ef2cd96 /target/linux
parent413736e5f8d313e77ede599591fc89ef7ec3cbf4 (diff)
downloadupstream-6f874d84d503e235518a6e15873a174478ebf4b2.tar.gz
upstream-6f874d84d503e235518a6e15873a174478ebf4b2.tar.bz2
upstream-6f874d84d503e235518a6e15873a174478ebf4b2.zip
atheros: rename SoCs config symbols
Rename config symbols to be consistent with other SoCs config symbols supported by MIPS arch. Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com> SVN-Revision: 42508
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/atheros/config-3.144
-rw-r--r--target/linux/atheros/patches-3.14/100-board.patch16
-rw-r--r--target/linux/atheros/patches-3.14/101-early-printk-support.patch4
-rw-r--r--target/linux/atheros/patches-3.14/105-ar2315_pci.patch4
-rw-r--r--target/linux/atheros/patches-3.14/120-spiflash.patch2
5 files changed, 15 insertions, 15 deletions
diff --git a/target/linux/atheros/config-3.14 b/target/linux/atheros/config-3.14
index a0bb6e9fb0..3f7c76ac25 100644
--- a/target/linux/atheros/config-3.14
+++ b/target/linux/atheros/config-3.14
@@ -11,9 +11,7 @@ CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
CONFIG_ARCH_REQUIRE_GPIOLIB=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_ATHEROS_AR2315=y
CONFIG_ATHEROS_AR231X=y
-CONFIG_ATHEROS_AR5312=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_CEVT_R4K=y
CONFIG_CLONE_BACKWARDS=y
@@ -124,6 +122,8 @@ CONFIG_PHYLIB=y
# CONFIG_SCSI_DMA is not set
CONFIG_SERIAL_8250_NR_UARTS=1
CONFIG_SERIAL_8250_RUNTIME_UARTS=1
+CONFIG_SOC_AR2315=y
+CONFIG_SOC_AR5312=y
# CONFIG_SWAP is not set
CONFIG_SWCONFIG=y
CONFIG_SYS_HAS_CPU_MIPS32_R1=y
diff --git a/target/linux/atheros/patches-3.14/100-board.patch b/target/linux/atheros/patches-3.14/100-board.patch
index efbc241a17..7097cfddd3 100644
--- a/target/linux/atheros/patches-3.14/100-board.patch
+++ b/target/linux/atheros/patches-3.14/100-board.patch
@@ -50,12 +50,12 @@
--- /dev/null
+++ b/arch/mips/ar231x/Kconfig
@@ -0,0 +1,9 @@
-+config ATHEROS_AR5312
++config SOC_AR5312
+ bool "Atheros 5312/2312+ support"
+ depends on ATHEROS_AR231X
+ default y
+
-+config ATHEROS_AR2315
++config SOC_AR2315
+ bool "Atheros 2315+ support"
+ depends on ATHEROS_AR231X
+ default y
@@ -73,8 +73,8 @@
+#
+
+obj-y += board.o prom.o devices.o
-+obj-$(CONFIG_ATHEROS_AR5312) += ar5312.o
-+obj-$(CONFIG_ATHEROS_AR2315) += ar2315.o
++obj-$(CONFIG_SOC_AR5312) += ar5312.o
++obj-$(CONFIG_SOC_AR2315) += ar2315.o
--- /dev/null
+++ b/arch/mips/ar231x/board.c
@@ -0,0 +1,229 @@
@@ -476,7 +476,7 @@
+/* #define cpu_has_mcheck ? */
+#define cpu_has_ejtag 1
+
-+#if !defined(CONFIG_ATHEROS_AR5312)
++#if !defined(CONFIG_SOC_AR5312)
+# define cpu_has_llsc 1
+#else
+/*
@@ -500,7 +500,7 @@
+
+#define cpu_has_mips32r1 1
+
-+#if !defined(CONFIG_ATHEROS_AR5312)
++#if !defined(CONFIG_SOC_AR5312)
+# define cpu_has_mips32r2 1
+#endif
+
@@ -2665,7 +2665,7 @@
+#ifndef __AR2315_H
+#define __AR2315_H
+
-+#ifdef CONFIG_ATHEROS_AR2315
++#ifdef CONFIG_SOC_AR2315
+
+void ar2315_irq_init(void);
+int ar2315_init_devices(void);
@@ -2705,7 +2705,7 @@
+#ifndef __AR5312_H
+#define __AR5312_H
+
-+#ifdef CONFIG_ATHEROS_AR5312
++#ifdef CONFIG_SOC_AR5312
+
+void ar5312_irq_init(void);
+int ar5312_init_devices(void);
diff --git a/target/linux/atheros/patches-3.14/101-early-printk-support.patch b/target/linux/atheros/patches-3.14/101-early-printk-support.patch
index d33c3f1944..032ffe7cbc 100644
--- a/target/linux/atheros/patches-3.14/101-early-printk-support.patch
+++ b/target/linux/atheros/patches-3.14/101-early-printk-support.patch
@@ -56,8 +56,8 @@
+
+obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
+
- obj-$(CONFIG_ATHEROS_AR5312) += ar5312.o
- obj-$(CONFIG_ATHEROS_AR2315) += ar2315.o
+ obj-$(CONFIG_SOC_AR5312) += ar5312.o
+ obj-$(CONFIG_SOC_AR2315) += ar2315.o
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -154,6 +154,7 @@ config ATHEROS_AR231X
diff --git a/target/linux/atheros/patches-3.14/105-ar2315_pci.patch b/target/linux/atheros/patches-3.14/105-ar2315_pci.patch
index 2b7f5ed70e..7cbe629a08 100644
--- a/target/linux/atheros/patches-3.14/105-ar2315_pci.patch
+++ b/target/linux/atheros/patches-3.14/105-ar2315_pci.patch
@@ -358,14 +358,14 @@
+}
--- a/arch/mips/ar231x/Kconfig
+++ b/arch/mips/ar231x/Kconfig
-@@ -7,3 +7,10 @@ config ATHEROS_AR2315
+@@ -7,3 +7,10 @@ config SOC_AR2315
bool "Atheros 2315+ support"
depends on ATHEROS_AR231X
default y
+
+config PCI_AR2315
+ bool "AR2315 PCI controller support"
-+ depends on ATHEROS_AR2315
++ depends on SOC_AR2315
+ select HW_HAS_PCI
+ select PCI
+ default y
diff --git a/target/linux/atheros/patches-3.14/120-spiflash.patch b/target/linux/atheros/patches-3.14/120-spiflash.patch
index 94f8e401a0..fb62169658 100644
--- a/target/linux/atheros/patches-3.14/120-spiflash.patch
+++ b/target/linux/atheros/patches-3.14/120-spiflash.patch
@@ -6,7 +6,7 @@
+config MTD_AR2315
+ tristate "Atheros AR2315+ SPI Flash support"
-+ depends on ATHEROS_AR2315
++ depends on SOC_AR2315
+
config MTD_SLRAM
tristate "Uncached system RAM"