diff options
| author | Tom Rini <[email protected]> | 2022-06-29 09:54:02 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-06-29 10:11:21 -0400 |
| commit | 5c873269fc374674e5e8aad65ab4ed45b1fe9f65 (patch) | |
| tree | 5b2860d103a7f70abfd4534e10bdb53539cf18b5 /scripts/Makefile.spl | |
| parent | d61c11b8c894fad517677dc51ee82d1eade39c01 (diff) | |
| parent | 613c326581fd96b55dd21e3a6d23e844e896832b (diff) | |
Merge branch '2022-06-28-Kconfig-migrations' into next
- Convert a large number of CONFIG symbols to Kconfig. Of note is a
large chunk of USB symbols (and dead code removal), ensuring all
SPL/TPL/VPL symbols have an appropriate dependency, largely (but not
entirely) removing the testing of CONFIG_SPL_BUILD in board headers,
and allowing CONFIG_EXTRA_ENV_TEXT and CONFIG_EXTRA_ENV_SETTINGS to
co-exist as this facilities migration of many platforms.
Diffstat (limited to 'scripts/Makefile.spl')
| -rw-r--r-- | scripts/Makefile.spl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index c1d32f58791..1cfb8115e31 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -253,7 +253,7 @@ endif INPUTS-y += $(obj)/$(SPL_BIN).bin $(obj)/$(SPL_BIN).sym -ifdef CONFIG_SAMSUNG +ifneq ($(CONFIG_ARCH_EXYNOS)$(CONFIG_ARCH_S5PC1XX),) INPUTS-y += $(obj)/$(BOARD)-spl.bin endif @@ -367,8 +367,8 @@ $(platdata-hdr) $(u-boot-spl-platdata_c) &: $(obj)/$(SPL_BIN).dtb @rm -f $(u-boot-spl-all-platdata_c) $(u-boot-spl-all-platdata) $(call if_changed,dtoc) -ifdef CONFIG_SAMSUNG -ifdef CONFIG_VAR_SIZE_SPL +ifneq ($(CONFIG_ARCH_EXYNOS)$(CONFIG_ARCH_S5PC1XX),) +ifeq ($(CONFIG_EXYNOS5420),y) VAR_SIZE_PARAM = --vs else VAR_SIZE_PARAM = |