| Message ID | 20200316101349.25506-2-hacks@slashdirt.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [OpenWrt-Devel,1/2] ath79: fix mikrotik WAP G-5HacT2HnD mtd partitions | expand |
diff --git a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts index 26a18ad6a7..3f2a1a51a6 100644 --- a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts +++ b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts @@ -80,7 +80,7 @@ ð0 { status = "okay"; - mtd-mac-address = <&art 0x10>; + mtd-mac-address = <&hard_config 0x10>; phy-handle = <&phy4>; pll-data = <0x8f000000 0xa0000101 0xa0001313>; @@ -109,8 +109,8 @@ read-only; }; - art: partition@c000 { - label = "art"; + hard_config: partition@c000 { + label = "hard_config"; reg = <0x000c000 0x0001000>; read-only; }; diff --git a/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index 8a1bed58c1..31a1db5aeb 100644 --- a/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -28,7 +28,7 @@ case "$FIRMWARE" in "ath10k/cal-pci-0000:01:00.0.bin") case $board in mikrotik,routerboard-922uags-5hpacd) - mikrotik_caldata_extract "art" 0x5000 0x844 + mikrotik_caldata_extract "hard_config" 0x5000 0x844 ;; esac ;;
In RouterBOARD parlance there never was an "art" partition. This partition has always been named 'hard_config' on ar71xx. This partition contains more than just ART (Atheros Radio Test) data. It includes the hardware description (product code, serial, board identifier, name, hardware options, MAC address), as well as other bits affecting the operation of RouterBoot. To avoid confusion with regular ART data, this partition is renamed in line with historical ar71xx and ramips nomenclature as 'hard_config'. This commit fixes the previous support files. Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org> --- .../linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts | 6 +++--- .../ath79/nand/base-files/etc/hotplug.d/firmware/11-ath10k-caldata | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)