diff options
Diffstat (limited to 'common/spl/Kconfig')
| -rw-r--r-- | common/spl/Kconfig | 42 |
1 files changed, 30 insertions, 12 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index f34b96efc02..24d6ce5d739 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -12,7 +12,7 @@ config SPL_DFU_NO_RESET config SPL bool "Enable SPL" - depends on SUPPORT_SPL + depends on SUPPORT_SPL && !COMPILE_TEST help If you want to build SPL as well as the normal image, say Y. @@ -176,7 +176,7 @@ config SPL_SYS_STACK_F_CHECK_BYTE Constant used to check the stack config SPL_SYS_REPORT_STACK_F_USAGE - depends on SPL_SIZE_LIMIT_PROVIDE_STACK != 0 + depends on SPL_SIZE_LIMIT_PROVIDE_STACK > 0 bool "Check and report stack usage in SPL before relocation" help If this option is enabled, the initial SPL stack is filled with 0xaa @@ -796,6 +796,7 @@ config SPL_FS_LOAD_PAYLOAD_NAME config SPL_FS_LOAD_KERNEL_NAME string "File to load for the OS kernel from the filesystem" depends on (SPL_FS_EXT4 || SPL_FS_FAT || SPL_FS_SQUASHFS) && SPL_OS_BOOT + default "fitImage" if SPL_OS_BOOT_SECURE default "uImage" help Filename to read to load for the OS kernel when reading from the @@ -803,7 +804,7 @@ config SPL_FS_LOAD_KERNEL_NAME config SPL_FS_LOAD_ARGS_NAME string "File to load for the OS kernel argument parameters from the filesystem" - depends on (SPL_FS_EXT4 || SPL_FS_FAT || SPL_FS_SQUASHFS) && SPL_OS_BOOT + depends on (SPL_FS_EXT4 || SPL_FS_FAT || SPL_FS_SQUASHFS) && SPL_OS_BOOT_ARGS default "args" help Filename to read to load for the OS kernel argument parameters from @@ -1121,7 +1122,7 @@ config SPL_UBI_LOAD_KERNEL_ID config SPL_UBI_LOAD_ARGS_ID int "id of kernel args volume" - depends on SPL_OS_BOOT + depends on SPL_OS_BOOT_ARGS help The UBI volume id from which to load the device tree @@ -1202,13 +1203,30 @@ config SPL_ONENAND_SUPPORT config SPL_OS_BOOT bool "Activate Falcon Mode" depends on !TI_SECURE_DEVICE + depends on ARM || MICROBLAZE || PPC help Enable booting directly to an OS from SPL. for more info read doc/README.falcon +config SPL_OS_BOOT_SECURE + bool "Allow Falcon Mode on secure devices" + depends on SPL_OS_BOOT + help + This allows for secure devices with signature verification capabilities + to use falcon mode by disabling certain inherently non-securable options + in the SPL boot flow. + +config SPL_OS_BOOT_ARGS + bool "Allow SPL to load args for kernel in falcon mode" + depends on (SPL_OS_BOOT || SPL_LOAD_FIT_OPENSBI_OS_BOOT) && !SPL_OS_BOOT_SECURE + default y if !SPL_OS_BOOT_SECURE + help + This option enables the SPL to load an args file (usually the FDT) + alongside the kernel image in falcon boot mode. + config SPL_PAYLOAD_ARGS_ADDR hex "Address in memory to load 'args' file for Falcon Mode to" - depends on SPL_OS_BOOT || SPL_LOAD_FIT_OPENSBI_OS_BOOT + depends on SPL_OS_BOOT_ARGS default 0x88000000 if ARCH_OMAP2PLUS default 0x99000000 if ARCH_SC5XX && SC59X_64 default 0xA0000000 if ARCH_SC5XX && TARGET_SC594_SOM_EZKIT @@ -1248,7 +1266,7 @@ config SYS_MMCSD_RAW_MODE_KERNEL_SECTOR config SYS_MMCSD_RAW_MODE_ARGS_SECTOR hex "Falcon mode: Sector to load 'args' from MMC" - depends on SPL_FALCON_BOOT_MMCSD + depends on SPL_FALCON_BOOT_MMCSD && SPL_OS_BOOT_ARGS help When Falcon mode is used with an MMC or SD media, SPL needs to know where to look for the OS 'args', typically a device tree. The @@ -1258,7 +1276,7 @@ config SYS_MMCSD_RAW_MODE_ARGS_SECTOR config SYS_MMCSD_RAW_MODE_ARGS_SECTORS hex "Falcon mode: Number of sectors to load for 'args' from MMC" - depends on SPL_FALCON_BOOT_MMCSD && SYS_MMCSD_RAW_MODE_ARGS_SECTOR != 0x0 + depends on SPL_FALCON_BOOT_MMCSD && SPL_OS_BOOT_ARGS config SPL_PAYLOAD string "SPL payload" @@ -1494,14 +1512,14 @@ config SYS_SPI_KERNEL_OFFS config SYS_SPI_ARGS_OFFS hex "Falcon mode: address of args payload in SPI flash" - depends on SPL_SPI_FLASH_SUPPORT && SPL_OS_BOOT + depends on SPL_SPI_FLASH_SUPPORT && SPL_OS_BOOT_ARGS help Address within SPI-Flash from where the args payload (usually the dtb) is fetched in falcon boot. config SYS_SPI_ARGS_SIZE hex "Falcon mode: size of args payload in SPI flash" - depends on SPL_SPI_FLASH_SUPPORT && SPL_OS_BOOT + depends on SPL_SPI_FLASH_SUPPORT && SPL_OS_BOOT_ARGS config SPL_THERMAL bool "Driver support for thermal devices" @@ -1572,7 +1590,7 @@ config SPL_AM33XX_ENABLE_RTC32K_OSC config SPL_OPTEE_IMAGE bool "Support OP-TEE Trusted OS image in SPL" depends on ARM - depends on SPL_LOAD_FIT || SPL_LOAD_FIT_FULL + depends on SPL_LOAD_FIT help OP-TEE is an open source Trusted OS which is loaded by SPL. More detail at: https://github.com/OP-TEE/optee_os @@ -1628,7 +1646,7 @@ config SPL_AT91_MCK_BYPASS endmenu config TPL - depends on SUPPORT_TPL + depends on SUPPORT_TPL && !COMPILE_TEST bool "Enable TPL" help If you want to build TPL as well as the normal image and SPL, say Y. @@ -1636,7 +1654,7 @@ config TPL source "common/spl/Kconfig.tpl" config VPL - depends on SUPPORT_SPL + depends on SUPPORT_SPL && !COMPILE_TEST bool "Enable VPL" help If you want to build VPL as well as the normal image, TPL and SPL, |