From 04a4e89de2b14e7244d4fad6e32448d40846b948 Mon Sep 17 00:00:00 2001 From: Robert Schwebel Date: Thu, 25 Nov 2021 17:11:42 +0100 Subject: platform-v8a: don't use paths for device trees Since ptxdist commit f50cd1449e9347309b1050b0b738882dac1954e9, there is a check that makes sure that devicetrees are separated from their paths. Unfortunately for arm64, devicetrees live in vendor subtrees, so we get this error: ptxdist: error: DistroKit/ptxdist/rules/kernel.make: the device trees in PTXCONF_KERNEL_DTS must be specified without ptxdist: error: DistroKit/ptxdist/rules/kernel.make: directory. Use PTXCONF_KERNEL_DTS_PATH to provide a list of direcories ptxdist: error: DistroKit/ptxdist/rules/kernel.make: that will be searched. Workaround is to add the path componet to PTXCONF_KERNEL_DTS_PATH and inform mol to fix that up in ptxdist upstream. Signed-off-by: Robert Schwebel --- configs/platform-v8a/platformconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configs') diff --git a/configs/platform-v8a/platformconfig b/configs/platform-v8a/platformconfig index 6c94972..4fa9686 100644 --- a/configs/platform-v8a/platformconfig +++ b/configs/platform-v8a/platformconfig @@ -129,8 +129,8 @@ PTXCONF_KERNEL_IMAGE_RAW=y # PTXCONF_KERNEL_IMAGE_SIMPLE is not set PTXCONF_KERNEL_IMAGE="Image" PTXCONF_KERNEL_DTB=y -PTXCONF_KERNEL_DTS_PATH="${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts" -PTXCONF_KERNEL_DTS="armada-3720-community.dts freescale/imx8mm-evk.dts freescale/imx8mp-evk.dts freescale/imx8mq-evk.dts" +PTXCONF_KERNEL_DTS_PATH="${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts:${KERNEL_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts/freescale" +PTXCONF_KERNEL_DTS="armada-3720-community.dts imx8mm-evk.dts imx8mp-evk.dts imx8mq-evk.dts" # PTXCONF_KERNEL_CODE_SIGNING is not set # PTXCONF_KERNEL_ZSTD is not set # PTXCONF_KERNEL_XZ is not set -- cgit v1.2.3