summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorAlper Nebi Yasak <alpernebiyasak@gmail.com>2022-06-18 15:13:12 +0300
committerSimon Glass <sjg@chromium.org>2022-06-28 03:09:52 +0100
commit6516c9b349b3272c6c9cb7a4bdcfdef617d9f4ee (patch)
tree1d63baec6c7638b2fb2804aa8b4242f98f0afe10 /common
parent367ecbf2d3b1c16a3b98b9f6430b8197d2bddbf9 (diff)
spl: binman: Disable u_boot_any symbols for i.MX8M boards
The i.MX8M boards use partially specified binman images which have an SPL entry without a U-Boot entry. This would normally cause an error due to the 'u_boot_any' binman symbols declared by BINMAN_UBOOT_SYMBOLS requiring a U-Boot-like entry in the same image as the SPL. However, a problem in the ARMv8 __image_copy_start symbol definition effectively disables binman from attempting to write any symbols at all, so everything appears to work fine until runtime. A future patch fixes the issue in the linker scripts, which lets binman fill in the symbols, which would result in the build error described above. Explicitly disable the 'u_boot_any' symbols for i.MX8M boards. They are already effectively unusable, and they are incompatible with the boards' current binman image descriptions. Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Diffstat (limited to 'common')
-rw-r--r--common/spl/Kconfig1
-rw-r--r--common/spl/Kconfig.tpl1
-rw-r--r--common/spl/Kconfig.vpl1
3 files changed, 3 insertions, 0 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 46d9be73bb..152569ee43 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -200,6 +200,7 @@ config SPL_BINMAN_SYMBOLS
config SPL_BINMAN_UBOOT_SYMBOLS
bool "Declare binman symbols for U-Boot phases in SPL"
depends on SPL_BINMAN_SYMBOLS
+ default n if ARCH_IMX8M
default y
help
This enables use of symbols in SPL which refer to U-Boot phases,
diff --git a/common/spl/Kconfig.tpl b/common/spl/Kconfig.tpl
index 8c59c76730..e314b793a2 100644
--- a/common/spl/Kconfig.tpl
+++ b/common/spl/Kconfig.tpl
@@ -23,6 +23,7 @@ config TPL_BINMAN_SYMBOLS
config TPL_BINMAN_UBOOT_SYMBOLS
bool "Declare binman symbols for U-Boot phases in TPL"
depends on TPL_BINMAN_SYMBOLS
+ default n if ARCH_IMX8M
default y
help
This enables use of symbols in TPL which refer to U-Boot phases,
diff --git a/common/spl/Kconfig.vpl b/common/spl/Kconfig.vpl
index daec0bb7bf..ba4b2e4f99 100644
--- a/common/spl/Kconfig.vpl
+++ b/common/spl/Kconfig.vpl
@@ -213,6 +213,7 @@ config VPL_BINMAN_SYMBOLS
config VPL_BINMAN_UBOOT_SYMBOLS
bool "Declare binman symbols for U-Boot phases in VPL"
depends on VPL_BINMAN_SYMBOLS
+ default n if ARCH_IMX8M
default y
help
This enables use of symbols in VPL which refer to U-Boot phases,