Changeset 42508


Ignore:
Timestamp:
2014-09-12T08:53:48+02:00 (3 years ago)
Author:
blogic
Message:

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@…>

Location:
trunk/target/linux/atheros
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/atheros/config-3.14

    r42505 r42508  
    1212CONFIG_ARCH_SUSPEND_POSSIBLE=y 
    1313CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y 
    14 CONFIG_ATHEROS_AR2315=y 
    1514CONFIG_ATHEROS_AR231X=y 
    16 CONFIG_ATHEROS_AR5312=y 
    1715CONFIG_CC_OPTIMIZE_FOR_SIZE=y 
    1816CONFIG_CEVT_R4K=y 
     
    125123CONFIG_SERIAL_8250_NR_UARTS=1 
    126124CONFIG_SERIAL_8250_RUNTIME_UARTS=1 
     125CONFIG_SOC_AR2315=y 
     126CONFIG_SOC_AR5312=y 
    127127# CONFIG_SWAP is not set 
    128128CONFIG_SWCONFIG=y 
  • trunk/target/linux/atheros/patches-3.14/100-board.patch

    r42507 r42508  
    5151+++ b/arch/mips/ar231x/Kconfig 
    5252@@ -0,0 +1,9 @@ 
    53 +config ATHEROS_AR5312 
     53+config SOC_AR5312 
    5454+       bool "Atheros 5312/2312+ support" 
    5555+       depends on ATHEROS_AR231X 
    5656+       default y 
    5757+ 
    58 +config ATHEROS_AR2315 
     58+config SOC_AR2315 
    5959+       bool "Atheros 2315+ support" 
    6060+       depends on ATHEROS_AR231X 
     
    7474+ 
    7575+obj-y += board.o prom.o devices.o 
    76 +obj-$(CONFIG_ATHEROS_AR5312) += ar5312.o 
    77 +obj-$(CONFIG_ATHEROS_AR2315) += ar2315.o 
     76+obj-$(CONFIG_SOC_AR5312) += ar5312.o 
     77+obj-$(CONFIG_SOC_AR2315) += ar2315.o 
    7878--- /dev/null 
    7979+++ b/arch/mips/ar231x/board.c 
     
    477477+#define cpu_has_ejtag                  1 
    478478+ 
    479 +#if !defined(CONFIG_ATHEROS_AR5312) 
     479+#if !defined(CONFIG_SOC_AR5312) 
    480480+#  define cpu_has_llsc                 1 
    481481+#else 
     
    501501+#define cpu_has_mips32r1               1 
    502502+ 
    503 +#if !defined(CONFIG_ATHEROS_AR5312) 
     503+#if !defined(CONFIG_SOC_AR5312) 
    504504+#  define cpu_has_mips32r2             1 
    505505+#endif 
     
    26662666+#define __AR2315_H 
    26672667+ 
    2668 +#ifdef CONFIG_ATHEROS_AR2315 
     2668+#ifdef CONFIG_SOC_AR2315 
    26692669+ 
    26702670+void ar2315_irq_init(void); 
     
    27062706+#define __AR5312_H 
    27072707+ 
    2708 +#ifdef CONFIG_ATHEROS_AR5312 
     2708+#ifdef CONFIG_SOC_AR5312 
    27092709+ 
    27102710+void ar5312_irq_init(void); 
  • trunk/target/linux/atheros/patches-3.14/101-early-printk-support.patch

    r41995 r42508  
    5757+obj-$(CONFIG_EARLY_PRINTK) += early_printk.o 
    5858+ 
    59  obj-$(CONFIG_ATHEROS_AR5312) += ar5312.o 
    60  obj-$(CONFIG_ATHEROS_AR2315) += ar2315.o 
     59 obj-$(CONFIG_SOC_AR5312) += ar5312.o 
     60 obj-$(CONFIG_SOC_AR2315) += ar2315.o 
    6161--- a/arch/mips/Kconfig 
    6262+++ b/arch/mips/Kconfig 
  • trunk/target/linux/atheros/patches-3.14/105-ar2315_pci.patch

    r42507 r42508  
    359359--- a/arch/mips/ar231x/Kconfig 
    360360+++ b/arch/mips/ar231x/Kconfig 
    361 @@ -7,3 +7,10 @@ config ATHEROS_AR2315 
     361@@ -7,3 +7,10 @@ config SOC_AR2315 
    362362        bool "Atheros 2315+ support" 
    363363        depends on ATHEROS_AR231X 
     
    366366+config PCI_AR2315 
    367367+       bool "AR2315 PCI controller support" 
    368 +       depends on ATHEROS_AR2315 
     368+       depends on SOC_AR2315 
    369369+       select HW_HAS_PCI 
    370370+       select PCI 
  • trunk/target/linux/atheros/patches-3.14/120-spiflash.patch

    r42496 r42508  
    77+config MTD_AR2315 
    88+       tristate "Atheros AR2315+ SPI Flash support" 
    9 +       depends on ATHEROS_AR2315 
     9+       depends on SOC_AR2315 
    1010+ 
    1111 config MTD_SLRAM 
Note: See TracChangeset for help on using the changeset viewer.