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

Commit 13345f8a authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm: RTIC kernel integration to generate MP DTS"

parents bb0bb2fb 6fe790cb

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