mirror of https://github.com/OpenIPC/firmware.git
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
diff -drupN a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
|
|
--- a/arch/arm/boot/Makefile 2018-08-06 17:23:04.000000000 +0300
|
|
+++ b/arch/arm/boot/Makefile 2022-06-12 05:28:14.000000000 +0300
|
|
@@ -16,6 +16,7 @@ OBJCOPYFLAGS :=-O binary -R .comment -S
|
|
ifneq ($(MACHINE),)
|
|
include $(MACHINE)/Makefile.boot
|
|
endif
|
|
+include $(srctree)/arch/arm/boot/dts/Makefile
|
|
|
|
# Note: the following conditions must always be true:
|
|
# ZRELADDR == virt_to_phys(PAGE_OFFSET + TEXT_OFFSET)
|
|
@@ -29,6 +30,14 @@ export ZRELADDR INITRD_PHYS PARAMS_PHYS
|
|
|
|
targets := Image zImage xipImage bootpImage uImage
|
|
|
|
+DTB_NAMES := $(subst $\",,$(CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE_NAMES))
|
|
+ifneq ($(DTB_NAMES),)
|
|
+DTB_LIST := $(addsuffix .dtb,$(DTB_NAMES))
|
|
+else
|
|
+DTB_LIST := $(dtb-y)
|
|
+endif
|
|
+DTB_OBJS := $(addprefix $(obj)/dts/,$(DTB_LIST))
|
|
+
|
|
ifeq ($(CONFIG_XIP_KERNEL),y)
|
|
|
|
$(obj)/xipImage: vmlinux FORCE
|
|
@@ -55,6 +64,10 @@ $(obj)/compressed/vmlinux: $(obj)/Image
|
|
$(obj)/zImage: $(obj)/compressed/vmlinux FORCE
|
|
$(call if_changed,objcopy)
|
|
|
|
+$(obj)/zImage-dtb: $(obj)/zImage $(DTB_OBJS) FORCE
|
|
+ $(call if_changed,cat)
|
|
+ @echo ' Kernel: $@ is ready'
|
|
+
|
|
endif
|
|
|
|
ifneq ($(LOADADDR),)
|