uboot-mediatek: adjust the reserved memory regions

* Increase mt7986 ATF reserved memory to 256 kiB to follow the linux
  kernel and Trusted Firmware-A changes.

* Remove unnecessary reserved memory region for the WiFi hardware. The
  u-boot can not drive the WiFi hardware. Hence we don't need to keep
  this memory region.

* Remove useless node labels and update comments.

Signed-off-by: Shiji Yang <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/19741
Signed-off-by: Hauke Mehrtens <[email protected]>

diff --git a/package/boot/uboot-mediatek/patches/103-01-mt7622-enable-pstore.patch b/package/boot/uboot-mediatek/patches/103-01-mt7622-enable-pstore.patch
index f085615e700d5243eecc8f394ce8e9cb462e897c..ac7a6b2f1f9b5332be9782b0f7cd4ff7bab6c70f 100644 (file)
--- a/package/boot/uboot-mediatek/patches/103-01-mt7622-enable-pstore.patch
+++ b/package/boot/uboot-mediatek/patches/103-01-mt7622-enable-pstore.patch
@@ -21,8 +21,8 @@
 +                      record-size = <0x1000>;
 +              };
 +
-+              /* 192 KiB reserved for ARM Trusted Firmware (BL31) */
-+              secmon_reserved: secmon@43000000 {
++              /* 192 KiB reserved for ARM Trusted Firmware (BL31 + BL32) */
++              secmon@43000000 {
 +                      reg = <0x43000000 0x30000>;
 +                      no-map;
 +              };

diff --git a/package/boot/uboot-mediatek/patches/103-02-mt7981-enable-pstore.patch b/package/boot/uboot-mediatek/patches/103-02-mt7981-enable-pstore.patch
index 8eaa91f53f79310efaf5b137b78222f5c3a50c6b..c822585a27386768301d85d7afe377be507e9a3a 100644 (file)
--- a/package/boot/uboot-mediatek/patches/103-02-mt7981-enable-pstore.patch
+++ b/package/boot/uboot-mediatek/patches/103-02-mt7981-enable-pstore.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/dts/mt7981.dtsi
 +++ b/arch/arm/dts/mt7981.dtsi
-@@ -33,6 +33,35 @@
+@@ -33,6 +33,30 @@
                };
        };
  
@@ -21,16 +21,11 @@
 +                      record-size = <0x1000>;
 +              };
 +
-+              /* 192 KiB reserved for ARM Trusted Firmware (BL31) */
-+              secmon_reserved: secmon@43000000 {
++              /* 192 KiB reserved for ARM Trusted Firmware (BL31 + BL32) */
++              secmon@43000000 {
 +                      reg = <0x43000000 0x30000>;
 +                      no-map;
 +              };
-+
-+              wmcpu_emi: wmcpu-reserved@4fc00000 {
-+                      no-map;
-+                      reg = <0x4fc00000 0x00100000>;
-+              };
 +      };
 +
        gpt_clk: gpt_dummy20m {

diff --git a/package/boot/uboot-mediatek/patches/103-03-mt7986-enable-pstore.patch b/package/boot/uboot-mediatek/patches/103-03-mt7986-enable-pstore.patch
index 01ad0f919d6b8d2d65a5156a303e741a32289dcf..dcbf7c8e7a05c273bbd3f410b68fa2ecdef0a96f 100644 (file)
--- a/package/boot/uboot-mediatek/patches/103-03-mt7986-enable-pstore.patch
+++ b/package/boot/uboot-mediatek/patches/103-03-mt7986-enable-pstore.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/dts/mt7986.dtsi
 +++ b/arch/arm/dts/mt7986.dtsi
-@@ -50,6 +50,35 @@
+@@ -50,6 +50,30 @@
                };
        };
  
@@ -21,16 +21,11 @@
 +                      record-size = <0x1000>;
 +              };
 +
-+              /* 192 KiB reserved for ARM Trusted Firmware (BL31) */
-+              secmon_reserved: secmon@43000000 {
-+                      reg = <0x43000000 0x30000>;
++              /* 256 KiB reserved for ARM Trusted Firmware (BL31 + BL32) */
++              secmon@43000000 {
++                      reg = <0x43000000 0x40000>;
 +                      no-map;
 +              };
-+
-+              wmcpu_emi: wmcpu-reserved@4fc00000 {
-+                      no-map;
-+                      reg = <0x4fc00000 0x00100000>;
-+              };
 +      };
 +
        dummy_clk: dummy12m {

diff --git a/package/boot/uboot-mediatek/patches/103-04-mt7988-enable-pstore.patch b/package/boot/uboot-mediatek/patches/103-04-mt7988-enable-pstore.patch
index 1f339d4b5bbfb7c23a951f2c07ae21ac80c4d844..68372736e5aaad629241d377f172604133b6a248 100644 (file)
--- a/package/boot/uboot-mediatek/patches/103-04-mt7988-enable-pstore.patch
+++ b/package/boot/uboot-mediatek/patches/103-04-mt7988-enable-pstore.patch
@@ -21,8 +21,8 @@
 +                      record-size = <0x1000>;
 +              };
 +
-+              /* 320 KiB reserved for ARM Trusted Firmware (BL31+BL32) */
-+              secmon_reserved: secmon@43000000 {
++              /* 320 KiB reserved for ARM Trusted Firmware (BL31 + BL32) */
++              secmon@43000000 {
 +                      reg = <0 0x43000000 0 0x50000>;
 +                      no-map;
 +              };