From 9a122df07e82224f1fd0588559ded6ce4cf6a9e5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thibaut=20VAR=C3=88NE?= Date: Tue, 17 Mar 2020 17:53:43 +0100 Subject: [PATCH] ath79: fix Mikrotik wAP G-5HacT2HnD mtd partitions MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 and implements the nested RouterBoot partition scheme as already used by ramips-based SPI-NOR RouterBOARD DTSes, as previously reviewed and implemented in bbe2cf657ca7 ("ramips: fix RBM11G partitioning"). Tested-by: Roger Pueyo Centelles Signed-off-by: Thibaut VARÈNE [minor commit title/message adjustments] Signed-off-by: Adrian Schmutzler --- ...6_mikrotik_routerboard-wap-g-5hact2hnd.dts | 61 +++++++++++-------- .../etc/hotplug.d/firmware/10-ath9k-eeprom | 4 +- .../etc/hotplug.d/firmware/11-ath10k-caldata | 2 +- 3 files changed, 38 insertions(+), 29 deletions(-) diff --git a/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts b/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts index 015bd2efe522..5fd4623726d4 100644 --- a/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts +++ b/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts @@ -53,7 +53,7 @@ ð1 { status = "okay"; - mtd-mac-address = <&art 0x10>; + mtd-mac-address = <&hard_config 0x10>; pll-data = <0x03000101 0x80000101 0x80001313>; phy-handle = <&phy0>; @@ -81,32 +81,41 @@ #size-cells = <1>; partition@0 { - label = "routerboot"; - reg = <0x000000 0x00e000>; + label = "RouterBoot"; + reg = <0x0 0x20000>; read-only; - }; - - art: partition@e000 { - label = "art"; - reg = <0x000e000 0x001000>; - read-only; - }; - - partition@f000 { - label = "bios"; - reg = <0x000f000 0x001000>; - read-only; - }; - - partition@10000 { - label = "routerboot2"; - reg = <0x010000 0x00f000>; - read-only; - }; - - partition@1f000 { - label = "soft_config"; - reg = <0x001f000 0x001000>; + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "bootloader1"; + reg = <0x0 0xe000>; + read-only; + }; + + hard_config: partition@e000 { + label = "hard_config"; + reg = <0xe000 0x1000>; + read-only; + }; + + partition@f000 { + label = "bios"; + reg = <0xf000 0x1000>; + read-only; + }; + + partition@10000 { + label = "bootloader2"; + reg = <0x10000 0xf000>; + read-only; + }; + + partition@1f000 { + label = "soft_config"; + reg = <0x1f000 0x1000>; + }; }; partition@20000 { diff --git a/target/linux/ath79/mikrotik/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/mikrotik/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index f5f88484b5d7..86995de89073 100644 --- a/target/linux/ath79/mikrotik/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ath79/mikrotik/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -11,8 +11,8 @@ case "$FIRMWARE" in "ath9k-eeprom-ahb-18100000.wmac.bin") case $board in mikrotik,routerboard-wap-g-5hact2hnd) - mikrotik_caldata_extract "art" 0x1000 0x440 - ath9k_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x10) +2) + mikrotik_caldata_extract "hard_config" 0x1000 0x440 + ath9k_patch_mac $(macaddr_add $(mtd_get_mac_binary hard_config 0x10) +2) ;; *) caldata_die "board $board is not supported yet" diff --git a/target/linux/ath79/mikrotik/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/mikrotik/base-files/etc/hotplug.d/firmware/11-ath10k-caldata index 6eb9a93b75e1..7773eb1e3a55 100644 --- a/target/linux/ath79/mikrotik/base-files/etc/hotplug.d/firmware/11-ath10k-caldata +++ b/target/linux/ath79/mikrotik/base-files/etc/hotplug.d/firmware/11-ath10k-caldata @@ -11,7 +11,7 @@ case "$FIRMWARE" in "ath10k/cal-pci-0000:00:00.0.bin") case $board in mikrotik,routerboard-wap-g-5hact2hnd) - mikrotik_caldata_extract "art" 0x5000 0x844 + mikrotik_caldata_extract "hard_config" 0x5000 0x844 ;; esac ;; -- 2.30.2