ar71xx: add support for Buffalo WZR 600DHP

Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35840 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-03-01 13:46:01 +00:00 · 2013-03-01 13:46:01 +00:00 · 3fc6a70a19
parent 394130b00e
commit 3fc6a70a19
21 changed files with 78 additions and 27 deletions
--- a/package/boot/uboot-envtools/files/ar71xx
+++ b/package/boot/uboot-envtools/files/ar71xx
@ -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
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@ -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)
--- a/target/linux/ar71xx/base-files/etc/hotplug.d/net/10-ar922x-led-fix
+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/net/10-ar922x-led-fix
@ -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;
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
@ -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"
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
@ -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"
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/03_network-switchX-migration
@ -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"
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@ -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"
 		;;
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@ -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 | \
--- a/target/linux/ar71xx/config-3.7
+++ b/target/linux/ar71xx/config-3.7
@ -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
--- a/target/linux/ar71xx/config-3.8
+++ b/target/linux/ar71xx/config-3.8
@ -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
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c
@ -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);
+
--- a/target/linux/ar71xx/generic/profiles/buffalo.mk
+++ b/target/linux/ar71xx/generic/profiles/buffalo.mk
@ -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:=
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@ -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)))
--- a/target/linux/ar71xx/patches-3.7/610-MIPS-ath79-openwrt-machines.patch
+++ b/target/linux/ar71xx/patches-3.7/610-MIPS-ath79-openwrt-machines.patch
@ -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,
@ -108,6 +108,7 @@
 +	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 */
 };
@ -216,7 +217,7 @@
 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.
 
@ -293,6 +294,15 @@
 +	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
@ -705,7 +715,7 @@
 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.
 
@ -730,7 +740,7 @@
 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
 
@ -741,7 +751,7 @@
 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
 
@ -757,7 +767,7 @@
 	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
 
@ -767,7 +777,7 @@
 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
 #
@ -837,6 +847,7 @@
 +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
--- a/target/linux/ar71xx/patches-3.7/612-MIPS-ath79-add-DIR-825-C1-support.patch
+++ b/target/linux/ar71xx/patches-3.7/612-MIPS-ath79-add-DIR-825-C1-support.patch
@ -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
 
--- a/target/linux/ar71xx/patches-3.7/613-MIPS-ath79-add-TL-WDR3500-support.patch
+++ b/target/linux/ar71xx/patches-3.7/613-MIPS-ath79-add-TL-WDR3500-support.patch
@ -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
 
--- a/target/linux/ar71xx/patches-3.7/615-MIPS-ath79-RB951G-support.patch
+++ b/target/linux/ar71xx/patches-3.7/615-MIPS-ath79-RB951G-support.patch
@ -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
 
--- a/target/linux/ar71xx/patches-3.8/610-MIPS-ath79-openwrt-machines.patch
+++ b/target/linux/ar71xx/patches-3.8/610-MIPS-ath79-openwrt-machines.patch
@ -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,
@ -108,6 +108,7 @@
 +	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 */
 };
@ -216,7 +217,7 @@
 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.
 
@ -293,6 +294,15 @@
 +	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
@ -705,7 +715,7 @@
 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.
 
@ -730,7 +740,7 @@
 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
 
@ -741,7 +751,7 @@
 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
 
@ -757,7 +767,7 @@
 	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
 
@ -767,7 +777,7 @@
 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
 #
@ -837,6 +847,7 @@
 +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
--- a/target/linux/ar71xx/patches-3.8/612-MIPS-ath79-add-DIR-825-C1-support.patch
+++ b/target/linux/ar71xx/patches-3.8/612-MIPS-ath79-add-DIR-825-C1-support.patch
@ -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
 
--- a/target/linux/ar71xx/patches-3.8/613-MIPS-ath79-add-TL-WDR3500-support.patch
+++ b/target/linux/ar71xx/patches-3.8/613-MIPS-ath79-add-TL-WDR3500-support.patch
@ -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
 
--- a/target/linux/ar71xx/patches-3.8/615-MIPS-ath79-RB951G-support.patch
+++ b/target/linux/ar71xx/patches-3.8/615-MIPS-ath79-RB951G-support.patch
@ -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