hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42508 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
John Crispin 2014-09-12 06:53:48 +00:00
parent c0d10e6028
commit 2dfb3a4f2a
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/atheros/config-3.14
View File

@ -11,9 +11,7 @@ CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
CONFIG_ARCH_REQUIRE_GPIOLIB=y CONFIG_ARCH_REQUIRE_GPIOLIB=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
CONFIG_ATHEROS_AR2315=y
CONFIG_ATHEROS_AR231X=y CONFIG_ATHEROS_AR231X=y
CONFIG_ATHEROS_AR5312=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_CEVT_R4K=y CONFIG_CEVT_R4K=y
CONFIG_CLONE_BACKWARDS=y CONFIG_CLONE_BACKWARDS=y
@ -124,6 +122,8 @@ CONFIG_PHYLIB=y
# CONFIG_SCSI_DMA is not set # CONFIG_SCSI_DMA is not set
CONFIG_SERIAL_8250_NR_UARTS=1 CONFIG_SERIAL_8250_NR_UARTS=1
CONFIG_SERIAL_8250_RUNTIME_UARTS=1 CONFIG_SERIAL_8250_RUNTIME_UARTS=1
CONFIG_SOC_AR2315=y
CONFIG_SOC_AR5312=y
# CONFIG_SWAP is not set # CONFIG_SWAP is not set
CONFIG_SWCONFIG=y CONFIG_SWCONFIG=y
CONFIG_SYS_HAS_CPU_MIPS32_R1=y CONFIG_SYS_HAS_CPU_MIPS32_R1=y

16
target/linux/atheros/patches-3.14/100-board.patch
View File

@ -50,12 +50,12 @@
--- /dev/null --- /dev/null
+++ b/arch/mips/ar231x/Kconfig +++ b/arch/mips/ar231x/Kconfig
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
+config ATHEROS_AR5312 +config SOC_AR5312
+ bool "Atheros 5312/2312+ support" + bool "Atheros 5312/2312+ support"
+ depends on ATHEROS_AR231X + depends on ATHEROS_AR231X
+ default y + default y
+ +
+config ATHEROS_AR2315 +config SOC_AR2315
+ bool "Atheros 2315+ support" + bool "Atheros 2315+ support"
+ depends on ATHEROS_AR231X + depends on ATHEROS_AR231X
+ default y + default y
@ -73,8 +73,8 @@
+# +#
+ +
+obj-y += board.o prom.o devices.o +obj-y += board.o prom.o devices.o
+obj-$(CONFIG_ATHEROS_AR5312) += ar5312.o +obj-$(CONFIG_SOC_AR5312) += ar5312.o
+obj-$(CONFIG_ATHEROS_AR2315) += ar2315.o +obj-$(CONFIG_SOC_AR2315) += ar2315.o
--- /dev/null --- /dev/null
+++ b/arch/mips/ar231x/board.c +++ b/arch/mips/ar231x/board.c
@@ -0,0 +1,229 @@ @@ -0,0 +1,229 @@
@ -476,7 +476,7 @@
+/* #define cpu_has_mcheck ? */ +/* #define cpu_has_mcheck ? */
+#define cpu_has_ejtag 1 +#define cpu_has_ejtag 1
+ +
+#if !defined(CONFIG_ATHEROS_AR5312) +#if !defined(CONFIG_SOC_AR5312)
+# define cpu_has_llsc 1 +# define cpu_has_llsc 1
+#else +#else
+/* +/*
@ -500,7 +500,7 @@
+ +
+#define cpu_has_mips32r1 1 +#define cpu_has_mips32r1 1
+ +
+#if !defined(CONFIG_ATHEROS_AR5312) +#if !defined(CONFIG_SOC_AR5312)
+# define cpu_has_mips32r2 1 +# define cpu_has_mips32r2 1
+#endif +#endif
+ +
@ -2665,7 +2665,7 @@
+#ifndef __AR2315_H +#ifndef __AR2315_H
+#define __AR2315_H +#define __AR2315_H
+ +
+#ifdef CONFIG_ATHEROS_AR2315 +#ifdef CONFIG_SOC_AR2315
+ +
+void ar2315_irq_init(void); +void ar2315_irq_init(void);
+int ar2315_init_devices(void); +int ar2315_init_devices(void);
@ -2705,7 +2705,7 @@
+#ifndef __AR5312_H +#ifndef __AR5312_H
+#define __AR5312_H +#define __AR5312_H
+ +
+#ifdef CONFIG_ATHEROS_AR5312 +#ifdef CONFIG_SOC_AR5312
+ +
+void ar5312_irq_init(void); +void ar5312_irq_init(void);
+int ar5312_init_devices(void); +int ar5312_init_devices(void);

4
target/linux/atheros/patches-3.14/101-early-printk-support.patch
View File

@ -56,8 +56,8 @@
+ +
+obj-$(CONFIG_EARLY_PRINTK) += early_printk.o +obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
+ +
obj-$(CONFIG_ATHEROS_AR5312) += ar5312.o obj-$(CONFIG_SOC_AR5312) += ar5312.o
obj-$(CONFIG_ATHEROS_AR2315) += ar2315.o obj-$(CONFIG_SOC_AR2315) += ar2315.o
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -154,6 +154,7 @@ config ATHEROS_AR231X @@ -154,6 +154,7 @@ config ATHEROS_AR231X

4
target/linux/atheros/patches-3.14/105-ar2315_pci.patch
View File

@ -358,14 +358,14 @@
+} +}
--- a/arch/mips/ar231x/Kconfig --- a/arch/mips/ar231x/Kconfig
+++ b/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" bool "Atheros 2315+ support"
depends on ATHEROS_AR231X depends on ATHEROS_AR231X
default y default y
+ +
+config PCI_AR2315 +config PCI_AR2315
+ bool "AR2315 PCI controller support" + bool "AR2315 PCI controller support"
+ depends on ATHEROS_AR2315 + depends on SOC_AR2315
+ select HW_HAS_PCI + select HW_HAS_PCI
+ select PCI + select PCI
+ default y + default y

2
target/linux/atheros/patches-3.14/120-spiflash.patch
View File

@ -6,7 +6,7 @@
+config MTD_AR2315 +config MTD_AR2315
+ tristate "Atheros AR2315+ SPI Flash support" + tristate "Atheros AR2315+ SPI Flash support"
+ depends on ATHEROS_AR2315 + depends on SOC_AR2315
+ +
config MTD_SLRAM config MTD_SLRAM
tristate "Uncached system RAM" tristate "Uncached system RAM"