Changeset 41788


Ignore:
Timestamp:
2014-07-21T20:41:52+02:00 (4 years ago)
Author:
blogic
Message:

ar71xx: split wndr4300 and wndr3700v4 into 2 seperate mips machines

Signed-off-by: John Crispin <blogic@…>

Location:
trunk/target/linux/ar71xx
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/ar71xx/base-files/etc/diag.sh

    r41770 r41788  
    251251        wndap360 | \ 
    252252        wndr3700 | \ 
     253        wndr3700v4 | \ 
    253254        wndr4300 | \ 
    254255        wnr2000 | \ 
  • trunk/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom

    r40411 r41788  
    3939"soc_wmac.eeprom") 
    4040        case $board in 
     41        wndr3700v4 | \ 
    4142        wndr4300) 
    4243                ath9k_eeprom_extract "caldata" 4096 2048 
     
    5152"pci_wmac0.eeprom") 
    5253        case $board in 
     54        wndr3700v4 | \ 
    5355        wndr4300) 
    5456                ath9k_eeprom_extract "caldata" 20480 2048 
  • trunk/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds

    r41770 r41788  
    384384        ;; 
    385385 
     386wndr3700v4 | \ 
    386387wndr4300) 
    387388        ucidef_set_led_netdev "wan" "WAN (green)" "netgear:green:wan" "eth0.2" 
  • trunk/target/linux/ar71xx/base-files/etc/uci-defaults/02_network

    r41767 r41788  
    256256 
    257257dir-835-a1 |\ 
     258wndr3700v4 | \ 
    258259wndr4300) 
    259260        ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2" 
  • trunk/target/linux/ar71xx/base-files/etc/uci-defaults/04_led_migration

    r40473 r41788  
    6060        ;; 
    6161 
     62wndr3700v4 | \ 
    6263wndr4300) 
    6364        migrate_leds ":orange:=:amber:" 
  • trunk/target/linux/ar71xx/base-files/lib/ar71xx.sh

    r41770 r41788  
    668668                wndr3700_board_detect "$machine" 
    669669                ;; 
     670        *"WNDR3700v4") 
     671                name="wndr3700v4" 
     672                ;; 
    670673        *"WNDR4300") 
    671674                name="wndr4300" 
  • trunk/target/linux/ar71xx/base-files/lib/upgrade/platform.sh

    r41772 r41788  
    346346                ;; 
    347347        nbg6716 | \ 
     348        wndr3700v4 | \ 
    348349        wndr4300 ) 
    349350                nand_do_platform_check $board $1 
  • trunk/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c

    r40479 r41788  
    205205} 
    206206 
    207 MIPS_MACHINE(ATH79_MACH_WNDR4300, "WNDR4300", "NETGEAR WNDR3700v4/WNDR4300", 
     207MIPS_MACHINE(ATH79_MACH_WNDR3700_V4, "WNDR3700_V4", "NETGEAR WNDR3700v4", 
    208208             wndr4300_setup); 
     209MIPS_MACHINE(ATH79_MACH_WNDR4300, "WNDR4300", "NETGEAR WNDR4300", 
     210             wndr4300_setup); 
  • trunk/target/linux/ar71xx/image/Makefile

    r41775 r41788  
    12761276 
    12771277ifeq ($(SUBTARGET),nand) 
    1278 $(eval $(call SingleProfile,NetgearNAND,64k,WNDR3700V4,wndr3700v4,WNDR4300,ttyS0,115200,$$(wndr4300_mtdlayout),0x33373033,WNDR3700v4,"",-H 29763948+128+128,wndr4300)) 
     1278$(eval $(call SingleProfile,NetgearNAND,64k,WNDR3700V4,wndr3700v4,WNDR3700_V4,ttyS0,115200,$$(wndr4300_mtdlayout),0x33373033,WNDR3700v4,"",-H 29763948+128+128,wndr4300)) 
    12791279$(eval $(call SingleProfile,NetgearNAND,64k,WNDR4300V1,wndr4300,WNDR4300,ttyS0,115200,$$(wndr4300_mtdlayout),0x33373033,WNDR4300,"",-H 29763948+0+128+128+2x2+3x3,wndr4300)) 
    12801280 
  • trunk/target/linux/ar71xx/patches-3.10/610-MIPS-ath79-openwrt-machines.patch

    r40977 r41788  
    1 --- a/arch/mips/ath79/machtypes.h 
    2 +++ b/arch/mips/ath79/machtypes.h 
    3 @@ -16,22 +16,143 @@ 
     1Index: linux-3.10.49/arch/mips/ath79/machtypes.h 
     2=================================================================== 
     3--- linux-3.10.49.orig/arch/mips/ath79/machtypes.h      2014-07-18 18:32:42.703897643 +0100 
     4+++ linux-3.10.49/arch/mips/ath79/machtypes.h   2014-07-18 18:36:07.635890025 +0100 
     5@@ -16,22 +16,144 @@ 
    46  
    57 enum ath79_mach_type { 
     
    127129+       ATH79_MACH_WNDAP360,            /* NETGEAR WNDAP360 */ 
    128130+       ATH79_MACH_WNDR3700,            /* NETGEAR WNDR3700/WNDR3800/WNDRMAC */ 
    129 +       ATH79_MACH_WNDR4300,            /* NETGEAR WNDR3700v4/WNDR4300 */ 
     131+       ATH79_MACH_WNDR3700_V4,         /* NETGEAR WNDR3700v4 */ 
     132+       ATH79_MACH_WNDR4300,            /* NETGEAR WNDR4300 */ 
    130133+       ATH79_MACH_WNR2000,             /* NETGEAR WNR2000 */ 
    131134+       ATH79_MACH_WNR2000_V3,          /* NETGEAR WNR2000 v3 */ 
     
    145148  
    146149 #endif /* _ATH79_MACHTYPE_H */ 
    147 --- a/arch/mips/ath79/Kconfig 
    148 +++ b/arch/mips/ath79/Kconfig 
    149 @@ -2,6 +2,61 @@ if ATH79 
     150Index: linux-3.10.49/arch/mips/ath79/Kconfig 
     151=================================================================== 
     152--- linux-3.10.49.orig/arch/mips/ath79/Kconfig  2014-07-18 18:32:42.707897643 +0100 
     153+++ linux-3.10.49/arch/mips/ath79/Kconfig       2014-07-18 18:34:56.795892658 +0100 
     154@@ -2,6 +2,61 @@ 
    150155  
    151156 menu "Atheros AR71XX/AR724X/AR913X machine selection" 
     
    209214        bool "Atheros AP121 reference board" 
    210215        select SOC_AR933X 
    211 @@ -9,64 +64,736 @@ config ATH79_MACH_AP121 
     216@@ -9,64 +64,736 @@ 
    212217        select ATH79_DEV_GPIO_BUTTONS 
    213218        select ATH79_DEV_LEDS_GPIO 
     
    972977 config ATH79_MACH_UBNT_XM 
    973978        bool "Ubiquiti Networks XM/UniFi boards" 
    974 @@ -83,6 +810,65 @@ config ATH79_MACH_UBNT_XM 
     979@@ -83,6 +810,65 @@ 
    975980          Say 'Y' here if you want your kernel to support the 
    976981          Ubiquiti Networks XM (rev 1.0) board. 
     
    10381043  
    10391044 config SOC_AR71XX 
    1040 @@ -132,7 +918,10 @@ config ATH79_DEV_DSA 
     1045@@ -132,7 +918,10 @@ 
    10411046 config ATH79_DEV_ETH 
    10421047        def_bool n 
     
    10501055  
    10511056 config ATH79_DEV_GPIO_BUTTONS 
    1052 @@ -164,4 +953,7 @@ config ATH79_PCI_ATH9K_FIXUP 
     1057@@ -164,4 +953,7 @@ 
    10531058 config ATH79_ROUTERBOOT 
    10541059        def_bool n 
     
    10581063+ 
    10591064 endif 
    1060 --- a/arch/mips/ath79/Makefile 
    1061 +++ b/arch/mips/ath79/Makefile 
    1062 @@ -38,9 +38,90 @@ obj-$(CONFIG_ATH79_ROUTERBOOT)               += route 
     1065Index: linux-3.10.49/arch/mips/ath79/Makefile 
     1066=================================================================== 
     1067--- linux-3.10.49.orig/arch/mips/ath79/Makefile 2014-07-18 18:32:42.567897648 +0100 
     1068+++ linux-3.10.49/arch/mips/ath79/Makefile      2014-07-18 18:34:56.795892658 +0100 
     1069@@ -38,9 +38,90 @@ 
    10631070 # 
    10641071 # Machines 
     
    11511158+obj-$(CONFIG_ATH79_MACH_ZCN_1523H)     += mach-zcn-1523h.o 
    11521159+obj-$(CONFIG_ATH79_MACH_CARAMBOLA2)    += mach-carambola2.o 
    1153 --- a/arch/mips/ath79/prom.c 
    1154 +++ b/arch/mips/ath79/prom.c 
    1155 @@ -180,6 +180,12 @@ void __init prom_init(void) 
     1160Index: linux-3.10.49/arch/mips/ath79/prom.c 
     1161=================================================================== 
     1162--- linux-3.10.49.orig/arch/mips/ath79/prom.c   2014-07-18 18:32:42.351897656 +0100 
     1163+++ linux-3.10.49/arch/mips/ath79/prom.c        2014-07-18 18:32:42.723897642 +0100 
     1164@@ -180,6 +180,12 @@ 
    11561165                        ath79_prom_append_cmdline("board", env); 
    11571166                } 
Note: See TracChangeset for help on using the changeset viewer.