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

Commit 6fe790cb authored by James Shao's avatar James Shao
Browse files

arm: RTIC kernel integration to generate MP DTS 



With new Boot Image header v2 the boot image header generation
decoupled from the kernel. RTIC DTS requires kernel build
environment (because of OBJDUMP, OBJCPY, and other dependencies).
The RTIC DTS will be compiled to DTB later either by
arch/arm64/boot/Makefile (for Boot Image Header v1) or by
kernel_definitions.mk (for Boot Image Header v2).

Change-Id: I3bf083d909b4e64d0f3dbea97c8c0ad8ee474798
Signed-off-by: default avatarJames Shao <jameshao@codeaurora.org>
parent 7de7fee9

arch/arm64/boot/Makefile

+4 −3
Original line number Diff line number Diff line
@@ -29,14 +29,15 @@ endif 
DTB_OBJS := $(shell find $(obj)/dts/ -name \*.dtb)



# Add RTIC DTB to the DTB list if RTIC MPGen is enabled

# Note, we keep this for compatibility with

# BUILD_ARM64_APPENDED_DTB_IMAGE targets.

# The rtic_mp.dts would be generated with the vmlinux if

# MPGen enabled (RTIC_MPGEN defined).

ifdef RTIC_MPGEN

DTB_OBJS += rtic_mp.dtb

endif



rtic_mp.dtb: vmlinux FORCE

	$(RTIC_MPGEN) --objcopy="${OBJCOPY}" --objdump="${OBJDUMP}" \

	--binpath="" --vmlinux="vmlinux" --config=${KCONFIG_CONFIG} \

	--cc="${CC} ${KBUILD_AFLAGS}" --dts=rtic_mp.dts && \

	$(DTC) -O dtb -o rtic_mp.dtb -b 0 $(DTC_FLAGS) rtic_mp.dts



$(obj)/Image: vmlinux FORCE

scripts/link-vmlinux.sh

+11 −0
Original line number Diff line number Diff line
@@ -413,3 +413,14 @@ if [ -n "${CONFIG_KALLSYMS}" ]; then 
		exit 1

	fi

fi



# Starting Android Q, the DTB's are part of dtb.img and not part

# of the kernel image. RTIC DTS relies on the kernel environment

# and could not build outside of the kernel. Generate RTIC DTS after

# successful kernel build if MPGen is enabled. The DTB will be

# generated with dtb.img in kernel_definitions.mk.

if [ ! -z ${RTIC_MPGEN+x} ]; then

	${RTIC_MPGEN} --objcopy="${OBJCOPY}" --objdump="${OBJDUMP}" \

		--binpath="" --vmlinux="vmlinux" --config=${KCONFIG_CONFIG} \

		--cc="${CC} ${KBUILD_AFLAGS}" --dts=rtic_mp.dts

fi