Skip to contentSkip to conversation

kontron-sl-mx8mm: change environment address variables

PATCH Superseded Heiko Thiery 2 participants 2 messages Feb 16, 2022

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kontron-sl-mx8mm: change environment address variables

Currently the space between kernel_addr_r and the fdt_addr_r is only 32MB. To have enought space to load kernel images bigger than 32MB change the varialbes to a feasable value.

The new environment variables layout is based on the scheme from "include/configs/ti_armv7_common.h".

The CONFIG_SYS_LOAD_ADDR value is set to 0x42000000.

---
 configs/kontron-sl-mx8mm_defconfig |  2 +-
 include/configs/kontron-sl-mx8mm.h | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)
configs/kontron-sl-mx8mm_defconfig +1 -1
index 940bf07a92..030e2251e7 100644
@@ -20,7 +20,7 @@ CONFIG_SPL_SERIAL=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SPL=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x40480000
+CONFIG_SYS_LOAD_ADDR=0x42000000
 CONFIG_FIT=y
 CONFIG_FIT_EXTERNAL_OFFSET=0x3000
 CONFIG_SPL_LOAD_FIT=y
include/configs/kontron-sl-mx8mm.h +10 -5
index d1e87f97d6..0af6a9ab30 100644
@@ -67,15 +67,20 @@
 
 #define FEC_QUIRK_ENET_MAC
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define ENV_MEM_LAYOUT_SETTINGS \
+	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 	"kernel_addr_r=0x42000000\0" \
-	"fdt_addr_r=0x44000000\0" \
-	"ramdisk_addr_r=0x46400000\0" \
-	"pxefile_addr_r=0x46000000\0" \
-	"scriptaddr=0x46000000\0" \
+	"fdt_addr_r=0x48000000\0" \
+	"fdtoverlay_addr_r=0x49000000\0" \
+	"ramdisk_addr_r=0x48080000\0" \
+	"scriptaddr=0x40000000\0"\
+	"pxefile_addr_r=0x40100000\0" \
+
+#define CONFIG_EXTRA_ENV_SETTINGS \
 	"dfu_alt_info=sf 0:0=flash-bin raw 0x400 0x1f0000\0" \
 	"bootdelay=3\0" \
 	"hostname=" CONFIG_HOSTNAME "\0" \
+	ENV_MEM_LAYOUT_SETTINGS \
 	BOOTENV
 
 #endif /* __KONTRON_MX8MM_CONFIG_H */
Signature · 1 line
2.30.2
Reviewed-by on v1 1/1
#1 lore raw

Am 2022-02-16 09:12, schrieb Heiko Thiery:

Quoted 3 lines

Currently the space between kernel_addr_r and the fdt_addr_r is only 32MB. To have enought space to load kernel images bigger than 32MB change the varialbes to a feasable value.

variables, feasible

Quoted 4 lines

The new environment variables layout is based on the scheme from "include/configs/ti_armv7_common.h".

The CONFIG_SYS_LOAD_ADDR value is set to 0x42000000.

reason is missing though, i can already tell from the patch :)

Quoted 32 lines
---
 configs/kontron-sl-mx8mm_defconfig |  2 +-
 include/configs/kontron-sl-mx8mm.h | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)
configs/kontron-sl-mx8mm_defconfig +1 -1
index 940bf07a92..030e2251e7 100644
@@ -20,7 +20,7 @@ CONFIG_SPL_SERIAL=y
 CONFIG_BOOTCOUNT_BOOTLIMIT=3
 CONFIG_SPL=y
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_LOAD_ADDR=0x40480000
+CONFIG_SYS_LOAD_ADDR=0x42000000
 CONFIG_FIT=y
 CONFIG_FIT_EXTERNAL_OFFSET=0x3000
 CONFIG_SPL_LOAD_FIT=y
include/configs/kontron-sl-mx8mm.h +2 -1
index d1e87f97d6..0af6a9ab30 100644
@@ -67,15 +67,20 @@
 
 #define FEC_QUIRK_ENET_MAC
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define ENV_MEM_LAYOUT_SETTINGS \
+	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \

include/configs/kontron-sl-mx8mm.h line 77

Quoted 10 lines
include/configs/kontron-sl-mx8mm.h +5 -4
 	"kernel_addr_r=0x42000000\0" \
-	"fdt_addr_r=0x44000000\0" \
-	"ramdisk_addr_r=0x46400000\0" \
-	"pxefile_addr_r=0x46000000\0" \
-	"scriptaddr=0x46000000\0" \
+	"fdt_addr_r=0x48000000\0" \
+	"fdtoverlay_addr_r=0x49000000\0" \
+	"ramdisk_addr_r=0x48080000\0" \
+	"scriptaddr=0x40000000\0"\
+	"pxefile_addr_r=0x40100000\0" \

drop the \ at the end of the line.

include/configs/kontron-sl-mx8mm.h line 86

Quoted 9 lines
include/configs/kontron-sl-mx8mm.h +3 -0
+
+#define CONFIG_EXTRA_ENV_SETTINGS \
 	"dfu_alt_info=sf 0:0=flash-bin raw 0x400 0x1f0000\0" \
 	"bootdelay=3\0" \
 	"hostname=" CONFIG_HOSTNAME "\0" \
+	ENV_MEM_LAYOUT_SETTINGS \
 	BOOTENV
 
 #endif /* __KONTRON_MX8MM_CONFIG_H */

With that fixed:

Signature · 1 line
-michael