diff options
| author | Tom Rini | 2017-03-17 09:11:12 -0400 |
|---|---|---|
| committer | Tom Rini | 2017-03-17 14:15:17 -0400 |
| commit | f9515756b6d76cde99b385dda905dfb20d31ea48 (patch) | |
| tree | b2cd0007fb90a43992cb51f1a02d4e191e3dde10 /scripts | |
| parent | e245f1a5db086d676cbd97371046ea5c5e554326 (diff) | |
| parent | 520c174b3564ae183f0e7c118dc8ce3770ae20b0 (diff) | |
Merge git://git.denx.de/u-boot-rockchip
This includes support for rk3188 from Heiko Stübner and and rk3328 from
Kever Yang. Also included is SPL support for rk3399 and a fix for
rk3288 to get it booting again (spl_early_init()).
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.spl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index b52f9963f7d..5370648e853 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -215,8 +215,13 @@ $(obj)/$(SPL_BIN)-pad.bin: $(obj)/$(SPL_BIN) # 'u-boot,dm-pre-reloc' property and thus are not needed by SPL. The second # pass removes various unused properties from the remaining nodes. # The output is typically a much smaller device tree file. +ifeq ($(CONFIG_TPL_BUILD),y) +fdtgrep_props := -b u-boot,dm-pre-reloc -b u-boot,dm-tpl +else +fdtgrep_props := -b u-boot,dm-pre-reloc -b u-boot,dm-spl +endif quiet_cmd_fdtgrep = FDTGREP $@ - cmd_fdtgrep = $(objtree)/tools/fdtgrep -b u-boot,dm-pre-reloc -RT $< \ + cmd_fdtgrep = $(objtree)/tools/fdtgrep $(fdtgrep_props) -RT $< \ -n /chosen -O dtb | \ $(objtree)/tools/fdtgrep -r -O dtb - -o $@ \ $(addprefix -P ,$(subst $\",,$(CONFIG_OF_SPL_REMOVE_PROPS))) |