diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-17 21:15:57 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-17 21:15:57 -0500 |
| commit | d64efd920e429f1c5dc085e2e8614c5d139ec37d (patch) | |
| tree | fb1b00b875c2efd1a3d5310227c0d214cd48cf45 /common | |
| parent | fd8adc33b8f999cb09c3ba8ea8860ded28e8d6ca (diff) | |
| parent | 59b01eb7a17a7c0915fd8aff8f818699b4624137 (diff) | |
| download | u-boot-d64efd920e429f1c5dc085e2e8614c5d139ec37d.zip u-boot-d64efd920e429f1c5dc085e2e8614c5d139ec37d.tar.gz u-boot-d64efd920e429f1c5dc085e2e8614c5d139ec37d.tar.bz2 | |
Merge tag 'u-boot-rockchip-20191118' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- Add support for rockchip SoC: PX30, RK3308
- Add and migrate to use common dram driver: PX30, RK3328, RK3399
- Add rk3399 board Tinker-s support
- Board config update for Rock960, Rockpro64
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/Kconfig | 8 | ||||
| -rw-r--r-- | common/spl/Makefile | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 8f0ba8e..1f12283 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -1241,6 +1241,14 @@ config TPL_SIZE_LIMIT Specifies the maximum length of the U-Boot TPL image. If this value is zero, it is ignored. +config TPL_FRAMEWORK + bool "Support TPL based upon the common SPL framework" + default y if SPL_FRAMEWORK + help + Enable the SPL framework under common/spl/ for TPL builds. + This framework supports MMC, NAND and YMODEM and other methods + loading of U-Boot's SPL stage. If unsure, say Y. + config TPL_HANDOFF bool "Pass hand-off information from TPL to SPL and U-Boot proper" depends on HANDOFF && TPL_BLOBLIST diff --git a/common/spl/Makefile b/common/spl/Makefile index 5ce6f4a..eaa57f5 100644 --- a/common/spl/Makefile +++ b/common/spl/Makefile @@ -7,7 +7,7 @@ # ifdef CONFIG_SPL_BUILD -obj-$(CONFIG_SPL_FRAMEWORK) += spl.o +obj-$(CONFIG_$(SPL_TPL_)FRAMEWORK) += spl.o obj-$(CONFIG_$(SPL_TPL_)BOOTROM_SUPPORT) += spl_bootrom.o obj-$(CONFIG_$(SPL_TPL_)LOAD_FIT) += spl_fit.o obj-$(CONFIG_$(SPL_TPL_)NOR_SUPPORT) += spl_nor.o |