From 66471fd0c2f9db81411e20a146a5a932351d5bed Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Fri, 25 Sep 2020 10:23:45 +0200 Subject: [PATCH] ccimx6qpsbc: bootscript: hardcode imx6qp soc_family for all SOC variants In the ccimx6sbc, since each SOC has a separate set of device trees, we can use the soc_family environment variable when generating the name of the final device tree in the bootscript. However, for the ccimx6qpsbc, there is only one set of device trees with the "imx6qp" prefix, even though there are SOC variants such as the imx6dp. Running the bootscript on a ccimx6qpsbc with an imx6dp SOC assembled will result in a failure, since it will look for a non-existing device tree starting with a "imx6dp" prefix. Stop using the soc_family variable and hardcode "imx6qp" instead. Signed-off-by: Gabriel Valcazar --- .../recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt index 7c9012a1e..0af8ee3f9 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt @@ -6,15 +6,15 @@ # Set device tree filename depending on the board ID (if defined) # if test -n "${board_id}"; then - setenv fdt_file ${soc_family}-ccimx6qpsbc-id${board_id}.dtb + setenv fdt_file imx6qp-ccimx6qpsbc-id${board_id}.dtb else # # Set device tree filename depending on the hardware variant # if test "${module_variant}" = "0x01"; then - setenv fdt_file ${soc_family}-ccimx6qpsbc-wb.dtb + setenv fdt_file imx6qp-ccimx6qpsbc-wb.dtb else - setenv fdt_file ${soc_family}-ccimx6qpsbc-wb.dtb + setenv fdt_file imx6qp-ccimx6qpsbc-wb.dtb fi fi