From 9121521e9a7019ec39c57d57f7c635dd82f60eb6 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Fri, 7 Jul 2023 11:41:26 +0200 Subject: machines: arch arm64: use var to set relative path to dtb Follow the pattern used in commit ce9a5ef ("machines: arch arm: follow change to vendor subdir for dtbs") Set the variable KERNEL_DTB_PREFIX with the relative path to the device tree source files and then use it. This variable can then be used in the creation of the u-boot-distro-boot script. Related-to: ELB-5263 Signed-off-by: Max Krummenacher --- conf/machine/apalis-imx8.conf | 17 +++++++++-------- conf/machine/colibri-imx8x.conf | 19 ++++++++++--------- conf/machine/verdin-imx8mm.conf | 13 +++++++------ conf/machine/verdin-imx8mp.conf | 13 +++++++------ 4 files changed, 33 insertions(+), 29 deletions(-) diff --git a/conf/machine/apalis-imx8.conf b/conf/machine/apalis-imx8.conf index a8d03d5..e250927 100644 --- a/conf/machine/apalis-imx8.conf +++ b/conf/machine/apalis-imx8.conf @@ -27,15 +27,16 @@ LOADADDR = "" # auto-serial-console there USE_VT = "0" +KERNEL_DTB_PREFIX = "freescale/" KERNEL_DEVICETREE = " \ - freescale/imx8qm-apalis-eval.dtb \ - freescale/imx8qm-apalis-ixora-v1.1.dtb \ - freescale/imx8qm-apalis-v1.1-eval.dtb \ - freescale/imx8qm-apalis-v1.1-ixora-v1.1.dtb \ - freescale/imx8qm-apalis-v1.1-ixora-v1.2.dtb \ - freescale/imx8qp-apalis-v1.1-eval.dtb \ - freescale/imx8qp-apalis-v1.1-ixora-v1.1.dtb \ - freescale/imx8qp-apalis-v1.1-ixora-v1.2.dtb \ + ${KERNEL_DTB_PREFIX}imx8qm-apalis-eval.dtb \ + ${KERNEL_DTB_PREFIX}imx8qm-apalis-ixora-v1.1.dtb \ + ${KERNEL_DTB_PREFIX}imx8qm-apalis-v1.1-eval.dtb \ + ${KERNEL_DTB_PREFIX}imx8qm-apalis-v1.1-ixora-v1.1.dtb \ + ${KERNEL_DTB_PREFIX}imx8qm-apalis-v1.1-ixora-v1.2.dtb \ + ${KERNEL_DTB_PREFIX}imx8qp-apalis-v1.1-eval.dtb \ + ${KERNEL_DTB_PREFIX}imx8qp-apalis-v1.1-ixora-v1.1.dtb \ + ${KERNEL_DTB_PREFIX}imx8qp-apalis-v1.1-ixora-v1.2.dtb \ " KERNEL_IMAGETYPE:aarch64 = "Image.gz" diff --git a/conf/machine/colibri-imx8x.conf b/conf/machine/colibri-imx8x.conf index 21c46c3..67491e7 100644 --- a/conf/machine/colibri-imx8x.conf +++ b/conf/machine/colibri-imx8x.conf @@ -25,17 +25,18 @@ LOADADDR = "" # auto-serial-console there USE_VT = "0" +KERNEL_DTB_PREFIX = "freescale/" KERNEL_DEVICETREE = " \ - freescale/imx8dx-colibri-aster.dtb \ - freescale/imx8dx-colibri-eval-v3.dtb \ - freescale/imx8dx-colibri-iris.dtb \ - freescale/imx8dx-colibri-iris-v2.dtb \ - freescale/imx8qxp-colibri-aster.dtb \ - freescale/imx8qxp-colibri-eval-v3.dtb \ - freescale/imx8qxp-colibri-iris.dtb \ - freescale/imx8qxp-colibri-iris-v2.dtb \ + ${KERNEL_DTB_PREFIX}imx8dx-colibri-aster.dtb \ + ${KERNEL_DTB_PREFIX}imx8dx-colibri-eval-v3.dtb \ + ${KERNEL_DTB_PREFIX}imx8dx-colibri-iris.dtb \ + ${KERNEL_DTB_PREFIX}imx8dx-colibri-iris-v2.dtb \ + ${KERNEL_DTB_PREFIX}imx8qxp-colibri-aster.dtb \ + ${KERNEL_DTB_PREFIX}imx8qxp-colibri-eval-v3.dtb \ + ${KERNEL_DTB_PREFIX}imx8qxp-colibri-iris.dtb \ + ${KERNEL_DTB_PREFIX}imx8qxp-colibri-iris-v2.dtb \ " -KERNEL_DEVICETREE:use-mainline-bsp = "freescale/imx8qxp-colibri-eval-v3.dtb" +KERNEL_DEVICETREE:use-mainline-bsp = "${KERNEL_DTB_PREFIX}imx8qxp-colibri-eval-v3.dtb" KERNEL_IMAGETYPE:aarch64 = "Image.gz" diff --git a/conf/machine/verdin-imx8mm.conf b/conf/machine/verdin-imx8mm.conf index 4f66547..e0326f7 100644 --- a/conf/machine/verdin-imx8mm.conf +++ b/conf/machine/verdin-imx8mm.conf @@ -21,13 +21,14 @@ require conf/machine/include/arm/armv8a/tune-cortexa53.inc # Don't include kernels in standard images RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" +KERNEL_DTB_PREFIX = "freescale/" KERNEL_DEVICETREE = " \ - freescale/imx8mm-verdin-nonwifi-dahlia.dtb \ - freescale/imx8mm-verdin-nonwifi-dev.dtb \ - freescale/imx8mm-verdin-nonwifi-yavia.dtb \ - freescale/imx8mm-verdin-wifi-dahlia.dtb \ - freescale/imx8mm-verdin-wifi-dev.dtb \ - freescale/imx8mm-verdin-wifi-yavia.dtb \ + ${KERNEL_DTB_PREFIX}imx8mm-verdin-nonwifi-dahlia.dtb \ + ${KERNEL_DTB_PREFIX}imx8mm-verdin-nonwifi-dev.dtb \ + ${KERNEL_DTB_PREFIX}imx8mm-verdin-nonwifi-yavia.dtb \ + ${KERNEL_DTB_PREFIX}imx8mm-verdin-wifi-dahlia.dtb \ + ${KERNEL_DTB_PREFIX}imx8mm-verdin-wifi-dev.dtb \ + ${KERNEL_DTB_PREFIX}imx8mm-verdin-wifi-yavia.dtb \ " KERNEL_IMAGETYPE:aarch64 = "Image.gz" diff --git a/conf/machine/verdin-imx8mp.conf b/conf/machine/verdin-imx8mp.conf index b94d111..9a34d68 100644 --- a/conf/machine/verdin-imx8mp.conf +++ b/conf/machine/verdin-imx8mp.conf @@ -21,13 +21,14 @@ require conf/machine/include/arm/armv8a/tune-cortexa53.inc # Don't include kernels in standard images RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" +KERNEL_DTB_PREFIX = "freescale/" KERNEL_DEVICETREE = " \ - freescale/imx8mp-verdin-nonwifi-dahlia.dtb \ - freescale/imx8mp-verdin-nonwifi-dev.dtb \ - freescale/imx8mp-verdin-nonwifi-yavia.dtb \ - freescale/imx8mp-verdin-wifi-dahlia.dtb \ - freescale/imx8mp-verdin-wifi-dev.dtb \ - freescale/imx8mp-verdin-wifi-yavia.dtb \ + ${KERNEL_DTB_PREFIX}imx8mp-verdin-nonwifi-dahlia.dtb \ + ${KERNEL_DTB_PREFIX}imx8mp-verdin-nonwifi-dev.dtb \ + ${KERNEL_DTB_PREFIX}imx8mp-verdin-nonwifi-yavia.dtb \ + ${KERNEL_DTB_PREFIX}imx8mp-verdin-wifi-dahlia.dtb \ + ${KERNEL_DTB_PREFIX}imx8mp-verdin-wifi-dev.dtb \ + ${KERNEL_DTB_PREFIX}imx8mp-verdin-wifi-yavia.dtb \ " KERNEL_IMAGETYPE:aarch64 = "Image.gz" -- cgit v1.2.3