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>

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 46d9be73bb1fb54ad88a5798ef56aeaf2671f0a7..152569ee43500625f12f3f898fd85738be0303dc 100644 (file)
--- 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 8c59c767302f1e239c173f241b8bb438271e2a7a..e314b793a2e94714705cdc7e0e3bde60edcbc7e8 100644 (file)
--- 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 daec0bb7bfff59cdfe1132542e45ce4a18a6c7b4..ba4b2e4f99e9c1aaedac1bf2c3f33f05f4d9e248 100644 (file)
--- 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,