ath79: patch Asus RP-AC66 clean up and fix for sysupgrade image

- clean up leftovers regarding MAC configure in dts
- fix alphabetical order in caldata
- IMAGE_SIZE for sysupgrade image

Signed-off-by: Tamas Balogh <tamasbalogh@hotmail.com>

diff --git a/target/linux/ath79/dts/qca9563_asus_rp-ac66.dts b/target/linux/ath79/dts/qca9563_asus_rp-ac66.dts
index b1317d55ec10f201e14197f62c719aea68260b3d..39c96127e685c584303d13526a9f980481f0cd9e 100644 (file)
--- a/target/linux/ath79/dts/qca9563_asus_rp-ac66.dts
+++ b/target/linux/ath79/dts/qca9563_asus_rp-ac66.dts
@@ -15,6 +15,7 @@
                led-failsafe = &led_orange;
                led-running = &led_power;
                led-upgrade = &led_orange;
+               label-mac-device = &eth0;
        };
 
        leds {

diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network
index e49e9bd3a15b3fe1c59d8a741743356600080cf8..88269c03ecb65ee598d04bee592c2c7bf0465f5a 100644 (file)
--- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
@@ -534,10 +534,6 @@ ath79_setup_macs()
                lan_mac=$(macaddr_setbit $base_mac 29)
                [ $lan_mac = $base_mac ] && lan_mac=$(macaddr_unsetbit $base_mac 29)
                ;;
-       asus,rp-ac66)
-               lan_mac=$(mtd_get_mac_binary art 0x1002)
-               label_mac=$lan_mac
-               ;;
        avm,fritz1750e|\
        avm,fritz450e|\
        avm,fritzdvbc)

diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index c0e5078bdb2e0c1d2d79985244398be7b9501abf..6da323facc3b9c7b7d9f9330fd8160565a6fb8da 100644 (file)
--- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -17,10 +17,6 @@ case "$FIRMWARE" in
                caldata_extract "art" 0x5000 0x844
                ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) 2)
                ;;
-       avm,fritz1750e|\
-       avm,fritzdvbc)
-               caldata_extract "urlader" 0x198a 0x844
-               ;;
        asus,rp-ac66|\
        comfast,cf-wr650ac-v1|\
        comfast,cf-wr650ac-v2|\
@@ -50,6 +46,10 @@ case "$FIRMWARE" in
        yuncore,a770)
                caldata_extract "art" 0x5000 0x844
                ;;
+       avm,fritz1750e|\
+       avm,fritzdvbc)
+               caldata_extract "urlader" 0x198a 0x844
+               ;;
        devolo,dvl1200e|\
        devolo,dvl1200i|\
        devolo,dvl1750c|\

diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
index 8e97fec402ab975b57f23f0d2d4f276841941c86..2cd24ab67bf7651a235e9c6487a7b0ea5f6737d5 100644 (file)
--- a/target/linux/ath79/image/generic.mk
+++ b/target/linux/ath79/image/generic.mk
@@ -334,6 +334,7 @@ define Device/asus_rp-ac66
   SOC := qca9563
   DEVICE_VENDOR := ASUS
   DEVICE_MODEL := RP-AC66
+  IMAGE_SIZE := 15488k
   IMAGES += factory.bin
   IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \
        append-rootfs | pad-rootfs