From 6eb3bd001c780c2ca173e35739844d1359136d74 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Fri, 12 Jul 2019 10:53:57 +0200 Subject: [PATCH] ccimx8x: change bootable artifacts filenames on U-Boot install script After the recent changes to generate the bootable artifacts, these are now formed using the ${MACHINE} variable rather than the string in ${UBOOT_CONFIG} array, so the underscores must be changed with dashes. Signed-off-by: Hector Palacios --- .../install_linux_fw_sd.txt | 14 +++++++------- .../ccimx8x-sbc-pro/install_linux_fw_sd.txt | 18 +++++++++--------- 2 files changed, 16 insertions(+), 16 deletions(-) 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 22f943d5b..08541df59 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 @@ -26,18 +26,18 @@ if test -n "${module_ram}" && test -n "${soc_type}"; then if test "${soc_type}" == "dx"; then bus_width="16bit" fi - setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x_sbc_express-${ram_freq}_${module_ram}_${bus_width}.bin; + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${ram_freq}_${module_ram}_${bus_width}.bin; else # Determine U-Boot file to program basing on SOM's variant if test -n "${module_variant}"; then if test "${module_variant}" = "0x01"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x_sbc_express-1.2GHz_1GB_32bit.bin; + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-1.2GHz_1GB_32bit.bin; elif test "${module_variant}" = "0x02" || test "${module_variant}" = "0x03"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x_sbc_express-1.2GHz_2GB_32bit.bin; + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-1.2GHz_2GB_32bit.bin; elif test "${module_variant}" = "0x04" || test "${module_variant}" = "0x05"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x_sbc_express-1.2GHz_1GB_16bit.bin; + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-1.2GHz_1GB_16bit.bin; fi fi fi @@ -52,11 +52,11 @@ else echo ""; echo "1. Set variable 'INSTALL_UBOOT_FILENAME' depending on your ConnectCore 8X variant:"; echo " - For a QuadXPlus CPU with 1GB LPDDR4, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x_sbc_express-1.2GHz_1GB_32bit.bin"; + echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-1.2GHz_1GB_32bit.bin"; echo " - For a QuadXPlus CPU with 2GB LPDDR4, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x_sbc_express-1.2GHz_2GB_32bit.bin"; + echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-1.2GHz_2GB_32bit.bin"; echo " - For a DualX CPU with 1GB LPDDR4, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x_sbc_express-1.2GHz_1GB_16bit.bin"; + echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-1.2GHz_1GB_16bit.bin"; echo ""; echo "2. Run the install script again."; echo ""; 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 a2f1162b9..731bd4029 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 @@ -26,20 +26,20 @@ if test -n "${module_ram}" && test -n "${soc_type}"; then if test "${soc_type}" == "dx"; then bus_width="16bit" fi - setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x_sbc_pro-${ram_freq}_${module_ram}_${bus_width}.bin; + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${ram_freq}_${module_ram}_${bus_width}.bin; else # Determine U-Boot file to program basing on SOM's variant if test -n "${module_variant}"; then if test "${module_variant}" = "0x01"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x_sbc_pro-1.2GHz_1GB_32bit.bin; + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-1.2GHz_1GB_32bit.bin; elif test "${module_variant}" = "0x02" || test "${module_variant}" = "0x03"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x_sbc_pro-1.2GHz_2GB_32bit.bin; + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-1.2GHz_2GB_32bit.bin; elif test "${module_variant}" = "0x04" || test "${module_variant}" = "0x05"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x_sbc_pro-1.2GHz_1GB_16bit.bin; + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-1.2GHz_1GB_16bit.bin; elif test "${module_variant}" = "0x06"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x_sbc_pro-1.2GHz_512GB_16bit.bin; + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-1.2GHz_512GB_16bit.bin; fi fi fi @@ -54,13 +54,13 @@ else echo ""; echo "1. Set variable 'INSTALL_UBOOT_FILENAME' depending on your ConnectCore 8X variant:"; echo " - For a QuadXPlus CPU with 1GB LPDDR4, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x_sbc_pro-1.2GHz_1GB_32bit.bin"; + echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-1.2GHz_1GB_32bit.bin"; echo " - For a QuadXPlus CPU with 2GB LPDDR4, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x_sbc_pro-1.2GHz_2GB_32bit.bin"; + echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-1.2GHz_2GB_32bit.bin"; echo " - For a DualX CPU with 1GB LPDDR4, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x_sbc_pro-1.2GHz_1GB_16bit.bin"; + echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-1.2GHz_1GB_16bit.bin"; echo " - For a DualX CPU with 512MB LPDDR4, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x_sbc_pro-1.2GHz_512MB_16bit.bin"; + echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-1.2GHz_512MB_16bit.bin"; echo ""; echo "2. Run the install script again."; echo "";