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 3c887b34050a603df3706bcf1e1dca6e11dbc280..e1b91f5d895c30a55642a6cddf2ef5520e081d23 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -94,6 +94,7 @@ config SPL_STACK_R
 config SPL_STACK_R_ADDR
        depends on SPL_STACK_R
        hex "SDRAM location for SPL stack"
 config SPL_STACK_R_ADDR
        depends on SPL_STACK_R
        hex "SDRAM location for SPL stack"

+       default 0x82000000 if ARCH_OMAP2PLUS

        help
          Specify the address in SDRAM for the SPL stack. This will be set up
          before board_init_r() is called.
        help
          Specify the address in SDRAM for the SPL stack. This will be set up
          before board_init_r() is called.


@@ -141,11 +142,12 @@ config SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR
        default 0x50 if ARCH_SUNXI
        default 0x75 if ARCH_DAVINCI
        default 0x8a if ARCH_MX6
        default 0x50 if ARCH_SUNXI
        default 0x75 if ARCH_DAVINCI
        default 0x8a if ARCH_MX6

-       default 0x100 if ARCH_ROCKCHIP || ARCH_UNIPHIER
+       default 0x100 if ARCH_UNIPHIER

        default 0x140 if ARCH_MVEBU
        default 0x200 if ARCH_SOCFPGA || ARCH_AT91
        default 0x300 if ARCH_ZYNQ || ARCH_KEYSTONE || OMAP34XX || OMAP44XX || \
                         OMAP54XX || AM33XX || AM43XX
        default 0x140 if ARCH_MVEBU
        default 0x200 if ARCH_SOCFPGA || ARCH_AT91
        default 0x300 if ARCH_ZYNQ || ARCH_KEYSTONE || OMAP34XX || OMAP44XX || \
                         OMAP54XX || AM33XX || AM43XX

+       default 0x4000 if ARCH_ROCKCHIP

        help
          Address on the MMC to load U-Boot from, when the MMC is being used
          in raw mode. Units: MMC sectors (1 sector = 512 bytes).
        help
          Address on the MMC to load U-Boot from, when the MMC is being used
          in raw mode. Units: MMC sectors (1 sector = 512 bytes).


@@ -226,6 +228,21 @@ config SPL_SHA256_SUPPORT
          SHA256 variant is supported: SHA512 and others are not currently
          supported in U-Boot.
 
          SHA256 variant is supported: SHA512 and others are not currently
          supported in U-Boot.
 

+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
+       help
+         Enable this to reduce the size of the FIT image loading code
+         in SPL, if space for the SPL binary is very tight.
+
+         This removes the detection of image types (which forces the
+         first image to be treated as having a U-Boot style calling
+         convention) and skips the recording of each loaded payload
+         (i.e. loadable) into the FDT (modifying the loaded FDT to
+         ensure this information is available to the next image
+         invoked).
+

 config SPL_CPU_SUPPORT
        bool "Support CPU drivers"
        help
 config SPL_CPU_SUPPORT
        bool "Support CPU drivers"
        help


@@ -278,12 +295,13 @@ config SPL_ENV_SUPPORT
          needed in SPL as it has a much simpler task with less
          configuration. But some boards use this to support 'Falcon' boot
          on EXT2 and FAT, where SPL boots directly into Linux without
          needed in SPL as it has a much simpler task with less
          configuration. But some boards use this to support 'Falcon' boot
          on EXT2 and FAT, where SPL boots directly into Linux without

-         starting U-Boot first. Enabling this option will make getenv()
+         starting U-Boot first. Enabling this option will make env_get()

          and env_set() available in SPL.
 
 config SPL_SAVEENV
        bool "Support save environment"
        depends on SPL_ENV_SUPPORT
          and env_set() available in SPL.
 
 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


@@ -398,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


@@ -603,6 +629,14 @@ config SPL_SPI_SUPPORT
          enable SPI drivers that are needed for other purposes also, such
          as a SPI PMIC.
 
          enable SPI drivers that are needed for other purposes also, such
          as a SPI PMIC.
 

+config SPL_THERMAL
+       bool "Driver support for thermal devices"
+       help
+         Enable support for temperature-sensing devices. Some SoCs have on-chip
+         temperature sensors to permit warnings, speed throttling or even
+         automatic power-off when the temperature gets too high or low. Other
+         devices may be discrete but connected on a suitable bus.
+

 config SPL_USB_HOST_SUPPORT
        bool "Support USB host drivers"
        help
 config SPL_USB_HOST_SUPPORT
        bool "Support USB host drivers"
        help


@@ -668,6 +702,12 @@ config SPL_DFU_RAM
 
 endchoice
 
 
 endchoice
 

+config SPL_USB_SDP_SUPPORT
+       bool "Support SDP (Serial Download Protocol)"
+       help
+         Enable Serial Download Protocol (SDP) device support in SPL. This
+         allows to download images into memory and execute (jump to) them
+         using the same protocol as implemented by the i.MX family's boot ROM.

 endif
 
 config SPL_WATCHDOG_SUPPORT
 endif
 
 config SPL_WATCHDOG_SUPPORT


@@ -686,19 +726,27 @@ config SPL_YMODEM_SUPPORT
          means of transmitting U-Boot over a serial line for using in SPL,
          with a checksum to ensure correctness.
 
          means of transmitting U-Boot over a serial line for using in SPL,
          with a checksum to ensure correctness.
 

-config SPL_ATF_SUPPORT
+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 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_TEXT_BASE
-       depends on SPL_ATF_SUPPORT
-       hex "ATF BL31 base address"
+config SPL_ATF_NO_PLATFORM_PARAM
+        bool "Pass no platform parameter"
+       depends on SPL_ATF

        help
        help

-         This is the base address in memory for ATF BL31 text and entry point.
+         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
 
 config TPL
        bool


@@ -709,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