diff options
7 files changed, 23 insertions, 5 deletions
diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh index f0bd63fae..c41105397 100755 --- a/target/linux/ramips/base-files/etc/diag.sh +++ b/target/linux/ramips/base-files/etc/diag.sh @@ -30,7 +30,7 @@ status_led_off() { get_status_led() { case $(ramips_board_name) in - dir-300-b1) + dir-300-b1 | dir-600-b1 | dir-600-b2) status_led="d-link:green:status" ;; fonera20n) diff --git a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom index 398ad79ec..03ff4f81d 100644 --- a/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom +++ b/target/linux/ramips/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom @@ -31,7 +31,9 @@ case "$FIRMWARE" in local board=$(ramips_board_name) case $board in - dir-300-b1) + dir-300-b1 | \ + dir-600-b1 | \ + dir-600-b2) rt2x00_eeprom_extract "devdata" 16384 272 ;; diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index dc03b4755..f34454b6d 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -16,6 +16,12 @@ ramips_board_name() { *"DIR-300 B1") name="dir-300-b1" ;; + *"DIR-600 B1") + name="dir-600-b1" + ;; + *"DIR-600 B2") + name="dir-600-b2" + ;; *"F5D8235 v2") name="f5d8235-v2" ;; diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index b701938f2..0dd3b7bd2 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -14,7 +14,7 @@ platform_check_image() { [ "$ARGC" -gt 1 ] && return 1 case "$board" in - dir-300-b1 | fonera20n | v22rw-2x2 | whr-g300n | hw550-3g | mofi3500-3gn) + dir-300-b1 | dir-600-b1 | dir-600-b2 | fonera20n | v22rw-2x2 | whr-g300n | hw550-3g | mofi3500-3gn) [ "$magic" != "2705" ] && { echo "Invalid image type." return 1 diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h index acaf60473..b9f8a602e 100644 --- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h +++ b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/machine.h @@ -19,6 +19,8 @@ enum ramips_mach_type { /* RT3050 based machines */ RAMIPS_MACH_DIR_300_B1, /* D-Link DIR-300 B1 */ + RAMIPS_MACH_DIR_600_B1, /* D-Link DIR-600 B1 */ + RAMIPS_MACH_DIR_600_B2, /* D-Link DIR-600 B2 */ /* RT3052 based machines */ RAMIPS_MACH_F5D8235_V2, /* Belkin F5D8235 v2 */ diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c index c0167bc03..71b9c51fa 100644 --- a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c +++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dir-300-revb.c @@ -122,3 +122,9 @@ static void __init dir_300b_init(void) MIPS_MACHINE(RAMIPS_MACH_DIR_300_B1, "DIR-300-B1", "D-Link DIR-300 B1", dir_300b_init); + +MIPS_MACHINE(RAMIPS_MACH_DIR_600_B1, "DIR-600-B1", "D-Link DIR-600 B1", + dir_300b_init); + +MIPS_MACHINE(RAMIPS_MACH_DIR_600_B2, "DIR-600-B2", "D-Link DIR-600 B2", + dir_300b_init); diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index e84d46860..dde5ca89a 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -104,13 +104,15 @@ mtd_dir300b1_kernel_part_size=851968 mtd_dir300b1_rootfs_part_size=3014656 define Image/Build/Template/DIR300B1 $(call BuildFirmware/Generic,$(1),$(2),board=$(3),mtdlayout_dir300b1,$(mtd_dir300b1_kernel_part_size),$(mtd_dir300b1_rootfs_part_size)) - mkwrgimg -s wrgn23_dlwbr_dir300b -d /dev/mtdblock/2 \ + mkwrgimg -s $(4) -d /dev/mtdblock/2 \ -i $(call imgname,$(1),$(2))-sysupgrade.bin \ -o $(call imgname,$(1),$(2))-factory.bin endef define Image/Build/Profile/DIR300B1 - $(call Image/Build/Template/DIR300B1,$(1),dir-300-b1,DIR-300-B1) + $(call Image/Build/Template/DIR300B1,$(1),dir-300-b1,DIR-300-B1,wrgn23_dlwbr_dir300b) + $(call Image/Build/Template/DIR300B1,$(1),dir-600-b1,DIR-600-B1,wrgn23_dlwbr_dir600b) + $(call Image/Build/Template/DIR300B1,$(1),dir-600-b2,DIR-600-B2,wrgn23_dlwbr_dir600b) endef define Image/Build/Profile/FONERA20N |