fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Official Source

Browse Source
This commit is contained in:
CN_SZTL 2020-03-28 15:52:08 +08:00
commit 8233d170ee
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
7 changed files with 148 additions and 29 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 {

6
target/linux/ath79/dts/qca9558_mikrotik_routerboard-922uags-5hpacd.dts
View File

@ -80,7 +80,7 @@
&eth0 {
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;
};

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"

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

@ -11,14 +11,14 @@ 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
;;
"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
;;

36
target/linux/kirkwood/patches-4.14/110-pogo_e02.patch
View File

@ -30,3 +30,39 @@
label = "pogo_e02:orange:fault";
gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
};
@@ -97,24 +104,24 @@
status = "okay";
partition@0 {
- label = "u-boot";
- reg = <0x0000000 0x100000>;
+ label = "uboot";
+ reg = <0x0 0xe0000>;
read-only;
};
- partition@100000 {
- label = "uImage";
- reg = <0x0100000 0x400000>;
+ partition@e0000 {
+ label = "uboot_env";
+ reg = <0xe0000 0x20000>;
};
- partition@500000 {
- label = "pogoplug";
- reg = <0x0500000 0x2000000>;
+ partition@100000 {
+ label = "second_stage_uboot";
+ reg = <0x100000 0x100000>;
};
- partition@2500000 {
- label = "root";
- reg = <0x02500000 0x5b00000>;
+ partition@200000 {
+ label = "ubi";
+ reg = <0x200000 0x7e00000>;
};
};

38
target/linux/kirkwood/patches-4.19/110-pogo_e02.patch
View File

@ -30,3 +30,41 @@
label = "pogo_e02:orange:fault";
gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
};
@@ -95,25 +102,26 @@
status = "okay";
partition@0 {
- label = "u-boot";
- reg = <0x0000000 0x100000>;
+ label = "uboot";
+ reg = <0x0 0xe0000>;
read-only;
};
- partition@100000 {
- label = "uImage";
- reg = <0x0100000 0x400000>;
+ partition@e0000 {
+ label = "uboot_env";
+ reg = <0xe0000 0x20000>;
};
- partition@500000 {
- label = "pogoplug";
- reg = <0x0500000 0x2000000>;
+ partition@100000 {
+ label = "second_stage_uboot";
+ reg = <0x100000 0x100000>;
};
- partition@2500000 {
- label = "root";
- reg = <0x02500000 0x5b00000>;
+ partition@200000 {
+ label = "ubi";
+ reg = <0x200000 0x7e00000>;
};
+
};
&mdio {

36
target/linux/kirkwood/patches-5.4/110-pogo_e02.patch
View File

@ -30,3 +30,39 @@
label = "pogo_e02:orange:fault";
gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
};
@@ -95,24 +102,24 @@
status = "okay";
partition@0 {
- label = "u-boot";
- reg = <0x0000000 0x100000>;
+ label = "uboot";
+ reg = <0x0 0xe0000>;
read-only;
};
- partition@100000 {
- label = "uImage";
- reg = <0x0100000 0x400000>;
+ partition@e0000 {
+ label = "uboot_env";
+ reg = <0xe0000 0x20000>;
};
- partition@500000 {
- label = "pogoplug";
- reg = <0x0500000 0x2000000>;
+ partition@100000 {
+ label = "second_stage_uboot";
+ reg = <0x100000 0x100000>;
};
- partition@2500000 {
- label = "root";
- reg = <0x02500000 0x5b00000>;
+ partition@200000 {
+ label = "ubi";
+ reg = <0x200000 0x7e00000>;
};
};