diff options
author | Tom Rini <trini@konsulko.com> | 2021-03-22 16:35:48 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-03-22 16:35:48 -0400 |
commit | da2a0cd70f7478b6b5c0c8ac33493e422dde13ba (patch) | |
tree | 7a008e1206980d2642a91c9bd81ff74bd087cb06 /scripts/Makefile.spl | |
parent | 874dcedee92a828b03c8d3146dccfaa8b709618b (diff) | |
parent | fcc6fbba8ae003954b5e23461a9f5814d86a23b7 (diff) | |
download | u-boot-WIP/23Mar2021-next.zip u-boot-WIP/23Mar2021-next.tar.gz u-boot-WIP/23Mar2021-next.tar.bz2 |
Merge tag 'dm-pull-21mar21-take3' of git://git.denx.de/u-boot-dm into nextWIP/23Mar2021-nextWIP/22Mar2021-next
dtoc support for of-platdata-inst
driver model support for of-platdata-inst
support of-platdata-inst on x86 / coral
binman support for exapanded entries
binman convert docs to reST
ti-sysc fix for duplicate uclass driver
patman minor improvements
Diffstat (limited to 'scripts/Makefile.spl')
-rw-r--r-- | scripts/Makefile.spl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 1fd63ef..849e9c7 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -120,7 +120,8 @@ endif u-boot-spl-init := $(head-y) u-boot-spl-main := $(libs-y) ifdef CONFIG_$(SPL_TPL_)OF_PLATDATA -u-boot-spl-platdata := $(obj)/dts/dt-plat.o +u-boot-spl-platdata := $(obj)/dts/dt-plat.o $(obj)/dts/dt-uclass.o \ + $(obj)/dts/dt-device.o u-boot-spl-platdata_c := $(patsubst %.o,%.c,$(u-boot-spl-platdata)) endif @@ -311,7 +312,11 @@ $(obj)/$(SPL_BIN).dtb: $(obj)/dts/dt-$(SPL_NAME).dtb FORCE pythonpath = PYTHONPATH=scripts/dtc/pylibfdt DTOC_ARGS := $(pythonpath) $(srctree)/tools/dtoc/dtoc \ - -d $(obj)/$(SPL_BIN).dtb + -d $(obj)/$(SPL_BIN).dtb -p $(SPL_NAME) + +ifneq ($(CONFIG_$(SPL_TPL_)OF_PLATDATA_INST),) +DTOC_ARGS += -i +endif quiet_cmd_dtoc = DTOC $@ cmd_dtoc = $(DTOC_ARGS) -c $(obj)/dts -C include/generated all |