EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ath79: fix Mikrotik wAP G-5HacT2HnD mtd partitions

Browse Source 
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
bbe2cf657c ("ramips: fix RBM11G partitioning").

Tested-by: Roger Pueyo Centelles <roger.pueyo@guifi.net>
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>
[minor commit title/message adjustments]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Thibaut VARÈNE 2020-03-17 17:53:43 +01:00 committed by Adrian Schmutzler
parent 43105f24eb
commit 9a122df07e
3 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts
View File

@ -53,7 +53,7 @@
&eth1 {
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;
};
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
art: partition@e000 {
label = "art";
reg = <0x000e000 0x001000>;
read-only;
};
partition@0 {
label = "bootloader1";
reg = <0x0 0xe000>;
read-only;
};
partition@f000 {
label = "bios";
reg = <0x000f000 0x001000>;
read-only;
};
hard_config: partition@e000 {
label = "hard_config";
reg = <0xe000 0x1000>;
read-only;
};
partition@10000 {
label = "routerboot2";
reg = <0x010000 0x00f000>;
read-only;
};
partition@f000 {
label = "bios";
reg = <0xf000 0x1000>;
read-only;
};
partition@1f000 {
label = "soft_config";
reg = <0x001f000 0x001000>;
partition@10000 {
label = "bootloader2";
reg = <0x10000 0xf000>;
read-only;
};
partition@1f000 {
label = "soft_config";
reg = <0x1f000 0x1000>;
};
};
partition@20000 {

4
target/linux/ath79/mikrotik/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
View File

@ -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"

2
target/linux/ath79/mikrotik/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
View File

@ -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
;;