Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04df94fb authored by Alex Ray's avatar Alex Ray Committed by Bryan Huntsman
Browse files

ANDROID: ARM64: add option to build Image.gz/dtb combo 



Allows a defconfig to set a list of dtbs to concatenate with an
Image.gz to create a Image.gz-dtb.

Includes 8adb162 arm64: Fix correct dtb clean-files location

Change-Id: I0b462322d5c970f1fdf37baffece7ad058099f4a
Signed-off-by: default avatarAlex Ray <aray@google.com>
[rishabhb] Use subdir to descend into device tree directories
Signed-off-by: default avatarRishabh Bhatnagar <rishabhb@codeaurora.org>
parent f3fda57f

arch/arm64/Kconfig

+15 −0
Original line number Diff line number Diff line
@@ -1265,6 +1265,21 @@ config DMI 
	  However, even with this option, the resultant kernel should

	  continue to boot on existing non-UEFI platforms.



config BUILD_ARM64_APPENDED_DTB_IMAGE

	bool "Build a concatenated Image.gz/dtb by default"

	depends on OF

	help

	  Enabling this option will cause a concatenated Image.gz and list of

	  DTBs to be built by default (instead of a standalone Image.gz.)

	  The image will built in arch/arm64/boot/Image.gz-dtb



config BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES

	string "Default dtb names"

	depends on BUILD_ARM64_APPENDED_DTB_IMAGE

	help

	  Space separated list of names of dtbs to append when

	  building a concatenated Image.gz-dtb.



endmenu



menu "Userspace binary formats"

arch/arm64/Makefile

+10 −1
Original line number Diff line number Diff line
@@ -122,7 +122,13 @@ core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a 


# Default target when executing plain make

boot		:= arch/arm64/boot

KBUILD_IMAGE	:= $(boot)/Image.gz



ifeq ($(CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE),y)

KBUILD_IMAGE	:= Image.gz-dtb

else

KBUILD_IMAGE	:= Image.gz

endif



KBUILD_DTBS	:= dtbs



all:	Image.gz $(KBUILD_DTBS)
@@ -148,6 +154,9 @@ dtbs: prepare scripts 
dtbs_install:

	$(Q)$(MAKE) $(dtbinst)=$(boot)/dts



Image.gz-dtb: vmlinux scripts dtbs

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@



PHONY += vdso_install

vdso_install:

	$(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso $@

arch/arm64/boot/.gitignore

+1 −0
Original line number Diff line number Diff line 
Image

Image.gz

Image.gz-dtb

arch/arm64/boot/Makefile

+13 −0
Original line number Diff line number Diff line
@@ -14,10 +14,20 @@ 
# Based on the ia64 boot/Makefile.

#



include $(srctree)/arch/arm64/boot/dts/Makefile



OBJCOPYFLAGS_Image :=-O binary -R .note -R .note.gnu.build-id -R .comment -S



targets := Image Image.gz



DTB_NAMES := $(subst $\",,$(CONFIG_BUILD_ARM64_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))



$(obj)/Image: vmlinux FORCE

	$(call if_changed,objcopy)
@@ -36,6 +46,9 @@ $(obj)/Image.lzma: $(obj)/Image FORCE 
$(obj)/Image.lzo: $(obj)/Image FORCE

	$(call if_changed,lzo)



$(obj)/Image.gz-dtb: $(obj)/Image.gz $(DTB_OBJS) FORCE

	$(call if_changed,cat)



install:

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \

	$(obj)/Image System.map "$(INSTALL_PATH)"

arch/arm64/boot/dts/Makefile

+21 −0
Original line number Diff line number Diff line
@@ -24,3 +24,24 @@ subdir-y += socionext 
subdir-y += sprd

subdir-y += xilinx

subdir-y += zte





dtstree		:= $(srctree)/$(src)



dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(foreach d,$(subdir), $(wildcard $(dtstree)/$(d)/*.dts)))



always		:= $(dtb-y)



targets += dtbs



DTB_NAMES := $(subst $\",,$(CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES))

ifneq ($(DTB_NAMES),)

DTB_LIST := $(addsuffix .dtb,$(DTB_NAMES))

else

DTB_LIST := $(dtb-y)

endif

targets += $(DTB_LIST)



dtbs: $(addprefix $(obj)/, $(DTB_LIST))



clean-files := dts/*.dtb *.dtb