diff options
author | Tom Rini <trini@konsulko.com> | 2020-01-03 09:48:47 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-01-03 09:48:47 -0500 |
commit | 8fbbec12f7d2c18f8883f3371cfca74a98b5dd87 (patch) | |
tree | a0e6f0bd143fa9baefe2c927b7fe089ebe8d51d7 /common | |
parent | 87f69f467a8335b171c71bf217d2625d515acd7c (diff) | |
parent | 63618e71e89b3fc669d56bcb4389e70a6b3a4ea8 (diff) |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq into next
- updates and fixes on ls1028a, lx2, ls1046a, MC-DPSPARSER support
Diffstat (limited to 'common')
-rw-r--r-- | common/spl/Kconfig | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index a72412718bd..c527617e434 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -91,20 +91,24 @@ config SPL_SYS_REPORT_STACK_F_USAGE occurrence of non 0xaa bytes. This default implementation works for stacks growing down only. -menu "PowerPC SPL Boot options" - depends on PPC && (SUPPORT_SPL && !SPL_FRAMEWORK) +menu "PowerPC and LayerScape SPL Boot options" config SPL_NAND_BOOT bool "Load SPL from NAND flash" + depends on PPC && (SUPPORT_SPL && !SPL_FRAMEWORK) config SPL_MMC_BOOT bool "Load SPL from SD Card / eMMC" + depends on PPC && (SUPPORT_SPL && !SPL_FRAMEWORK) config SPL_SPI_BOOT bool "Load SPL from SPI flash" + depends on PPC && (SUPPORT_SPL && !SPL_FRAMEWORK) config SPL_FSL_PBL bool "Create SPL in Freescale PBI format" + depends on (PPC || ARCH_LS1021A || ARCH_LS1043A || ARCH_LS1046A) && \ + SUPPORT_SPL help Create boot binary having SPL binary in PBI format concatenated with u-boot binary. |