spl: use different BOARD_INIT MACRO for spl and tpl

[u-boot] / common / spl / Kconfig

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index b1ee15c96d130b24e6e64cd38a956b8bd8cb251a..e1b91f5d895c30a55642a6cddf2ef5520e081d23 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -232,7 +232,6 @@ config SPL_FIT_IMAGE_TINY
        bool "Remove functionality from SPL FIT loading to reduce size"
        depends on SPL_FIT
        default y if MACH_SUN50I || MACH_SUN50I_H5
        bool "Remove functionality from SPL FIT loading to reduce size"
        depends on SPL_FIT
        default y if MACH_SUN50I || MACH_SUN50I_H5

-       default y if ARCH_OMAP2PLUS

        help
          Enable this to reduce the size of the FIT image loading code
          in SPL, if space for the SPL binary is very tight.
        help
          Enable this to reduce the size of the FIT image loading code
          in SPL, if space for the SPL binary is very tight.


@@ -302,6 +301,7 @@ config SPL_ENV_SUPPORT
 config SPL_SAVEENV
        bool "Support save environment"
        depends on SPL_ENV_SUPPORT
 config SPL_SAVEENV
        bool "Support save environment"
        depends on SPL_ENV_SUPPORT

+       select SPL_MMC_WRITE if ENV_IS_IN_MMC

        help
          Enable save environment support in SPL after setenv. By default
          the saveenv option is not provided in SPL, but some boards need
        help
          Enable save environment support in SPL after setenv. By default
          the saveenv option is not provided in SPL, but some boards need


@@ -416,6 +416,14 @@ config SPL_MMC_SUPPORT
          this option to build the drivers in drivers/mmc as part of an SPL
          build.
 
          this option to build the drivers in drivers/mmc as part of an SPL
          build.
 

+config SPL_MMC_WRITE
+       bool "MMC/SD/SDIO card support for write operations in SPL"
+       depends on SPL_MMC_SUPPORT
+       default n
+       help
+         Enable write access to MMC and SD Cards in SPL
+
+

 config SPL_MPC8XXX_INIT_DDR_SUPPORT
        bool "Support MPC8XXX DDR init"
        help
 config SPL_MPC8XXX_INIT_DDR_SUPPORT
        bool "Support MPC8XXX DDR init"
        help


@@ -722,10 +730,24 @@ config SPL_ATF
        bool "Support ARM Trusted Firmware"
        depends on ARM64
        help
        bool "Support ARM Trusted Firmware"
        depends on ARM64
        help

-         ATF(ARM Trusted Firmware) is a component for ARM arch64 which
-         is loaded by SPL(which is considered as BL2 in ATF terminology).
+         ATF(ARM Trusted Firmware) is a component for ARM AArch64 which
+         is loaded by SPL (which is considered as BL2 in ATF terminology).

          More detail at: https://github.com/ARM-software/arm-trusted-firmware
 
          More detail at: https://github.com/ARM-software/arm-trusted-firmware
 

+config SPL_ATF_NO_PLATFORM_PARAM
+        bool "Pass no platform parameter"
+       depends on SPL_ATF
+       help
+         While we expect to call a pointer to a valid FDT (or NULL)
+         as the platform parameter to an ATF, some ATF versions are
+         not U-Boot aware and have an insufficiently robust parameter
+         validation to gracefully reject a FDT being passed.
+
+         If this option is enabled, the spl_atf os-type handler will
+         always pass NULL for the platform parameter.
+
+         If your ATF is affected, say Y.
+

 config TPL
        bool
        depends on SUPPORT_TPL
 config TPL
        bool
        depends on SUPPORT_TPL


@@ -735,6 +757,13 @@ config TPL
 
 if TPL
 
 
 if TPL
 

+config TPL_BOARD_INIT
+       bool "Call board-specific initialization in TPL"
+       help
+         If this option is enabled, U-Boot will call the function
+         spl_board_init() from board_init_r(). This function should be
+         provided by the board.
+

 config TPL_LDSCRIPT
         string "Linker script for the TPL stage"
        depends on TPL
 config TPL_LDSCRIPT
         string "Linker script for the TPL stage"
        depends on TPL