From 0d760bfba8da81c508ec1cec679c85278820bba7 Mon Sep 17 00:00:00 2001 From: Henryk Heisig Date: Mon, 14 Nov 2016 21:55:25 +0100 Subject: [PATCH] ar71xx: tl-wpa8630: Use dynamic parsing of the firmware partition Signed-off-by: Henryk Heisig --- .../base-files/etc/hotplug.d/firmware/11-ath10k-caldata | 2 +- .../linux/ar71xx/files/arch/mips/ath79/mach-tl-wpa8630.c | 8 +++++++- target/linux/ar71xx/image/tp-link.mk | 2 -- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index 872e6a842752..bbb28ed74d8e 100644 --- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -87,7 +87,7 @@ case "$FIRMWARE" in ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +16) ;; tl-wpa8630) - ath10kcal_extract "ART" 20480 2116 + ath10kcal_extract "art" 20480 2116 ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +1) ;; unifiac-lite | \ diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wpa8630.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wpa8630.c index acdd7c3bb9dd..0a1e6b4d9128 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wpa8630.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wpa8630.c @@ -40,8 +40,14 @@ #define TL_WPA8630_WMAC_CALDATA_OFFSET 0x1000 #define TL_WPA8630_PCI_CALDATA_OFFSET 0x5000 +static const char *tl_wpa8630_part_probes[] = { + "tp-link-64k", + NULL, +}; + static struct flash_platform_data tl_wpa8630_flash_data = { - .type = "s25fl064k", + .part_probes = tl_wpa8630_part_probes, + .type = "s25fl064k", }; static struct gpio_led tl_wpa8630_leds_gpio[] __initdata = { diff --git a/target/linux/ar71xx/image/tp-link.mk b/target/linux/ar71xx/image/tp-link.mk index d04bac15bedb..4c2ce18e10ef 100644 --- a/target/linux/ar71xx/image/tp-link.mk +++ b/target/linux/ar71xx/image/tp-link.mk @@ -378,8 +378,6 @@ define Device/tl-wpa8630 BOARDNAME := TL-WPA8630 DEVICE_PROFILE := TL-WPA8630 TPLINK_HWID := 0x86300001 - MTDPARTS = spi0.0:64k(u-boot)ro,1344k(kernel),6656k(rootfs),64k(mib0)ro,64k(ART)ro,8000k@0x10000(firmware) - IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade -a 0x10000 endef TARGET_DEVICES += tl-wpa8630 -- 2.30.2