The initial support for the D-Link DAP-1350.
USB related functionality is not tested.
Signed-off-by: Yoichi Shinoda <shin...@jaist.ac.jp>
---
diff --git a/target/linux/ramips/base-files/etc/diag.sh
b/target/linux/ramips/base-files/etc/diag.sh
index 68aa0ee..c1f5949 100755
--- a/target/linux/ramips/base-files/etc/diag.sh
+++ b/target/linux/ramips/base-files/etc/diag.sh
@@ -39,6 +39,9 @@ get_status_led() {
dir-300-b1 | dir-600-b1 | dir-600-b2)
status_led="d-link:green:status"
;;
+ dap-1350)
+ status_led="d-link:blue:power"
+ ;;
esr-9753)
status_led="esr-9753:orange:power"
;;
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 d7542ca..2f7cb33 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
@@ -38,6 +38,10 @@ case "$FIRMWARE" in
rt2x00_eeprom_extract "devdata" 16384 272
;;
+ dap-1350)
+ rt2x00_eeprom_extract "devdata" 0 272
+ ;;
+
rt-n10-plus | \
rt-g32-b1)
rt2x00_eeprom_extract "devconf" 0 272
diff --git a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
index db6e5c8..ebe06f4 100644
--- a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
+++ b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
@@ -29,6 +29,10 @@ preinit_set_mac_address() {
mac=$(ramips_get_mac_binary devdata 16388)
ifconfig eth0 hw ether $mac 2>/dev/null
;;
+ dap-1350)
+ mac=$(ramips_get_mac_binary devdata 46)
+ ifconfig eth0 hw ether $mac 2>/dev/null
+ ;;
all0256n |\
fonera20n |\
hw550-3g |\
diff --git a/target/linux/ramips/base-files/lib/ramips.sh
b/target/linux/ramips/base-files/lib/ramips.sh
index 277d9da..4a96d50 100755
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -77,6 +77,9 @@ ramips_board_name() {
*"DIR-600 B2")
name="dir-600-b2"
;;
+ *"DAP-1350")
+ name="dap-1350"
+ ;;
*"ESR-9753")
name="esr-9753"
;;
diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh
b/target/linux/ramips/base-files/lib/upgrade/platform.sh
index dba5e79..4b41d7e 100755
--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -20,6 +20,7 @@ platform_check_image() {
dir-300-b1 | \
dir-600-b1 | \
dir-600-b2 | \
+ dap-1350 | \
esr-9753 | \
fonera20n | \
freestation5 | \
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 6ff24f2..e04c365 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
@@ -36,6 +36,7 @@ enum ramips_mach_type {
/* RT3052 based machines */
RAMIPS_MACH_ARGUS_ATP52B, /* Argus ATP-52B */
RAMIPS_MACH_BC2, /* NexAira BC2 */
+ RAMIPS_MACH_DAP_1350, /* D-Link DAP-1350 */
RAMIPS_MACH_ESR_9753, /* Senao / EnGenius ESR-9753*/
RAMIPS_MACH_F5D8235_V2, /* Belkin F5D8235 v2 */
RAMIPS_MACH_FONERA20N, /* La Fonera 2.0N */
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/Kconfig
b/target/linux/ramips/files/arch/mips/ralink/rt305x/Kconfig
index 77269fe..999cb1a 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/Kconfig
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/Kconfig
@@ -66,6 +66,11 @@ config RT305X_MACH_DIR_300_REVB
select RALINK_DEV_GPIO_BUTTONS
select RALINK_DEV_GPIO_LEDS
+config RT305X_MACH_DAP_1350
+ bool "D-Link DAP-1350 board support"
+ select RALINK_DEV_GPIO_BUTTONS
+ select RALINK_DEV_GPIO_LEDS
+
config RT305X_MACH_ESR_9753
bool "EnGenius ESR-9753 support"
select RALINK_DEV_GPIO_BUTTONS
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/Makefile
b/target/linux/ramips/files/arch/mips/ralink/rt305x/Makefile
index bb8cf07..eee5a0d 100644
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/Makefile
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_RT305X_MACH_ARGUS_ATP52B) +=
mach-argus-atp52b.o
obj-$(CONFIG_RT305X_MACH_BC2) += mach-bc2.o
obj-$(CONFIG_RT305X_MACH_ALL0256N) += mach-all0256n.o
obj-$(CONFIG_RT305X_MACH_DIR_300_REVB) += mach-dir-300-revb.o
+obj-$(CONFIG_RT305X_MACH_DAP_1350) += mach-dap-1350.o
obj-$(CONFIG_RT305X_MACH_ESR_9753) += mach-esr-9753.o
obj-$(CONFIG_RT305X_MACH_F5D8235_V2) += mach-f5d8235-v2.o
obj-$(CONFIG_RT305X_MACH_FONERA20N) += mach-fonera20n.o
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dap-1350.c
b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dap-1350.c
new file mode 100644
index 0000000..cd5d6ae
--- /dev/null
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/mach-dap-1350.c
@@ -0,0 +1,94 @@
+/*
+ * D-Link DAP-1350 board support
+ */
+
+#include <linux/init.h>
+#include <linux/platform_device.h>
+
+#include <asm/mach-ralink/machine.h>
+#include <asm/mach-ralink/dev-gpio-buttons.h>
+#include <asm/mach-ralink/dev-gpio-leds.h>
+#include <asm/mach-ralink/rt305x.h>
+#include <asm/mach-ralink/rt305x_regs.h>
+
+#include "devices.h"
+
+#define DAP_1350_GPIO_LED_POWER_BLUE 8
+#define DAP_1350_GPIO_LED_POWER_RED 9
+#define DAP_1350_GPIO_LED_WPS 14
+
+#define DAP_1350_GPIO_BUTTON_WPS 0 /* active low */
+#define DAP_1350_GPIO_BUTTON_RESET 10 /* active low */
+#define DAP_1350_GPIO_SWITCH_MODE_AP 7 /* active low */
+#define DAP_1350_GPIO_SWITCH_MODE_RT 11 /* active low */
+
+#define DAP_1350_KEYS_POLL_INTERVAL 20
+#define DAP_1350_KEYS_DEBOUNCE_INTERVAL (3 *
DAP_1350_KEYS_POLL_INTERVAL)
+
+static struct gpio_led dap_1350_leds_gpio[] __initdata = {
+ {
+ .name = "d-link:blue:power",
+ .gpio = DAP_1350_GPIO_LED_POWER_BLUE,
+ .active_low = 1,
+ }, {
+ .name = "d-link:red:power",
+ .gpio = DAP_1350_GPIO_LED_POWER_RED,
+ .active_low = 1,
+ }, {
+ .name = "d-link:blue:wps",
+ .gpio = DAP_1350_GPIO_LED_WPS,
+ .active_low = 1,
+ }
+};
+
+static struct gpio_keys_button dap_1350_gpio_buttons[] __initdata = {
+ {
+ .desc = "reset",
+ .type = EV_KEY,
+ .code = KEY_RESTART,
+ .debounce_interval = DAP_1350_KEYS_DEBOUNCE_INTERVAL,
+ .gpio = DAP_1350_GPIO_BUTTON_RESET,
+ .active_low = 1,
+ }, {
+ .desc = "wps",
+ .type = EV_KEY,
+ .code = KEY_WPS_BUTTON,
+ .debounce_interval = DAP_1350_KEYS_DEBOUNCE_INTERVAL,
+ .gpio = DAP_1350_GPIO_BUTTON_WPS,
+ .active_low = 1,
+ }, {
+ .desc = "rt",
+ .type = EV_KEY,
+ .code = BTN_0,
+ .debounce_interval = DAP_1350_KEYS_DEBOUNCE_INTERVAL,
+ .gpio = DAP_1350_GPIO_SWITCH_MODE_RT,
+ .active_low = 1,
+ }, {
+ .desc = "ap",
+ .type = EV_KEY,
+ .code = BTN_1,
+ .debounce_interval = DAP_1350_KEYS_DEBOUNCE_INTERVAL,
+ .gpio = DAP_1350_GPIO_SWITCH_MODE_AP,
+ .active_low = 1,
+ }
+};
+
+static void __init dap_1350_init(void)
+{
+ rt305x_gpio_init(RT305X_GPIO_MODE_GPIO << RT305X_GPIO_MODE_UART0_SHIFT);
+
+ rt305x_register_flash(0);
+
+ rt305x_esw_data.vlan_config = RT305X_ESW_VLAN_CONFIG_WLLLL;
+ rt305x_register_ethernet();
+ ramips_register_gpio_leds(-1, ARRAY_SIZE(dap_1350_leds_gpio),
+ dap_1350_leds_gpio);
+ ramips_register_gpio_buttons(-1, DAP_1350_KEYS_POLL_INTERVAL,
+ ARRAY_SIZE(dap_1350_gpio_buttons),
+ dap_1350_gpio_buttons);
+ rt305x_register_wifi();
+ rt305x_register_wdt();
+}
+
+MIPS_MACHINE(RAMIPS_MACH_DAP_1350, "DAP-1350", "D-Link DAP-1350",
+ dap_1350_init);
diff --git a/target/linux/ramips/image/Makefile
b/target/linux/ramips/image/Makefile
index ce81728..8f83cb6 100644
--- a/target/linux/ramips/image/Makefile
+++ b/target/linux/ramips/image/Makefile
@@ -173,6 +173,20 @@ define BuildFirmware/DIR300B1/initramfs
$(call BuildFirmware/Generic/initramfs,$(1),$(2),$(call
mkcmdline,$(3),ttyS1,57600) $(call
mkmtd/phys,$(mtdlayout_dir300b1)),$(mtd_dir300b1_kernel_part_size),$(mtd_dir300b1_rootfs_part_size))
endef
+mtdlayout_dap1350=192k(u-boot)ro,64k(devdata)ro,192k(devconf)ro,256k(devlang)ro,1088k(kernel),6400k(rootfs),7488k@0xb0000(firmware)
+mtd_dap1350_kernel_part_size=1114112
+mtd_dap1350_rootfs_part_size=6553600
+define BuildFirmware/DAP1350
+ $(call BuildFirmware/Generic,$(1),$(2),$(call
mkcmdline,$(3),ttyS1,115200) $(call
mkmtd/phys,$(mtdlayout_dap1350)),$(mtd_dap1350_kernel_part_size),$(mtd_dap1350_rootfs_part_size))
+ mkdapimg -s $(4) \
+ -i $(call sysupname,$(1),$(2)) \
+ -o $(call imgname,$(1),$(2))-factory.bin
+endef
+
+define BuildFirmware/DAP1350/initramfs
+ $(call BuildFirmware/Generic/initramfs,$(1),$(2),$(call
mkcmdline,$(3),ttyS1,115200) $(call
mkmtd/phys,$(mtdlayout_dap1350)),$(mtd_dap1350_kernel_part_size),$(mtd_dap1350_rootfs_part_size))
+endef
+
define BuildFirmware/Edimax
if [ -e "$(call sysupname,$(1),$(2))" ]; then \
mkedimaximg -i $(call sysupname,$(1),$(2)) \
@@ -340,6 +354,10 @@ define Image/Build/Profile/DIR300B1
$(call
Image/Build/Template/$(fs_squash)/$(1),DIR300B1,dir-615-d,DIR-615-D,wrgn23_dlwbr_dir615d)
endef
+define Image/Build/Profile/DAP1350
+ $(call
Image/Build/Template/$(fs_squash)/$(1),DAP1350,dap-1350,DAP-1350,RT3052-AP-DAP1350-3)
+endef
+
define Image/Build/Profile/ESR9753
$(call
Image/Build/Template/$(fs_squash)/$(1),GENERIC_4M,esr-9753,ESR-9753,ttyS1,57600,phys)
endef
@@ -458,6 +476,7 @@ define Image/Build/Profile/Default
$(call Image/Build/Profile/ARGUS_ATP52B,$(1))
$(call Image/Build/Profile/BC2,$(1))
$(call Image/Build/Profile/DIR300B1,$(1))
+ $(call Image/Build/Profile/DAP1350,$(1))
$(call Image/Build/Profile/ESR9753,$(1))
$(call Image/Build/Profile/F5D8235V2,$(1))
$(call Image/Build/Profile/RTN10PLUS,$(1))
diff --git a/target/linux/ramips/rt305x/config-3.3
b/target/linux/ramips/rt305x/config-3.3
index 3ad2857..9017d28 100644
--- a/target/linux/ramips/rt305x/config-3.3
+++ b/target/linux/ramips/rt305x/config-3.3
@@ -92,6 +92,7 @@ CONFIG_RT305X_MACH_ALL0256N=y
CONFIG_RT305X_MACH_ARGUS_ATP52B=y
CONFIG_RT305X_MACH_BC2=y
CONFIG_RT305X_MACH_DIR_300_REVB=y
+CONFIG_RT305X_MACH_DAP_1350=y
CONFIG_RT305X_MACH_ESR_9753=y
CONFIG_RT305X_MACH_F5D8235_V2=y
CONFIG_RT305X_MACH_FONERA20N=y
diff --git a/tools/firmware-utils/Makefile b/tools/firmware-utils/Makefile
index 4364223..05b588f 100644
--- a/tools/firmware-utils/Makefile
+++ b/tools/firmware-utils/Makefile
@@ -57,6 +57,7 @@ define Host/Compile
$(call cc,mkedimaximg)
$(call cc,mkbrncmdline)
$(call cc,mkbrnimg)
+ $(call cc,mkdapimg)
endef
define Host/Install
diff --git a/tools/firmware-utils/src/mkdapimg.c
b/tools/firmware-utils/src/mkdapimg.c
new file mode 100644
index 0000000..8b0359f
--- /dev/null
+++ b/tools/firmware-utils/src/mkdapimg.c
@@ -0,0 +1,191 @@
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <libgen.h>
+#include <stdarg.h>
+#include <getopt.h>
+#include <string.h>
+#include <errno.h>
+
+#include <netinet/in.h> // htonl
+
+// Usage: mkdapimg [-p] [-m <model>] -s <sig> -i <input> -o <output>
+//
+// e.g.: mkdapimg -s RT3052-AP-DAP1350-3 -i sysupgarde.bin -o factory.bin
+//
+// If the model string <model> is not given, we will assume that
+// the leading characters upto the first "-" is the model.
+//
+// The "-p" (patch) option is used to patch the exisiting image with the
+// specified model and signature.
+// The "-x" (fix) option will recalculate the payload size and checksum
+// during the patch mode operation.
+
+// The img_hdr_struct was taken from the D-Link SDK:
+// DAP-1350_A1_FW1.11NA_GPL/GPL_Source_Code/Uboot/DAP-1350/httpd/header.h
+
+#define MAX_MODEL_NAME_LEN 20
+#define MAX_SIG_LEN 30
+
+struct img_hdr_struct {
+ uint32_t checksum;
+ char model[MAX_MODEL_NAME_LEN];
+ char sig[MAX_SIG_LEN];
+ uint8_t partition;
+ uint8_t hdr_len;
+ uint8_t rsv1;
+ uint8_t rsv2;
+ uint32_t flash_byte_cnt;
+} imghdr ;
+
+char *progname;
+
+void
+perrexit(int code, char *msg)
+{
+ fprintf(stderr, "%s: %s: %s\n", progname, msg, strerror(errno));
+ exit(code);
+}
+
+void
+usage()
+{
+ fprintf(stderr, "usage: %s [-p] [-m model] -s signature -i input -o
output\n", progname);
+ exit(1);
+}
+
+int
+main(int ac, char *av[])
+{
+ char model[MAX_MODEL_NAME_LEN+1];
+ char signature[MAX_SIG_LEN+1];
+ int patchmode = 0;
+ int fixmode = 0;
+
+ FILE *ifile, *ofile;
+ int c;
+ uint32_t cksum;
+ uint32_t bcnt;
+
+ progname = basename(av[0]);
+ memset(model, 0, sizeof(model));
+ memset(signature, 0, sizeof(signature));
+
+ while ( 1 ) {
+ int c;
+
+ c = getopt(ac, av, "pxm:s:i:o:");
+ if (c == -1)
+ break;
+
+ switch (c) {
+ case 'p':
+ patchmode = 1;
+ break;
+ case 'x':
+ fixmode = 1;
+ break;
+ case 'm':
+ if (strlen(optarg) > MAX_MODEL_NAME_LEN) {
+ fprintf(stderr, "%s: model name exceeds %d
chars\n",
+ progname, MAX_MODEL_NAME_LEN);
+ exit(1);
+ }
+ strcpy(model, optarg);
+ break;
+ case 's':
+ if (strlen(optarg) > MAX_SIG_LEN) {
+ fprintf(stderr, "%s: signature exceeds %d
chars\n",
+ progname, MAX_SIG_LEN);
+ exit(1);
+ }
+ strcpy(signature, optarg);
+ break;
+ case 'i':
+ if ((ifile = fopen(optarg, "r")) == NULL)
+ perrexit(1, optarg);
+ break;
+ case 'o':
+ if ((ofile = fopen(optarg, "w")) == NULL)
+ perrexit(1, optarg);
+ break;
+ default:
+ usage();
+ }
+ }
+
+ if (signature[0] == 0 || ifile == NULL || ofile == NULL) {
+ usage();
+ }
+
+ if (model[0] == 0) {
+ char *p = strchr(signature, '-');
+ if (p == NULL) {
+ fprintf(stderr, "%s: model name unknown\n", progname);
+ exit(1);
+ }
+ if (p - signature > MAX_MODEL_NAME_LEN) {
+ *p = 0;
+ fprintf(stderr, "%s: auto model name failed, string %s
too long\n", progname, signature);
+ exit(1);
+ }
+ strncpy(model, signature, p - signature);
+ }
+
+ if (patchmode) {
+ if (fread(&imghdr, sizeof(imghdr), 1, ifile) < 0)
+ perrexit(2, "fread on input");
+ }
+
+ for (bcnt = 0, cksum = 0 ; (c = fgetc(ifile)) != EOF ; bcnt++)
+ cksum += c & 0xff;
+
+ if (fseek(ifile, patchmode ? sizeof(imghdr) : 0, SEEK_SET) < 0)
+ perrexit(2, "fseek on input");
+
+ if (patchmode == 0) {
+ // Fill in the header
+ memset(&imghdr, 0, sizeof(imghdr));
+ imghdr.checksum = htonl(cksum);
+ imghdr.partition = 0 ; // don't care?
+ imghdr.hdr_len = sizeof(imghdr);
+ imghdr.flash_byte_cnt = htonl(bcnt);
+ } else {
+ if (ntohl(imghdr.checksum) != cksum) {
+ fprintf(stderr, "%s: patch mode, checksum mismatch\n",
+ progname);
+ if (fixmode) {
+ fprintf(stderr, "%s: fixing\n", progname);
+ imghdr.checksum = htonl(cksum);
+ } else
+ exit(3);
+ } else if (ntohl(imghdr.flash_byte_cnt) != bcnt) {
+ fprintf(stderr, "%s: patch mode, size mismatch\n",
+ progname);
+ if (fixmode) {
+ fprintf(stderr, "%s: fixing\n", progname);
+ imghdr.flash_byte_cnt = htonl(bcnt);
+ } else
+ exit(3);
+ }
+ }
+
+ strncpy(imghdr.model, model, MAX_MODEL_NAME_LEN);
+ strncpy(imghdr.sig, signature, MAX_SIG_LEN);
+
+ if (fwrite(&imghdr, sizeof(imghdr), 1, ofile) < 0)
+ perrexit(2, "fwrite header on output");
+
+ while ((c = fgetc(ifile)) != EOF) {
+ if (fputc(c, ofile) == EOF)
+ perrexit(2, "fputc on output");
+ }
+
+ if (ferror(ifile))
+ perrexit(2, "fgetc on input");
+
+
+ fclose(ofile);
+ fclose(ifile);
+}
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
