From fd3f3ba413ad52b24985121fa435ac536ba46dca Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Tue, 20 Aug 2019 16:27:17 +0200 Subject: [PATCH] uboot: update scripts to consider 'soc_type' var starts with "imx" The 'soc_type' variable was already set by fastboot to "imx8qxp" so the U-Boot board code that was setting this to just "8qxp" has been changed to set it to "imx8qxp". Update the scripts accordingly. Signed-off-by: Hector Palacios https://jira.digi.com/browse/DUB-901 --- .../u-boot-dey/ccimx8x-sbc-express/boot.txt | 16 ++++++++-------- .../ccimx8x-sbc-express/install_linux_fw_sd.txt | 2 +- .../u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt | 16 ++++++++-------- .../ccimx8x-sbc-pro/install_linux_fw_sd.txt | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt index 2abe55497..43badca8d 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt @@ -2,16 +2,16 @@ # U-Boot bootscript for EMMC/SD images created by Yocto. # -# Set SOC type to "8qxp" if not already defined by U-Boot +# Set SOC type to "imx8qxp" if not already defined by U-Boot if test ! -n "${soc_type}"; then - setenv soc_type "8qxp" + setenv soc_type "imx8qxp" fi # # Set device tree filename depending on the board ID (if defined) # if test -n "${board_id}"; then - setenv fdt_file ccimx${soc_type}-sbc-express-id${board_id}.dtb + setenv fdt_file cc${soc_type}-sbc-express-id${board_id}.dtb else # # Set device tree filename depending on the hardware capabilities @@ -23,9 +23,9 @@ else if test "${module_has_wifi}" = "1" && test "${module_has_bt}" = "1"; then - setenv fdt_file ccimx${soc_type}-sbc-express-wb.dtb + setenv fdt_file cc${soc_type}-sbc-express-wb.dtb else - setenv fdt_file ccimx${soc_type}-sbc-express.dtb + setenv fdt_file cc${soc_type}-sbc-express.dtb fi else # @@ -34,13 +34,13 @@ else if test "${module_variant}" = "0x01" || test "${module_variant}" = "0x02" || test "${module_variant}" = "0x04"; then - setenv fdt_file ccimx${soc_type}-sbc-express-wb.dtb + setenv fdt_file cc${soc_type}-sbc-express-wb.dtb elif test "${module_variant}" = "0x03" || test "${module_variant}" = "0x05" || test "${module_variant}" = "0x06"; then - setenv fdt_file ccimx${soc_type}-sbc-express.dtb + setenv fdt_file cc${soc_type}-sbc-express.dtb else - setenv fdt_file ccimx${soc_type}-sbc-express-wb.dtb + setenv fdt_file cc${soc_type}-sbc-express-wb.dtb fi fi fi diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt index fa5e7d32f..62501234a 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt @@ -23,7 +23,7 @@ fi ram_freq="1.2GHz" bus_width="32bit" if test -n "${module_ram}" && test -n "${soc_type}"; then - if test "${soc_type}" = "8dx"; then + if test "${soc_type}" = "imx8dx"; then bus_width="16bit" fi setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${ram_freq}_${module_ram}_${bus_width}.bin; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt index 716ac770f..3d0ce3556 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt @@ -2,16 +2,16 @@ # U-Boot bootscript for EMMC/SD images created by Yocto. # -# Set SOC type to "8qxp" if not already defined by U-Boot +# Set SOC type to "imx8qxp" if not already defined by U-Boot if test ! -n "${soc_type}"; then - setenv soc_type "8qxp" + setenv soc_type "imx8qxp" fi # # Set device tree filename depending on the board ID (if defined) # if test -n "${board_id}"; then - setenv fdt_file ccimx${soc_type}-sbc-pro-id${board_id}.dtb + setenv fdt_file cc${soc_type}-sbc-pro-id${board_id}.dtb else # # Set device tree filename depending on the hardware capabilities @@ -23,9 +23,9 @@ else if test "${module_has_wifi}" = "1" && test "${module_has_bt}" = "1"; then - setenv fdt_file ccimx${soc_type}-sbc-pro-wb.dtb + setenv fdt_file cc${soc_type}-sbc-pro-wb.dtb else - setenv fdt_file ccimx${soc_type}-sbc-pro.dtb + setenv fdt_file cc${soc_type}-sbc-pro.dtb fi else # @@ -34,13 +34,13 @@ else if test "${module_variant}" = "0x01" || test "${module_variant}" = "0x02" || test "${module_variant}" = "0x04"; then - setenv fdt_file ccimx${soc_type}-sbc-pro-wb.dtb + setenv fdt_file cc${soc_type}-sbc-pro-wb.dtb elif test "${module_variant}" = "0x03" || test "${module_variant}" = "0x05" || test "${module_variant}" = "0x06"; then - setenv fdt_file ccimx${soc_type}-sbc-pro.dtb + setenv fdt_file cc${soc_type}-sbc-pro.dtb else - setenv fdt_file ccimx${soc_type}-sbc-pro-wb.dtb + setenv fdt_file cc${soc_type}-sbc-pro-wb.dtb fi fi fi diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt index c50c4fa92..cce9bf896 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt @@ -23,7 +23,7 @@ fi ram_freq="1.2GHz" bus_width="32bit" if test -n "${module_ram}" && test -n "${soc_type}"; then - if test "${soc_type}" = "8dx"; then + if test "${soc_type}" = "imx8dx"; then bus_width="16bit" fi setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${ram_freq}_${module_ram}_${bus_width}.bin;