From ddfbb2652ae69ac4daf4e1c9066d6b5d6d8ef4bf Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Mon, 1 Jul 2019 10:54:00 +0200 Subject: [PATCH] ccimx8x: add DualX variants device trees and rename the QuadXPlus With the arrival of DualX variants, the devicetree files have changed their names to include the soc type (qxp, dx). Signed-off-by: Hector Palacios https://jira.digi.com/browse/DEL-6641 --- meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf | 6 +++--- meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf index e15fd9bd2..0d7f05cab 100644 --- a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf +++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf @@ -22,9 +22,9 @@ UBOOT_CONFIG[ccimx8x_sbc_express2GB] = "ccimx8x_sbc_express2GB_defconfig,,u-boot UBOOT_CONFIG[ccimx8x_sbc_express1GB] = "ccimx8x_sbc_express1GB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}" KERNEL_DEVICETREE ?= " \ - digi/ccimx8x-sbc-express-id129.dtb \ - digi/ccimx8x-sbc-express-wb.dtb \ - digi/ccimx8x-sbc-express.dtb \ + digi/ccimx8qxp-sbc-express-id129.dtb \ + digi/ccimx8qxp-sbc-express-wb.dtb \ + digi/ccimx8qxp-sbc-express.dtb \ " SERIAL_CONSOLES ?= "115200;ttyLP2" diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf index 718236012..6a5191ad3 100644 --- a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf +++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf @@ -23,9 +23,11 @@ UBOOT_CONFIG[ccimx8x_sbc_pro1GB] = "ccimx8x_sbc_pro1GB_defconfig,,u-boot-dtb.${U UBOOT_CONFIG[ccimx8x_sbc_pro512MB] = "ccimx8x_sbc_pro512MB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}" KERNEL_DEVICETREE ?= " \ - digi/ccimx8x-sbc-pro-id135.dtb \ - digi/ccimx8x-sbc-pro-wb.dtb \ - digi/ccimx8x-sbc-pro.dtb \ + digi/ccimx8dx-sbc-pro-wb.dtb \ + digi/ccimx8dx-sbc-pro.dtb \ + digi/ccimx8qxp-sbc-pro-id135.dtb \ + digi/ccimx8qxp-sbc-pro-wb.dtb \ + digi/ccimx8qxp-sbc-pro.dtb \ " SERIAL_CONSOLES ?= "115200;ttyLP2"