diff options
| author | Tom Rini <trini@konsulko.com> | 2020-03-13 13:21:17 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-03-13 13:21:17 -0400 |
| commit | 50be9f0e1ccc0909e65132cff216743a49046f97 (patch) | |
| tree | cbb6f9c3031ab81d5b0a775906727df844b0a618 /Makefile | |
| parent | db3b1818b7a9711084255713ec14cb886eb79b12 (diff) | |
| parent | d21ffa2a2ebc366b8ca644324d76bb2924947373 (diff) | |
Merge branch '2020-03-13-master-imports'
- Address the regression with the 'gpio' command
- Fix mcfuart regression
- Other minor fixes
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -903,7 +903,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 @@ -1208,7 +1208,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 |