From c09d517e8ce299b6dfd6baa2261bc329d15fde66 Mon Sep 17 00:00:00 2001 From: Florin Sarbu Date: Fri, 14 Jun 2024 14:24:13 +0000 Subject: [PATCH] u-boot: Fixes for kirkstone update With the move to kirkstone we need further fixes related to upstream BSP u-boot config changes. We disable CONFIG_ENV_IS_IN_MMC as we do not use it and it also throws a compile error. Additionaly, we remove the disabling of CONFIG_CMD_SAVEENV from here as it is already disabled globally from meta-balena. And last, we update the bootscript by increasing the fdt load address in order to account for increased kernel size. Signed-off-by: Florin Sarbu --- .../recipes-bsp/u-boot/files/balenaos_tweaks-imx.cfg | 2 +- .../recipes-bsp/u-boot/files/balenaos_tweaks.cfg | 2 +- .../u-boot/files/bootscript-n8mm-allow-flashing-balenaOS.patch | 2 +- .../files/bootscript-n8mm-dwe-Integrate-with-BalenaOS.patch | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/balenaos_tweaks-imx.cfg b/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/balenaos_tweaks-imx.cfg index 98664b73..6ee2f592 100644 --- a/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/balenaos_tweaks-imx.cfg +++ b/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/balenaos_tweaks-imx.cfg @@ -1,3 +1,3 @@ CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_IS_NOWHERE=y -CONFIG_CMD_SAVEENV=n +CONFIG_ENV_IS_IN_MMC=n diff --git a/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/balenaos_tweaks.cfg b/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/balenaos_tweaks.cfg index 1db0a028..50de8a43 100644 --- a/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/balenaos_tweaks.cfg +++ b/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/balenaos_tweaks.cfg @@ -1,4 +1,4 @@ CONFIG_ENV_SIZE=0x3000 CONFIG_ENV_IS_NOWHERE=y -CONFIG_CMD_SAVEENV=n CONFIG_USB_FUNCTION_FASTBOOT=n +CONFIG_ENV_IS_IN_MMC=n diff --git a/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/bootscript-n8mm-allow-flashing-balenaOS.patch b/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/bootscript-n8mm-allow-flashing-balenaOS.patch index a86db0d4..e8c2576b 100644 --- a/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/bootscript-n8mm-allow-flashing-balenaOS.patch +++ b/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/bootscript-n8mm-allow-flashing-balenaOS.patch @@ -21,7 +21,7 @@ index 92f3cbae46..63d49fb479 100644 setexpr a_script ${a_base} + 0x00800000 setexpr a_zImage ${a_base} + 0x00800000 -setexpr a_fdt ${a_base} + 0x03000000 -+setexpr a_fdt ${a_base} + 0x03200000 ++setexpr a_fdt ${a_base} + 0x03300000 setexpr a_initrd ${a_base} + 0x03100000 setexpr a_reset_cause_marker ${a_base} + 0x80 setexpr a_reset_cause ${a_base} + 0x84 diff --git a/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/bootscript-n8mm-dwe-Integrate-with-BalenaOS.patch b/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/bootscript-n8mm-dwe-Integrate-with-BalenaOS.patch index 533a4813..a5383563 100644 --- a/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/bootscript-n8mm-dwe-Integrate-with-BalenaOS.patch +++ b/layers/meta-balena-fsl-arm/recipes-bsp/u-boot/files/bootscript-n8mm-dwe-Integrate-with-BalenaOS.patch @@ -18,7 +18,7 @@ index 92f3cbae46..7677ed65f2 100644 setexpr a_script ${a_base} + 0x00800000 setexpr a_zImage ${a_base} + 0x00800000 -setexpr a_fdt ${a_base} + 0x03000000 -+setexpr a_fdt ${a_base} + 0x03200000 ++setexpr a_fdt ${a_base} + 0x03300000 setexpr a_initrd ${a_base} + 0x03100000 setexpr a_reset_cause_marker ${a_base} + 0x80 setexpr a_reset_cause ${a_base} + 0x84