Changeset 27814


Ignore:
Timestamp:
2011-07-28T13:57:51+02:00 (7 years ago)
Author:
jogo
Message:

ar71xx: merge WZR-HP-G301NH support into WZR-HP-G300NH

Now that we can use a generic name for the switch there is no need for a
separate image for the WZR-HP-G301NH.
Update the default network config and remove the extra image.

Location:
trunk/target/linux/ar71xx
Files:
1 deleted
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/ar71xx/base-files/etc/defconfig/wzr-hp-g300nh/network

    r24215 r27814  
    1717 
    1818config switch 
    19         option name     rtl8366s 
     19        option name     switch0 
    2020        option reset    1 
    2121        option enable_vlan 1 
    2222 
    2323config switch_vlan 
    24         option device   rtl8366s 
     24        option device   switch0 
    2525        option vlan     1 
    2626        option ports    "0 1 2 3 5t" 
  • trunk/target/linux/ar71xx/base-files/etc/diag.sh

    r27343 r27814  
    124124                status_led="wrt160nl:blue:wps" 
    125125                ;; 
    126         wzr-hp-g300nh | wzr-hp-g301nh) 
     126        wzr-hp-g300nh) 
    127127                status_led="wzr-hp-g300nh:green:router" 
    128128                ;; 
  • trunk/target/linux/ar71xx/base-files/etc/uci-defaults/wzr-hp-g300nh

    r27042 r27814  
    3333} 
    3434 
    35 if [ "${board}" == "wzr-hp-g300nh" -o "${board}" == "wzr-hp-g301nh" ]; then 
     35if [ "${board}" == "wzr-hp-g300nh" ]; then 
    3636        wzrhpg300nh_set_leds 
    3737fi 
  • trunk/target/linux/ar71xx/base-files/lib/ar71xx.sh

    r27283 r27814  
    161161                name="wzr-hp-g300nh" 
    162162                ;; 
    163         *WZR-HP-G301NH) 
    164                 name="wzr-hp-g301nh" 
    165                 ;; 
    166163        *ZCN-1523H-2) 
    167164                name="zcn-1523h-2" 
  • trunk/target/linux/ar71xx/base-files/lib/upgrade/platform.sh

    r27434 r27814  
    7777                return 0 
    7878                ;; 
    79         ap81 | ap83 | dir-600-a1 | dir-615-c1 | dir-825-b1 | mzk-w04nu | mzk-w300nh | tew-632brp | wrt400n | bullet-m | nanostation-m | rocket-m | wzr-hp-g300nh | wzr-hp-g301nh | wzr-hp-ag300h | nbg460n_550n_550nh | unifi ) 
     79        ap81 | ap83 | dir-600-a1 | dir-615-c1 | dir-825-b1 | mzk-w04nu | mzk-w300nh | tew-632brp | wrt400n | bullet-m | nanostation-m | rocket-m | wzr-hp-g300nh | wzr-hp-ag300h | nbg460n_550n_550nh | unifi ) 
    8080                [ "$magic" != "2705" ] && { 
    8181                        echo "Invalid image type." 
  • trunk/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-g300nh.c

    r27756 r27814  
    227227}; 
    228228 
    229 static struct platform_device wzrhpg301nh_rtl8366rb_device = { 
     229static struct platform_device wzrhpg300nh_rtl8366rb_device = { 
    230230        .name           = RTL8366RB_DRIVER_NAME, 
    231231        .id             = -1, 
     
    235235}; 
    236236 
    237 static void __init wzrhpg30xnh_setup(void) 
     237static void __init wzrhpg300nh_setup(void) 
    238238{ 
    239239        u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000); 
     
    249249        if (hasrtl8366rb) { 
    250250                ar71xx_eth0_pll_data.pll_1000 = 0x1f000000; 
    251                 ar71xx_eth0_data.mii_bus_dev = &wzrhpg301nh_rtl8366rb_device.dev; 
     251                ar71xx_eth0_data.mii_bus_dev = &wzrhpg300nh_rtl8366rb_device.dev; 
    252252                ar71xx_eth1_pll_data.pll_1000 = 0x100; 
    253                 ar71xx_eth1_data.mii_bus_dev = &wzrhpg301nh_rtl8366rb_device.dev; 
     253                ar71xx_eth1_data.mii_bus_dev = &wzrhpg300nh_rtl8366rb_device.dev; 
    254254        } else { 
    255255                ar71xx_eth0_pll_data.pll_1000 = 0x1e000100; 
     
    276276 
    277277        if (hasrtl8366rb) 
    278                 platform_device_register(&wzrhpg301nh_rtl8366rb_device); 
     278                platform_device_register(&wzrhpg300nh_rtl8366rb_device); 
    279279        else 
    280280                platform_device_register(&wzrhpg300nh_rtl8366s_device); 
     
    290290 
    291291MIPS_MACHINE(AR71XX_MACH_WZR_HP_G300NH, "WZR-HP-G300NH", 
    292              "Buffalo WZR-HP-G300NH", wzrhpg30xnh_setup); 
    293  
    294 MIPS_MACHINE(AR71XX_MACH_WZR_HP_G301NH, "WZR-HP-G301NH", 
    295              "Buffalo WZR-HP-G301NH", wzrhpg30xnh_setup); 
     292             "Buffalo WZR-HP-G300NH", wzrhpg300nh_setup); 
  • trunk/target/linux/ar71xx/files/arch/mips/ar71xx/machtype.h

    r27075 r27814  
    6565        AR71XX_MACH_WZR_HP_AG300H, /* Buffalo WZR-HP-AG300H */ 
    6666        AR71XX_MACH_WZR_HP_G300NH, /* Buffalo WZR-HP-G300NH */ 
    67         AR71XX_MACH_WZR_HP_G301NH, /* Buffalo WZR-HP-G301NH */ 
    6867        AR71XX_MACH_EAP7660D,   /* Senao EAP7660D */ 
    6968        AR71XX_MACH_ZCN_1523H_2, /* Zcomax ZCN-1523H-2-xx */ 
  • trunk/target/linux/ar71xx/generic/profiles/buffalo.mk

    r27076 r27814  
    66# 
    77 
    8 define Profile/WZRHPG30XNH 
    9         NAME:=Buffalo WZR-HP-G30XNH 
     8define Profile/WZRHPG300NH 
     9        NAME:=Buffalo WZR-HP-G300NH 
    1010        PACKAGES:=kmod-ath9k wpad-mini kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev 
    1111endef 
    1212 
    13 define Profile/WZRHPG30XNH/Description 
     13define Profile/WZRHPG300NH/Description 
    1414        Package set optimized for the Buffalo WZR-HP-G300NH and WZR-HP-G301NH 
    1515endef 
    1616 
    17 $(eval $(call Profile,WZRHPG30XNH)) 
     17$(eval $(call Profile,WZRHPG300NH)) 
    1818 
    1919define Profile/WZRHPAG300H 
  • trunk/target/linux/ar71xx/image/Makefile

    r27523 r27814  
    778778 
    779779wzrhpg300nh_cmdline=board=WZR-HP-G300NH console=ttyS0,115200 
    780 wzrhpg301nh_cmdline=board=WZR-HP-G301NH console=ttyS0,115200 
    781 define Image/Build/Profile/WZRHPG30XNH 
     780define Image/Build/Profile/WZRHPG300NH 
    782781        $(call Image/Build/Template/$(fs_128k)/$(1),WZRHPG30XNH,wzr-hp-g300nh,$(wzrhpg300nh_cmdline),WZR-HP-G300NH) 
    783         $(call Image/Build/Template/$(fs_128k)/$(1),WZRHPG30XNH,wzr-hp-g301nh,$(wzrhpg301nh_cmdline),WZR-HP-G301NH) 
    784782endef 
    785783 
     
    841839        $(call Image/Build/Profile/WRT400N,$(1)) 
    842840        $(call Image/Build/Profile/WRT160NL,$(1)) 
    843         $(call Image/Build/Profile/WZRHPG30XNH,$(1)) 
     841        $(call Image/Build/Profile/WZRHPG300NH,$(1)) 
    844842        $(call Image/Build/Profile/WZRHPAG300H,$(1)) 
    845843        $(call Image/Build/Profile/ZCN1523H28,$(1)) 
Note: See TracChangeset for help on using the changeset viewer.