Skip to content

Commit

Permalink
u-boot: Fixes for kirkstone update
Browse files Browse the repository at this point in the history
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 <florin@balena.io>
  • Loading branch information
floion committed Jun 18, 2024
1 parent eb3ec05 commit c09d517
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CONFIG_ENV_SIZE=0x4000
CONFIG_ENV_IS_NOWHERE=y
CONFIG_CMD_SAVEENV=n
CONFIG_ENV_IS_IN_MMC=n
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c09d517

Please sign in to comment.