Fix memory overlaps in FIT image configurations for TI AM62x and AM64x PHYCore and SK boards.
The overlaps occurred in two categories:
1. TI firmware stub images (tifsstub-hs, tifsstub-fs, tifsstub-gp):
These mutually exclusive firmware variants were incorrectly assigned
the same load address within FIT configurations, causing overlap
detection to fail. Adjust addresses with 64KB spacing:
- tifsstub-hs: Keep original address
- tifsstub-fs: Move to +64KB offset
- tifsstub-gp: Move to +128KB offset
2. Device tree overlay images (som-no-rtc, som-no-spi, som-no-eth):
These overlay files had insufficient spacing between load addresses,
causing actual memory overlaps. Increase spacing to 8KB boundaries
to accommodate overlay sizes safely.
An upcoming commit will validate if the memory region is overlapped
Signed-off-by: Aristo Chen <aristo.c...@canonical.com>
---
arch/arm/dts/k3-am625-phycore-som-binman.dtsi | 22 +++++++++----------
arch/arm/dts/k3-am625-sk-binman.dtsi | 16 +++++++-------
.../dts/k3-am625-verdin-wifi-dev-binman.dtsi | 16 +++++++-------
arch/arm/dts/k3-am62a-phycore-som-binman.dtsi | 22 +++++++++----------
arch/arm/dts/k3-am62a-sk-binman.dtsi | 16 +++++++-------
arch/arm/dts/k3-am642-phycore-som-binman.dtsi | 6 ++---
6 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/arch/arm/dts/k3-am625-phycore-som-binman.dtsi
b/arch/arm/dts/k3-am625-phycore-som-binman.dtsi
index a9bd5a2be84..4344cefeba3 100644
--- a/arch/arm/dts/k3-am625-phycore-som-binman.dtsi
+++ b/arch/arm/dts/k3-am625-phycore-som-binman.dtsi
@@ -234,8 +234,8 @@
arch = "arm32";
compression = "none";
os = "tifsstub-fs";
- load = <0x9dc00000>;
- entry = <0x9dc00000>;
+ load = <0x9dc10000>;
+ entry = <0x9dc10000>;
blob-ext {
filename = "tifsstub.bin_fs";
};
@@ -247,8 +247,8 @@
arch = "arm32";
compression = "none";
os = "tifsstub-gp";
- load = <0x9dc00000>;
- entry = <0x9dc00000>;
+ load = <0x9dc20000>;
+ entry = <0x9dc20000>;
blob-ext {
filename = "tifsstub.bin_gp";
};
@@ -322,7 +322,7 @@
description =
"k3-am6xx-phycore-disable-spi-nor";
type = "flat_dt";
compression = "none";
- load = <0x8F001000>;
+ load = <0x8F002000>;
arch = "arm";
ti-secure {
content =
<&am6xx_phycore_disable_spi_not_dtbo>;
@@ -337,7 +337,7 @@
description =
"k3-am6xx-phycore-disable-eth-phy";
type = "flat_dt";
compression = "none";
- load = <0x8F002000>;
+ load = <0x8F004000>;
arch = "arm";
ti-secure {
content =
<&am6xx_phycore_disable_eth_phy_dtbo>;
@@ -352,7 +352,7 @@
description =
"k3-am6xx-phycore-qspi-nor";
type = "flat_dt";
compression = "none";
- load = <0x8F003000>;
+ load = <0x8F006000>;
arch = "arm";
ti-secure {
content =
<&am6xx_phycore_disable_qspi_nor_dtbo>;
@@ -479,8 +479,8 @@
arch = "arm32";
compression = "none";
os = "tifsstub-fs";
- load = <0x9dc00000>;
- entry = <0x9dc00000>;
+ load = <0x9dc10000>;
+ entry = <0x9dc10000>;
blob-ext {
filename = "tifsstub.bin_fs";
};
@@ -492,8 +492,8 @@
arch = "arm32";
compression = "none";
os = "tifsstub-gp";
- load = <0x9dc00000>;
- entry = <0x9dc00000>;
+ load = <0x9dc20000>;
+ entry = <0x9dc20000>;
blob-ext {
filename = "tifsstub.bin_gp";
};
diff --git a/arch/arm/dts/k3-am625-sk-binman.dtsi
b/arch/arm/dts/k3-am625-sk-binman.dtsi
index f743c4353b4..1619f733a0d 100644
--- a/arch/arm/dts/k3-am625-sk-binman.dtsi
+++ b/arch/arm/dts/k3-am625-sk-binman.dtsi
@@ -231,8 +231,8 @@
arch = "arm32";
compression = "none";
os = "tifsstub-fs";
- load = <0x9dc00000>;
- entry = <0x9dc00000>;
+ load = <0x9dc10000>;
+ entry = <0x9dc10000>;
blob-ext {
filename = "tifsstub.bin_fs";
};
@@ -244,8 +244,8 @@
arch = "arm32";
compression = "none";
os = "tifsstub-gp";
- load = <0x9dc00000>;
- entry = <0x9dc00000>;
+ load = <0x9dc20000>;
+ entry = <0x9dc20000>;
blob-ext {
filename = "tifsstub.bin_gp";
};
@@ -362,8 +362,8 @@
arch = "arm32";
compression = "none";
os = "tifsstub-fs";
- load = <0x9dc00000>;
- entry = <0x9dc00000>;
+ load = <0x9dc10000>;
+ entry = <0x9dc10000>;
blob-ext {
filename = "tifsstub.bin_fs";
};
@@ -375,8 +375,8 @@
arch = "arm32";
compression = "none";
os = "tifsstub-gp";
- load = <0x9dc00000>;
- entry = <0x9dc00000>;
+ load = <0x9dc20000>;
+ entry = <0x9dc20000>;
blob-ext {
filename = "tifsstub.bin_gp";
};
diff --git a/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi
b/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi
index 65fef6e4790..6c4ad72d936 100644
--- a/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi
+++ b/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi
@@ -219,8 +219,8 @@
arch = "arm32";
compression = "none";
os = "tifsstub-fs";
- load = <0x9dc00000>;
- entry = <0x9dc00000>;
+ load = <0x9dc10000>;
+ entry = <0x9dc10000>;
blob-ext {
filename = "tifsstub.bin_fs";
};
@@ -232,8 +232,8 @@
arch = "arm32";
compression = "none";
os = "tifsstub-gp";
- load = <0x9dc00000>;
- entry = <0x9dc00000>;
+ load = <0x9dc20000>;
+ entry = <0x9dc20000>;
blob-ext {
filename = "tifsstub.bin_gp";
};
@@ -346,8 +346,8 @@
arch = "arm32";
compression = "none";
os = "tifsstub-fs";
- load = <0x9dc00000>;
- entry = <0x9dc00000>;
+ load = <0x9dc10000>;
+ entry = <0x9dc10000>;
blob-ext {
filename = "tifsstub.bin_fs";
};
@@ -359,8 +359,8 @@
arch = "arm32";
compression = "none";
os = "tifsstub-gp";
- load = <0x9dc00000>;
- entry = <0x9dc00000>;
+ load = <0x9dc20000>;
+ entry = <0x9dc20000>;
blob-ext {
filename = "tifsstub.bin_gp";
};
diff --git a/arch/arm/dts/k3-am62a-phycore-som-binman.dtsi
b/arch/arm/dts/k3-am62a-phycore-som-binman.dtsi
index 9bcdf74ffe4..20e34398225 100644
--- a/arch/arm/dts/k3-am62a-phycore-som-binman.dtsi
+++ b/arch/arm/dts/k3-am62a-phycore-som-binman.dtsi
@@ -238,8 +238,8 @@
arch = "arm32";
compression = "none";
os = "tifsstub-fs";
- load = <0x9ca00000>;
- entry = <0x9ca00000>;
+ load = <0x9ca10000>;
+ entry = <0x9ca10000>;
blob-ext {
filename = "tifsstub.bin_fs";
};
@@ -251,8 +251,8 @@
arch = "arm32";
compression = "none";
os = "tifsstub-gp";
- load = <0x9ca00000>;
- entry = <0x9ca00000>;
+ load = <0x9ca20000>;
+ entry = <0x9ca20000>;
blob-ext {
filename = "tifsstub.bin_gp";
};
@@ -326,7 +326,7 @@
description =
"k3-am6xx-phycore-disable-spi-nor";
type = "flat_dt";
compression = "none";
- load = <0x8F001000>;
+ load = <0x8F002000>;
arch = "arm";
ti-secure {
content =
<&am6xx_phycore_disable_spi_not_dtbo>;
@@ -341,7 +341,7 @@
description =
"k3-am6xx-phycore-disable-eth-phy";
type = "flat_dt";
compression = "none";
- load = <0x8F002000>;
+ load = <0x8F004000>;
arch = "arm";
ti-secure {
content =
<&am6xx_phycore_disable_eth_phy_dtbo>;
@@ -356,7 +356,7 @@
description =
"k3-am6xx-phycore-qspi-nor";
type = "flat_dt";
compression = "none";
- load = <0x8F003000>;
+ load = <0x8F006000>;
arch = "arm";
ti-secure {
content =
<&am6xx_phycore_disable_qspi_nor_dtbo>;
@@ -428,8 +428,8 @@
arch = "arm32";
compression = "none";
os = "tifsstub-fs";
- load = <0x9ca00000>;
- entry = <0x9ca00000>;
+ load = <0x9ca10000>;
+ entry = <0x9ca10000>;
blob-ext {
filename = "tifsstub.bin_fs";
};
@@ -441,8 +441,8 @@
arch = "arm32";
compression = "none";
os = "tifsstub-gp";
- load = <0x9ca00000>;
- entry = <0x9ca00000>;
+ load = <0x9ca20000>;
+ entry = <0x9ca20000>;
blob-ext {
filename = "tifsstub.bin_gp";
};
diff --git a/arch/arm/dts/k3-am62a-sk-binman.dtsi
b/arch/arm/dts/k3-am62a-sk-binman.dtsi
index 0685bdd7e0c..8f66b67681b 100644
--- a/arch/arm/dts/k3-am62a-sk-binman.dtsi
+++ b/arch/arm/dts/k3-am62a-sk-binman.dtsi
@@ -222,8 +222,8 @@
arch = "arm32";
compression = "none";
os = "tifsstub-fs";
- load = <0x9ca00000>;
- entry = <0x9ca00000>;
+ load = <0x9ca10000>;
+ entry = <0x9ca10000>;
blob-ext {
filename = "tifsstub.bin_fs";
};
@@ -235,8 +235,8 @@
arch = "arm32";
compression = "none";
os = "tifsstub-gp";
- load = <0x9ca00000>;
- entry = <0x9ca00000>;
+ load = <0x9ca20000>;
+ entry = <0x9ca20000>;
blob-ext {
filename = "tifsstub.bin_gp";
};
@@ -351,8 +351,8 @@
arch = "arm32";
compression = "none";
os = "tifsstub-fs";
- load = <0x9ca00000>;
- entry = <0x9ca00000>;
+ load = <0x9ca10000>;
+ entry = <0x9ca10000>;
blob-ext {
filename = "tifsstub.bin_fs";
};
@@ -364,8 +364,8 @@
arch = "arm32";
compression = "none";
os = "tifsstub-gp";
- load = <0x9ca00000>;
- entry = <0x9ca00000>;
+ load = <0x9ca20000>;
+ entry = <0x9ca20000>;
blob-ext {
filename = "tifsstub.bin_gp";
};
diff --git a/arch/arm/dts/k3-am642-phycore-som-binman.dtsi
b/arch/arm/dts/k3-am642-phycore-som-binman.dtsi
index 966905bd64d..59d8902bf48 100644
--- a/arch/arm/dts/k3-am642-phycore-som-binman.dtsi
+++ b/arch/arm/dts/k3-am642-phycore-som-binman.dtsi
@@ -371,7 +371,7 @@
description =
"k3-am6xx-phycore-disable-spi-nor";
type = "flat_dt";
compression = "none";
- load = <0x8F001000>;
+ load = <0x8F002000>;
arch = "arm";
ti-secure {
content =
<&am6xx_phycore_disable_spi_not_dtbo>;
@@ -386,7 +386,7 @@
description =
"k3-am6xx-phycore-disable-eth-phy";
type = "flat_dt";
compression = "none";
- load = <0x8F002000>;
+ load = <0x8F004000>;
arch = "arm";
ti-secure {
content =
<&am6xx_phycore_disable_eth_phy_dtbo>;
@@ -401,7 +401,7 @@
description =
"k3-am6xx-phycore-qspi-nor";
type = "flat_dt";
compression = "none";
- load = <0x8F003000>;
+ load = <0x8F006000>;
arch = "arm";
ti-secure {
content =
<&am6xx_phycore_disable_qspi_nor_dtbo>;
--
2.43.0
