From 33f881806aa0c6bd2afab240b2016821f40258e5 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 21 Jun 2022 11:50:40 +0200 Subject: [PATCH] uboot: install scripts: fix u-boot image for variants 0x09 and 0x0a Signed-off-by: Javier Viguera (cherry picked from commit 16eded4f0edcc603de83be7155f7c09718ba5ddd) Signed-off-by: Javier Viguera --- .../u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt | 4 ++-- .../u-boot/u-boot-dey/ccimx6ul/install_linux_fw_usb.txt | 4 ++-- .../u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt index 6483ab906..b9b2fde98 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt @@ -9,11 +9,11 @@ BASEFILENAME=0 # Determine U-Boot file to program basing on module variant if test -n "${module_variant}"; then - if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x03" || test "${module_variant}" = "0x06" || test "${module_variant}" = "0x0a"; then + if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x03" || test "${module_variant}" = "0x06" || test "${module_variant}" = "0x09"; then setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##.imx; elif test "${module_variant}" = "0x04" || test "${module_variant}" = "0x05" || test "${module_variant}" = "0x07"; then setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##1GB.imx; - elif test "${module_variant}" = "0x08" || test "${module_variant}" = "0x09"; then + elif test "${module_variant}" = "0x08" || test "${module_variant}" = "0x0a"; then setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##512MB.imx fi fi diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_usb.txt index 1fedd6a49..297814629 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_usb.txt @@ -9,11 +9,11 @@ BASEFILENAME=0 # Determine U-Boot file to program basing on module variant if test -n "${module_variant}"; then - if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x03" || test "${module_variant}" = "0x06" || test "${module_variant}" = "0x0a"; then + if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x03" || test "${module_variant}" = "0x06" || test "${module_variant}" = "0x09"; then setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##.imx; elif test "${module_variant}" = "0x04" || test "${module_variant}" = "0x05" || test "${module_variant}" = "0x07"; then setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##1GB.imx; - elif test "${module_variant}" = "0x08" || test "${module_variant}" = "0x09"; then + elif test "${module_variant}" = "0x08" || test "${module_variant}" = "0x0a"; then setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##512MB.imx fi fi diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh index fe346999c..6a352a1d4 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh @@ -112,7 +112,7 @@ if [ -z "${INSTALL_UBOOT_FILENAME}" ]; then # Determine U-Boot file to program basing on SOM's variant if [ -n "$module_variant" ] || [ "$module_variant" = "0x00" ]; then if [ "$module_variant" = "0x08" ] || \ - [ "$module_variant" = "0x09" ]; then + [ "$module_variant" = "0x0a" ]; then INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##512MB.imx" elif [ "$module_variant" = "0x04" ] || \ [ "$module_variant" = "0x05" ] || \