diff options
author | Tom Rini <trini@konsulko.com> | 2020-06-29 15:58:38 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-06-29 15:58:38 -0400 |
commit | 50c9b0e1ddce280823484579c4ecc1f069e7833b (patch) | |
tree | 16908165e841adefa0e68693bf07a7fdb67084ab /Makefile | |
parent | 04f005d552eb748582678a45119b55a99f75748e (diff) | |
parent | 28964227069d3f0ff3110b8064d547f6cd9fcfa6 (diff) |
Merge branch '2020-06-26-more-Kconfig-migration' into next
- Bring in the first pass at cleaning up config headers that reference
symbols that already have Kconfig symbols.
- In order to do that, bring in the small series that adds
CONFIG_SPL_DM_SPI_FLASH and makes more use of CONFIG_$(SPL_TPL_)DM_SPI
in order to allow for disabling those features in SPL stuff but using
them in full U-Boot
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -887,7 +887,7 @@ ALL-$(CONFIG_ONENAND_U_BOOT) += u-boot-onenand.bin ifeq ($(CONFIG_SPL_FSL_PBL),y) ALL-$(CONFIG_RAMBOOT_PBL) += u-boot-with-spl-pbl.bin else -ifneq ($(CONFIG_SECURE_BOOT), y) +ifneq ($(CONFIG_NXP_ESBC), y) # For Secure Boot The Image needs to be signed and Header must also # be included. So The image has to be built explicitly ALL-$(CONFIG_RAMBOOT_PBL) += u-boot.pbl |