ar71xx: add support for Buffalo WZR 600DHP
authorLuka Perkov <luka@openwrt.org>
Fri, 1 Mar 2013 13:46:01 +0000 (13:46 +0000)
committerLuka Perkov <luka@openwrt.org>
Fri, 1 Mar 2013 13:46:01 +0000 (13:46 +0000)
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 35840

21 files changed:
package/boot/uboot-envtools/files/ar71xx
target/linux/ar71xx/base-files/etc/diag.sh
target/linux/ar71xx/base-files/etc/hotplug.d/net/10-ar922x-led-fix
target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
target/linux/ar71xx/base-files/etc/uci-defaults/02_network
target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration
target/linux/ar71xx/base-files/lib/ar71xx.sh
target/linux/ar71xx/base-files/lib/upgrade/platform.sh
target/linux/ar71xx/config-3.7
target/linux/ar71xx/config-3.8
target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c
target/linux/ar71xx/generic/profiles/buffalo.mk
target/linux/ar71xx/image/Makefile
target/linux/ar71xx/patches-3.7/610-MIPS-ath79-openwrt-machines.patch
target/linux/ar71xx/patches-3.7/612-MIPS-ath79-add-DIR-825-C1-support.patch
target/linux/ar71xx/patches-3.7/613-MIPS-ath79-add-TL-WDR3500-support.patch
target/linux/ar71xx/patches-3.7/615-MIPS-ath79-RB951G-support.patch
target/linux/ar71xx/patches-3.8/610-MIPS-ath79-openwrt-machines.patch
target/linux/ar71xx/patches-3.8/612-MIPS-ath79-add-DIR-825-C1-support.patch
target/linux/ar71xx/patches-3.8/613-MIPS-ath79-add-TL-WDR3500-support.patch
target/linux/ar71xx/patches-3.8/615-MIPS-ath79-RB951G-support.patch

index 124cfb6..03549fa 100644 (file)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011-2012 OpenWrt.org
+# Copyright (C) 2011-2013 OpenWrt.org
 #
 
 [ -e /etc/config/ubootenv ] && exit 0
@@ -27,6 +27,10 @@ om2p-hs | \
 om2p-lc)
        ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x40000" "0x40000"
        ;;
+wzr-hp-ag300h | \
+wzr-600dhp)
+       ubootenv_add_uci_config "/dev/mtd3" "0x0" "0x10000" "0x10000"
+       ;;
 esac
 
 config_load ubootenv
index adf32f1..c863b21 100755 (executable)
@@ -152,7 +152,8 @@ get_status_led() {
                status_led="buffalo:green:status"
                ;;
        wzr-hp-ag300h | \
-       wzr-hp-g300nh2)
+       wzr-hp-g300nh2 | \
+       wzr-600dhp)
                status_led="buffalo:red:diag"
                ;;
        wndr3700)
index 1024150..6a7f521 100644 (file)
@@ -42,7 +42,8 @@ if [ $phyname -a $ACTION = "add" ]; then
        . /lib/ar71xx.sh
        
        case $(ar71xx_board_name) in
-               wzr-hp-ag300h)
+               wzr-hp-ag300h|\
+               wzr-600dhp)
                        ar922x_disable_gpio_jtag $phyname
                        ;;
        esac;
index 3924393..3e54d64 100755 (executable)
@@ -212,7 +212,8 @@ wlae-ag300n)
        ucidef_set_led_netdev "wireless" "WIRELESS" "buffalo:green:wireless" "wlan0"
        ;;
 
-wzr-hp-ag300h)
+wzr-hp-ag300h | \
+wzr-600dhp)
        ucidef_set_led_default "diag" "DIAG" "buffalo:red:diag" "0"
        ucidef_set_led_netdev "router" "ROUTER" "buffalo:green:router" "eth1"
        ucidef_set_led_usbdev "usb" "USB" "buffalo:green:usb" "1-1"
index b1f84da..15a1d39 100755 (executable)
@@ -233,7 +233,8 @@ tl-wr841n-v7 |\
 whr-g301n |\
 whr-hp-g300n |\
 whr-hp-gn |\
-wzr-hp-ag300h)
+wzr-hp-ag300h |\
+wzr-600dhp)
        ucidef_set_interfaces_lan_wan "eth0" "eth1"
        ucidef_add_switch "switch0" "1" "1"
        ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 4"
index 718a924..8757b21 100755 (executable)
@@ -75,6 +75,7 @@ whr-hp-g300n|\
 whr-hp-gn|\
 wzr-hp-ag300h|\
 wzr-hp-g450h|\
+wzr-600dhp|\
 ew-dorin|\
 ew-dorin-router)
        migrate_switch_name "eth0" "switch0"
index 71bf58e..84751e8 100755 (executable)
@@ -468,6 +468,9 @@ ar71xx_board_detect() {
        *WZR-HP-G300NH2)
                name="wzr-hp-g300nh2"
                ;;
+       *WZR-600DHP)
+               name="wzr-600dhp"
+               ;;
        *WHR-HP-G300N)
                name="whr-hp-g300n"
                ;;
index c16d184..d3e14d1 100755 (executable)
@@ -125,6 +125,7 @@ platform_check_image() {
        wzr-hp-g300nh | \
        wzr-hp-g450h | \
        wzr-hp-ag300h | \
+       wzr-600dhp | \
        whr-g301n | \
        whr-hp-g300n | \
        whr-hp-gn | \
index 98f0996..7e07a95 100644 (file)
@@ -92,6 +92,7 @@ CONFIG_ATH79_MACH_WZR_HP_AG300H=y
 CONFIG_ATH79_MACH_WZR_HP_G300NH=y
 CONFIG_ATH79_MACH_WZR_HP_G300NH2=y
 CONFIG_ATH79_MACH_WZR_HP_G450H=y
+CONFIG_ATH79_MACH_WZR_600DHP=y
 CONFIG_ATH79_MACH_ZCN_1523H=y
 CONFIG_ATH79_NVRAM=y
 CONFIG_ATH79_PCI_ATH9K_FIXUP=y
index 847b9a5..898236e 100644 (file)
@@ -92,6 +92,7 @@ CONFIG_ATH79_MACH_WZR_HP_AG300H=y
 CONFIG_ATH79_MACH_WZR_HP_G300NH=y
 CONFIG_ATH79_MACH_WZR_HP_G300NH2=y
 CONFIG_ATH79_MACH_WZR_HP_G450H=y
+CONFIG_ATH79_MACH_WZR_600DHP=y
 CONFIG_ATH79_MACH_ZCN_1523H=y
 CONFIG_ATH79_NVRAM=y
 CONFIG_ATH79_PCI_ATH9K_FIXUP=y
index a7068e1..aa035c8 100644 (file)
@@ -36,7 +36,6 @@ static struct mtd_partition wzrhpag300h_flash_partitions[] = {
                .name           = "u-boot-env",
                .offset         = 0x0040000,
                .size           = 0x0010000,
-               .mask_flags     = MTD_WRITEABLE,
        }, {
                .name           = "art",
                .offset         = 0x0050000,
@@ -212,3 +211,6 @@ static void __init wzrhpag300h_setup(void)
 MIPS_MACHINE(ATH79_MACH_WZR_HP_AG300H, "WZR-HP-AG300H",
             "Buffalo WZR-HP-AG300H", wzrhpag300h_setup);
 
+MIPS_MACHINE(ATH79_MACH_WZR_600DHP, "WZR-600DHP",
+            "Buffalo WZR-600DHP", wzrhpag300h_setup);
+
index 887be26..80e7192 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009 OpenWrt.org
+# Copyright (C) 2009-2013 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -49,6 +49,17 @@ endef
 
 $(eval $(call Profile,WZRHPG450H))
 
+define Profile/WZR600DHP
+       NAME:=Buffalo WZR-600DHP
+       PACKAGES:=kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev
+endef
+
+define Profile/WZR600DHP/Description
+       Package set optimized for the Buffalo WZR-600DHP
+endef
+
+$(eval $(call Profile,WZR600DHP))
+
 define Profile/WHRG301N
        NAME:=Buffalo WHR-G301N
        PACKAGES:=
index 1d39e25..a34828c 100644 (file)
@@ -960,6 +960,7 @@ $(eval $(call SingleProfile,WZRHPG30XNH,$(fs_128k),WZRHPG300NH,wzr-hp-g300nh,WZR
 $(eval $(call SingleProfile,WZRHPG30XNH,$(fs_64k),WZRHPG300NH2,wzr-hp-g300nh2,WZR-HP-G300NH2,ttyS0,115200,WZR-HP-G300NH2))
 $(eval $(call SingleProfile,WZRHPG30XNH,$(fs_64k),WZRHPAG300H,wzr-hp-ag300h,WZR-HP-AG300H,ttyS0,115200,WZR-HP-AG300H))
 $(eval $(call SingleProfile,WZRHPG30XNH,$(fs_64k),WZRHPG450H,wzr-hp-g450h,WZR-HP-G450H,ttyS0,115200,WZR-HP-AG450H))
+$(eval $(call SingleProfile,WZRHPG30XNH,$(fs_64k),WZR600DHP,wzr-600dhp,WZR-600DHP,ttyS0,115200,WZR-600DHP))
 
 $(eval $(call SingleProfile,Zcomax,$(fs_64k),ZCN1523H28,zcn-1523h-2-8,ZCN-1523H-2,ttyS0,115200,$$(zcn1523h_mtdlayout)))
 $(eval $(call SingleProfile,Zcomax,$(fs_64k),ZCN1523H516,zcn-1523h-5-16,ZCN-1523H-5,ttyS0,115200,$$(zcn1523h_mtdlayout)))
index 73253bb..bdf8c2b 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/ath79/machtypes.h
 +++ b/arch/mips/ath79/machtypes.h
-@@ -16,22 +16,112 @@
+@@ -16,22 +16,113 @@
  
  enum ath79_mach_type {
        ATH79_MACH_GENERIC = 0,
 +      ATH79_MACH_WZR_HP_G300NH,       /* Buffalo WZR-HP-G300NH */
 +      ATH79_MACH_WZR_HP_G300NH2,      /* Buffalo WZR-HP-G300NH2 */
 +      ATH79_MACH_WZR_HP_G450H,        /* Buffalo WZR-HP-G450H */
++      ATH79_MACH_WZR_600DHP,          /* Buffalo WZR-600DHP */
 +      ATH79_MACH_ZCN_1523H_2,         /* Zcomax ZCN-1523H-2-xx */
 +      ATH79_MACH_ZCN_1523H_5,         /* Zcomax ZCN-1523H-5-xx */
  };
  config ATH79_MACH_PB44
        bool "Atheros PB44 reference board"
        select SOC_AR71XX
-@@ -68,6 +148,488 @@ config ATH79_MACH_PB44
+@@ -68,6 +148,497 @@ config ATH79_MACH_PB44
          Say 'Y' here if you want your kernel to support the
          Atheros PB44 reference board.
  
 +      select ATH79_DEV_M25P80
 +      select ATH79_DEV_USB
 +
++config ATH79_MACH_WZR_600DHP
++      bool "Buffalo WZR-600DHP board support"
++      select SOC_AR71XX
++      select ATH79_DEV_ETH
++      select ATH79_DEV_GPIO_BUTTONS
++      select ATH79_DEV_LEDS_GPIO
++      select ATH79_DEV_M25P80
++      select ATH79_DEV_USB
++
 +config ATH79_MACH_WP543
 +      bool "Compex WP543/WPJ543 board support"
 +      select SOC_AR71XX
  config ATH79_MACH_UBNT_XM
        bool "Ubiquiti Networks XM/UniFi boards"
        select SOC_AR724X
-@@ -83,6 +645,24 @@ config ATH79_MACH_UBNT_XM
+@@ -83,6 +654,24 @@ config ATH79_MACH_UBNT_XM
          Say 'Y' here if you want your kernel to support the
          Ubiquiti Networks XM (rev 1.0) board.
  
  endmenu
  
  config SOC_AR71XX
-@@ -118,10 +698,6 @@ config SOC_QCA955X
+@@ -118,10 +707,6 @@ config SOC_QCA955X
        select PCI_AR724X if PCI
        def_bool n
  
  config ATH79_DEV_AP9X_PCI
        select ATH79_PCI_ATH9K_FIXUP
        def_bool n
-@@ -132,7 +708,14 @@ config ATH79_DEV_DSA
+@@ -132,7 +717,14 @@ config ATH79_DEV_DSA
  config ATH79_DEV_ETH
        def_bool n
  
        def_bool n
  
  config ATH79_DEV_GPIO_BUTTONS
-@@ -164,4 +747,7 @@ config ATH79_PCI_ATH9K_FIXUP
+@@ -164,4 +756,7 @@ config ATH79_PCI_ATH9K_FIXUP
  config ATH79_ROUTERBOOT
        def_bool n
  
  endif
 --- a/arch/mips/ath79/Makefile
 +++ b/arch/mips/ath79/Makefile
-@@ -38,9 +38,71 @@ obj-$(CONFIG_ATH79_ROUTERBOOT)              += route
+@@ -38,9 +38,72 @@ obj-$(CONFIG_ATH79_ROUTERBOOT)              += route
  #
  # Machines
  #
 +obj-$(CONFIG_ATH79_MACH_WZR_HP_G300NH2)       += mach-wzr-hp-g300nh2.o
 +obj-$(CONFIG_ATH79_MACH_WZR_HP_AG300H)        += mach-wzr-hp-ag300h.o
 +obj-$(CONFIG_ATH79_MACH_WZR_HP_G450H) += mach-wzr-hp-g450h.o
++obj-$(CONFIG_ATH79_MACH_WZR_600DHP)   += mach-wzr-hp-ag300h.o
 +obj-$(CONFIG_ATH79_MACH_ZCN_1523H)    += mach-zcn-1523h.o
 +
 --- a/arch/mips/ath79/prom.c
index 5d6f5cb..5722ed1 100644 (file)
@@ -10,7 +10,7 @@
        ATH79_MACH_EAP7660D,            /* Senao EAP7660D */
 --- a/arch/mips/ath79/Kconfig
 +++ b/arch/mips/ath79/Kconfig
-@@ -283,6 +283,17 @@ config ATH79_MACH_DIR_825_B1
+@@ -292,6 +292,17 @@ config ATH79_MACH_DIR_825_B1
        select ATH79_DEV_M25P80
        select ATH79_DEV_USB
  
index 0a2c3bd..cc60e78 100644 (file)
@@ -10,7 +10,7 @@
        ATH79_MACH_TL_WR1043ND,         /* TP-LINK TL-WR1043ND */
 --- a/arch/mips/ath79/Kconfig
 +++ b/arch/mips/ath79/Kconfig
-@@ -514,6 +514,17 @@ config ATH79_MACH_TL_WA901ND_V2
+@@ -523,6 +523,17 @@ config ATH79_MACH_TL_WA901ND_V2
        select ATH79_DEV_M25P80
        select ATH79_DEV_WMAC
  
index e679717..07bf886 100644 (file)
@@ -10,7 +10,7 @@
        ATH79_MACH_RW2458N,             /* Redwave RW2458N */
 --- a/arch/mips/ath79/Kconfig
 +++ b/arch/mips/ath79/Kconfig
-@@ -360,6 +360,16 @@ config ATH79_MACH_RB750
+@@ -369,6 +369,16 @@ config ATH79_MACH_RB750
        select ATH79_ROUTERBOOT
        select RLE_DECOMPRESS
  
index 73253bb..bdf8c2b 100644 (file)
@@ -1,6 +1,6 @@
 --- a/arch/mips/ath79/machtypes.h
 +++ b/arch/mips/ath79/machtypes.h
-@@ -16,22 +16,112 @@
+@@ -16,22 +16,113 @@
  
  enum ath79_mach_type {
        ATH79_MACH_GENERIC = 0,
 +      ATH79_MACH_WZR_HP_G300NH,       /* Buffalo WZR-HP-G300NH */
 +      ATH79_MACH_WZR_HP_G300NH2,      /* Buffalo WZR-HP-G300NH2 */
 +      ATH79_MACH_WZR_HP_G450H,        /* Buffalo WZR-HP-G450H */
++      ATH79_MACH_WZR_600DHP,          /* Buffalo WZR-600DHP */
 +      ATH79_MACH_ZCN_1523H_2,         /* Zcomax ZCN-1523H-2-xx */
 +      ATH79_MACH_ZCN_1523H_5,         /* Zcomax ZCN-1523H-5-xx */
  };
  config ATH79_MACH_PB44
        bool "Atheros PB44 reference board"
        select SOC_AR71XX
-@@ -68,6 +148,488 @@ config ATH79_MACH_PB44
+@@ -68,6 +148,497 @@ config ATH79_MACH_PB44
          Say 'Y' here if you want your kernel to support the
          Atheros PB44 reference board.
  
 +      select ATH79_DEV_M25P80
 +      select ATH79_DEV_USB
 +
++config ATH79_MACH_WZR_600DHP
++      bool "Buffalo WZR-600DHP board support"
++      select SOC_AR71XX
++      select ATH79_DEV_ETH
++      select ATH79_DEV_GPIO_BUTTONS
++      select ATH79_DEV_LEDS_GPIO
++      select ATH79_DEV_M25P80
++      select ATH79_DEV_USB
++
 +config ATH79_MACH_WP543
 +      bool "Compex WP543/WPJ543 board support"
 +      select SOC_AR71XX
  config ATH79_MACH_UBNT_XM
        bool "Ubiquiti Networks XM/UniFi boards"
        select SOC_AR724X
-@@ -83,6 +645,24 @@ config ATH79_MACH_UBNT_XM
+@@ -83,6 +654,24 @@ config ATH79_MACH_UBNT_XM
          Say 'Y' here if you want your kernel to support the
          Ubiquiti Networks XM (rev 1.0) board.
  
  endmenu
  
  config SOC_AR71XX
-@@ -118,10 +698,6 @@ config SOC_QCA955X
+@@ -118,10 +707,6 @@ config SOC_QCA955X
        select PCI_AR724X if PCI
        def_bool n
  
  config ATH79_DEV_AP9X_PCI
        select ATH79_PCI_ATH9K_FIXUP
        def_bool n
-@@ -132,7 +708,14 @@ config ATH79_DEV_DSA
+@@ -132,7 +717,14 @@ config ATH79_DEV_DSA
  config ATH79_DEV_ETH
        def_bool n
  
        def_bool n
  
  config ATH79_DEV_GPIO_BUTTONS
-@@ -164,4 +747,7 @@ config ATH79_PCI_ATH9K_FIXUP
+@@ -164,4 +756,7 @@ config ATH79_PCI_ATH9K_FIXUP
  config ATH79_ROUTERBOOT
        def_bool n
  
  endif
 --- a/arch/mips/ath79/Makefile
 +++ b/arch/mips/ath79/Makefile
-@@ -38,9 +38,71 @@ obj-$(CONFIG_ATH79_ROUTERBOOT)              += route
+@@ -38,9 +38,72 @@ obj-$(CONFIG_ATH79_ROUTERBOOT)              += route
  #
  # Machines
  #
 +obj-$(CONFIG_ATH79_MACH_WZR_HP_G300NH2)       += mach-wzr-hp-g300nh2.o
 +obj-$(CONFIG_ATH79_MACH_WZR_HP_AG300H)        += mach-wzr-hp-ag300h.o
 +obj-$(CONFIG_ATH79_MACH_WZR_HP_G450H) += mach-wzr-hp-g450h.o
++obj-$(CONFIG_ATH79_MACH_WZR_600DHP)   += mach-wzr-hp-ag300h.o
 +obj-$(CONFIG_ATH79_MACH_ZCN_1523H)    += mach-zcn-1523h.o
 +
 --- a/arch/mips/ath79/prom.c
index 5d6f5cb..5722ed1 100644 (file)
@@ -10,7 +10,7 @@
        ATH79_MACH_EAP7660D,            /* Senao EAP7660D */
 --- a/arch/mips/ath79/Kconfig
 +++ b/arch/mips/ath79/Kconfig
-@@ -283,6 +283,17 @@ config ATH79_MACH_DIR_825_B1
+@@ -292,6 +292,17 @@ config ATH79_MACH_DIR_825_B1
        select ATH79_DEV_M25P80
        select ATH79_DEV_USB
  
index 0a2c3bd..cc60e78 100644 (file)
@@ -10,7 +10,7 @@
        ATH79_MACH_TL_WR1043ND,         /* TP-LINK TL-WR1043ND */
 --- a/arch/mips/ath79/Kconfig
 +++ b/arch/mips/ath79/Kconfig
-@@ -514,6 +514,17 @@ config ATH79_MACH_TL_WA901ND_V2
+@@ -523,6 +523,17 @@ config ATH79_MACH_TL_WA901ND_V2
        select ATH79_DEV_M25P80
        select ATH79_DEV_WMAC
  
index e679717..07bf886 100644 (file)
@@ -10,7 +10,7 @@
        ATH79_MACH_RW2458N,             /* Redwave RW2458N */
 --- a/arch/mips/ath79/Kconfig
 +++ b/arch/mips/ath79/Kconfig
-@@ -360,6 +360,16 @@ config ATH79_MACH_RB750
+@@ -369,6 +369,16 @@ config ATH79_MACH_RB750
        select ATH79_ROUTERBOOT
        select RLE_DECOMPRESS