diff options
| author | York Sun <york.sun@nxp.com> | 2018-06-14 14:38:48 -0700 |
|---|---|---|
| committer | York Sun <york.sun@nxp.com> | 2018-07-26 10:59:35 -0700 |
| commit | 7550dbe38b3ffb49f1ea290beeaf633606c6c869 (patch) | |
| tree | cce40f49afc179cd65677808d4f7f0b7542ca7d2 | |
| parent | 67b4f5302a40bd9a963e48d964a5895d60f75e8f (diff) | |
| download | u-boot-7550dbe38b3ffb49f1ea290beeaf633606c6c869.tar.gz | |
spl: Add option SPL_PAYLOAD
Some legacy boards use RAW image for SPL boot. Add Kconfig option
SPL_PAYLOAD to set alternative image.
Signed-off-by: York Sun <york.sun@nxp.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | common/spl/Kconfig | 10 |
2 files changed, 12 insertions, 2 deletions
@@ -1111,8 +1111,8 @@ u-boot.sha1: u-boot.bin u-boot.dis: u-boot $(OBJDUMP) -d $< > $@ -ifdef CONFIG_TPL -SPL_PAYLOAD := tpl/u-boot-with-tpl.bin +ifneq ($(CONFIG_SPL_PAYLOAD),) +SPL_PAYLOAD := $(CONFIG_SPL_PAYLOAD:"%"=%) else SPL_PAYLOAD := u-boot.bin endif diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 99c9053ab8..2af26a881a 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -553,6 +553,16 @@ config SYS_OS_BASE endif # SPL_OS_BOOT +config SPL_PAYLOAD + string "SPL payload" + default "tpl/u-boot-with-tpl.bin" if TPL + default "u-boot.bin" + help + Payload for SPL boot. For backward compability, default to + u-boot.bin, i.e. RAW image without any header. In case of + TPL, tpl/u-boot-with-tpl.bin. For new boards, suggest to + use u-boot.img. + config SPL_PCI_SUPPORT bool "Support PCI drivers" help |