-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Reworked 0002-fixup-imx8mm-evk-fdt-addr.patch, 0003-add-imx8mm-resin-hooks.patch and bundled these 2 patches into 0001-imx8mm-lpddr4-evk-Integrate-with-BalenaOS.patch Reworked 0002-fix-return-vaue-propagatin-out-of-environ.patch Signed-off-by: Florin Sarbu <florin@balena.io>
- Loading branch information
Showing
5 changed files
with
127 additions
and
89 deletions.
There are no files selected for viewing
62 changes: 62 additions & 0 deletions
62
...ena-fsl-arm/recipes-bsp/u-boot/files/0001-imx8mm-lpddr4-evk-Integrate-with-BalenaOS.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
From 2e8da1984b3715ff0f5ccd836d1f7ce1178eeec8 Mon Sep 17 00:00:00 2001 | ||
From: Florin Sarbu <florin@balena.io> | ||
Date: Tue, 18 Jun 2024 13:08:35 +0000 | ||
Subject: [PATCH] imx8mm-lpddr4-evk: Integrate with BalenaOS | ||
|
||
Signed-off-by: Florin Sarbu <florin@balena.io> | ||
--- | ||
include/configs/imx8mm_evk.h | 15 +++++++++------ | ||
1 file changed, 9 insertions(+), 6 deletions(-) | ||
|
||
diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h | ||
index 3d992ffa134..cbd53f2df9b 100644 | ||
--- a/include/configs/imx8mm_evk.h | ||
+++ b/include/configs/imx8mm_evk.h | ||
@@ -130,8 +130,8 @@ | ||
"image=Image\0" \ | ||
"splashimage=0x50000000\0" \ | ||
"console=ttymxc1,115200\0" \ | ||
- "fdt_addr_r=0x43000000\0" \ | ||
- "fdt_addr=0x43000000\0" \ | ||
+ "fdt_addr_r=0x44000000\0" \ | ||
+ "fdt_addr=0x44000000\0" \ | ||
"fdt_high=0xffffffffffffffff\0" \ | ||
"boot_fit=no\0" \ | ||
"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ | ||
@@ -140,19 +140,21 @@ | ||
"mmcpart=1\0" \ | ||
"mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ | ||
"mmcautodetect=yes\0" \ | ||
- "mmcargs=setenv bootargs ${jh_clk} ${mcore_clk} console=${console} root=${mmcroot}\0 " \ | ||
+ "mmcargs=setenv bootargs ${jh_clk} ${mcore_clk} console=${console} ${resin_kernel_root} ${os_cmdline}\0 " \ | ||
"loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${bsp_script};\0" \ | ||
"bootscript=echo Running bootscript from mmc ...; " \ | ||
"source\0" \ | ||
- "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ | ||
- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdtfile}\0" \ | ||
+ "loadimage=if load ${resin_dev_type} ${resin_dev_index}:${resin_root_part} ${loadaddr} boot/${image}; then run balena_kernel_load_crc_save; else false; fi;\0" \ | ||
+ "loadfdt=if load ${resin_dev_type} ${resin_dev_index}:${resin_root_part} ${fdt_addr} boot/${fdtfile}; then run balena_fdt_load_crc_save; else false; fi;\0" \ | ||
"mmcboot=echo Booting from mmc ...; " \ | ||
"run mmcargs; " \ | ||
"if test ${boot_fit} = yes || test ${boot_fit} = try; then " \ | ||
"bootm ${loadaddr}; " \ | ||
"else " \ | ||
"if run loadfdt; then " \ | ||
- "booti ${loadaddr} - ${fdt_addr_r}; " \ | ||
+ "run balena_kernel_load_crc_check;" \ | ||
+ "run balena_fdt_load_crc_check;" \ | ||
+ "booti ${loadaddr} - ${fdt_addr}; " \ | ||
"else " \ | ||
"echo WARN: Cannot load the DT; " \ | ||
"fi; " \ | ||
@@ -178,6 +180,7 @@ | ||
"fi; " \ | ||
"fi;\0" \ | ||
"bsp_bootcmd=echo Running BSP bootcmd ...; " \ | ||
+ "setenv resin_kernel_load_addr ${loadaddr}; run resin_set_kernel_root; run set_os_cmdline; " \ | ||
"mmc dev ${mmcdev}; if mmc rescan; then " \ | ||
"if run loadbootscript; then " \ | ||
"run bootscript; " \ | ||
-- | ||
2.17.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 0 additions & 14 deletions
14
layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/0002-fixup-imx8mm-evk-fdt-addr.patch
This file was deleted.
Oops, something went wrong.
36 changes: 0 additions & 36 deletions
36
layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/0003-add-imx8mm-resin-hooks.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters