diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-15 08:06:22 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-15 08:06:22 -0400 |
| commit | ebe621d5fb2f5c15aff50e0610372f2751fd152f (patch) | |
| tree | 12985b43f1a8500332de8e20274cc2dd26f5a040 /Makefile | |
| parent | 36b898b6bea839de7141b65df6ec02a97615c467 (diff) | |
| parent | 1269625177f120d659f66b18de4b532b16c44561 (diff) | |
| download | u-boot-ebe621d5fb2f5c15aff50e0610372f2751fd152f.tar.gz | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -802,7 +802,7 @@ quiet_cmd_pad_cat = CAT $@ cmd_pad_cat = $(cmd_objcopy) && $(append) || rm -f $@ all: $(ALL-y) -ifeq ($(CONFIG_DM_I2C_COMPAT),y) +ifeq ($(CONFIG_DM_I2C_COMPAT)$(CONFIG_SANDBOX),y) @echo "===================== WARNING ======================" @echo "This board uses CONFIG_DM_I2C_COMPAT. Please remove" @echo "(possibly in a subsequent patch in your series)" @@ -1319,7 +1319,8 @@ u-boot.lds: $(LDSCRIPT) prepare FORCE spl/u-boot-spl.bin: spl/u-boot-spl @: -spl/u-boot-spl: tools prepare $(if $(CONFIG_OF_SEPARATE),dts/dt.dtb) +spl/u-boot-spl: tools prepare \ + $(if $(CONFIG_OF_SEPARATE)$(CONFIG_SPL_OF_PLATDATA),dts/dt.dtb) $(Q)$(MAKE) obj=spl -f $(srctree)/scripts/Makefile.spl all spl/sunxi-spl.bin: spl/u-boot-spl |