diff options
| author | Tom Rini <trini@konsulko.com> | 2020-03-31 17:24:19 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-03-31 17:24:19 -0400 |
| commit | 2b18b89156335bf1f0d84f81d3597762bc48c61d (patch) | |
| tree | 544e93c39bfaeff20b2ac47980de27edf1a585e4 /Makefile | |
| parent | 779e6dc6a429ac28dfd4f07ab0c3648a31399d4a (diff) | |
| parent | ac28e59a574dd231a4787752d923f618587e3d10 (diff) | |
Merge branch 'next' of git://git.denx.de/u-boot-usb into next
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -904,7 +904,7 @@ ifneq ($(CONFIG_BUILD_TARGET),) ALL-y += $(CONFIG_BUILD_TARGET:"%"=%) endif -ifdef CONFIG_INIT_SP_RELATIVE +ifeq ($(CONFIG_INIT_SP_RELATIVE)$(CONFIG_OF_SEPARATE),yy) ALL-y += init_sp_bss_offset_check endif @@ -1215,7 +1215,7 @@ binary_size_check: u-boot-nodtb.bin FORCE fi \ fi -ifdef CONFIG_INIT_SP_RELATIVE +ifeq ($(CONFIG_INIT_SP_RELATIVE)$(CONFIG_OF_SEPARATE),yy) ifneq ($(CONFIG_SYS_MALLOC_F_LEN),) subtract_sys_malloc_f_len = space=$$(($${space} - $(CONFIG_SYS_MALLOC_F_LEN))) else |