diff options
author | Rob Herring <robh@kernel.org> | 2018-08-02 00:00:12 +0300 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2018-10-02 17:22:49 +0300 |
commit | be7cd2df1d22d29e5f23ce8744fc465cc07cc2bc (patch) | |
tree | a4cd426bc23d72fab2a595f149dcbf353cd23b6a /arch/c6x/boot | |
parent | a91c614510478598051e8c49adb9863ee47959ec (diff) | |
download | linux-be7cd2df1d22d29e5f23ce8744fc465cc07cc2bc.tar.xz |
c6x: use common built-in dtb support
Using the common build support for built-in dtb files just requires
adding a .dtb.o target to obj-y.
The dtb now needs to be copied when unflattened because an init section
is used now.
Cc: Mark Salter <msalter@redhat.com>
Cc: Aurelien Jacquiot <jacquiot.aurelien@gmail.com>
Cc: linux-c6x-dev@linux-c6x.org
Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'arch/c6x/boot')
-rw-r--r-- | arch/c6x/boot/dts/Makefile | 11 | ||||
-rw-r--r-- | arch/c6x/boot/dts/linked_dtb.S | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/arch/c6x/boot/dts/Makefile b/arch/c6x/boot/dts/Makefile index b212d278ebc4..fd937f781d16 100644 --- a/arch/c6x/boot/dts/Makefile +++ b/arch/c6x/boot/dts/Makefile @@ -6,14 +6,5 @@ DTC_FLAGS ?= -p 1024 ifneq ($(DTB),) -obj-y += linked_dtb.o +obj-y += $(DTB).dtb.o endif - -quiet_cmd_cp = CP $< $@$2 - cmd_cp = cat $< >$@$2 || (rm -f $@ && echo false) - -# Generate builtin.dtb from $(DTB).dtb -$(obj)/builtin.dtb: $(obj)/$(DTB).dtb - $(call if_changed,cp) - -$(obj)/linked_dtb.o: $(obj)/builtin.dtb diff --git a/arch/c6x/boot/dts/linked_dtb.S b/arch/c6x/boot/dts/linked_dtb.S deleted file mode 100644 index cf347f1d16ce..000000000000 --- a/arch/c6x/boot/dts/linked_dtb.S +++ /dev/null @@ -1,2 +0,0 @@ -.section __fdt_blob,"a" -.incbin "arch/c6x/boot/dts/builtin.dtb" |