diff options
| author | Tom Rini <[email protected]> | 2024-08-19 18:24:58 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-08-19 18:24:58 -0600 |
| commit | 158cf0270cb6691bc7f58fbeb4c6b8b603957bfe (patch) | |
| tree | 0e2cfa0d2d6e3dd24e72d5cd29caba5b4b51e01d /common | |
| parent | aa2efb08732aa4daded61fca8e488eb211b28ce4 (diff) | |
| parent | d11a60610e17373331ad17b6c5c31735cf9fffa8 (diff) | |
Merge tag 'v2024.10-rc3' into next
Prepare v2024.10-rc3
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/Kconfig | 2 | ||||
| -rw-r--r-- | common/spl/Kconfig.tpl | 2 | ||||
| -rw-r--r-- | common/spl/Kconfig.vpl | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 3fd113d776b..44a68abce60 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -207,7 +207,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 || ARCH_IMX9 + default n if ARCH_IMX8M || ARCH_IMX8ULP || ARCH_IMX9 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 4ee3b9b826d..92d4d43ec87 100644 --- a/common/spl/Kconfig.tpl +++ b/common/spl/Kconfig.tpl @@ -23,7 +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 || ARCH_IMX9 + default n if ARCH_IMX8M || ARCH_IMX8ULP || ARCH_IMX9 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 f1993026bba..d06f36d4ee4 100644 --- a/common/spl/Kconfig.vpl +++ b/common/spl/Kconfig.vpl @@ -243,7 +243,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 || ARCH_IMX9 + default n if ARCH_IMX8M || ARCH_IMX8ULP || ARCH_IMX9 default y help This enables use of symbols in VPL which refer to U-Boot phases, |