Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

install_linux_fw_uuu: do not assing a default U-Boot file for 0x00 variants 

In case a HWID is not set or the variant is unknown, do not set it to a default
U-Boot file but ask the user for the proper file.
This case should not happen, but cover it for safety.

https://onedigi.atlassian.net/browse/DEL-8855

Signed-off-by: Isaac Hermida <isaac.hermida@digi.com>
This commit is contained in:
Isaac Hermida 2024-01-24 18:07:44 +01:00
parent b3391941dd
commit 75bd0d887b
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh
View File

@ -100,14 +100,13 @@ echo "Determining image files to use..."
if [ -z ${INSTALL_UBOOT_FILENAME} ]; then if [ -z ${INSTALL_UBOOT_FILENAME} ]; then
module_variant=$(getenv "module_variant") module_variant=$(getenv "module_variant")
# Determine U-Boot file to program basing on SOM's variant # Determine U-Boot file to program basing on SOM's variant
if [ -n "$module_variant" ] || [ "$module_variant" = "0x00" ]; then if [ -n "$module_variant" ]; then
if [ "$module_variant" = "0x01" ] || \ if [ "$module_variant" = "0x01" ] || \
[ "$module_variant" = "0x02" ]; then [ "$module_variant" = "0x02" ]; then
module_ram="2GB" INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##2GB.imx"
else elif [ "$module_variant" = "0x03" ] || \
module_ram="1GB" INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##1GB.imx"
fi fi
INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##${module_ram}.imx"
fi fi
# U-Boot when the checked value is empty. # U-Boot when the checked value is empty.

8
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh
View File

@ -102,7 +102,7 @@ if [ -z ${INSTALL_UBOOT_FILENAME} ]; then
if [ -n "$soc_family" ]; then if [ -n "$soc_family" ]; then
module_variant=$(getenv "module_variant") module_variant=$(getenv "module_variant")
# Determine U-Boot file to program basing on SOM's variant # Determine U-Boot file to program basing on SOM's variant
if [ -n "$module_variant" ] || [ "$module_variant" = "0x00" ]; then if [ -n "$module_variant" ]; then
if [ "$module_variant" = "0x12" ]; then if [ "$module_variant" = "0x12" ]; then
INSTALL_UBOOT_FILENAME="u-boot-cc${soc_family}sbc2GB.imx" INSTALL_UBOOT_FILENAME="u-boot-cc${soc_family}sbc2GB.imx"
elif [ "$module_variant" = "0x01" ] || \ elif [ "$module_variant" = "0x01" ] || \
@ -117,7 +117,11 @@ if [ -z ${INSTALL_UBOOT_FILENAME} ]; then
[ "$module_variant" = "0x15" ] || \ [ "$module_variant" = "0x15" ] || \
[ "$module_variant" = "0x16" ]; then [ "$module_variant" = "0x16" ]; then
INSTALL_UBOOT_FILENAME="u-boot-cc${soc_family}sbc.imx" INSTALL_UBOOT_FILENAME="u-boot-cc${soc_family}sbc.imx"
else elif [ "$module_variant" = "0x03" ] || \
[ "$module_variant" = "0x0c" ] || \
[ "$module_variant" = "0x0e" ] || \
[ "$module_variant" = "0x0f" ] || \
[ "$module_variant" = "0x13" ]; then
INSTALL_UBOOT_FILENAME="u-boot-cc${soc_family}sbc512MB.imx" INSTALL_UBOOT_FILENAME="u-boot-cc${soc_family}sbc512MB.imx"
fi fi
fi fi

7
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh
View File

@ -115,7 +115,7 @@ echo "Determining image files to use..."
if [ -z "${INSTALL_UBOOT_FILENAME}" ]; then if [ -z "${INSTALL_UBOOT_FILENAME}" ]; then
module_variant=$(getenv "module_variant") module_variant=$(getenv "module_variant")
# Determine U-Boot file to program basing on SOM's variant # Determine U-Boot file to program basing on SOM's variant
if [ -n "$module_variant" ] || [ "$module_variant" = "0x00" ]; then if [ -n "$module_variant" ]; then
if [ "$module_variant" = "0x08" ] || \ if [ "$module_variant" = "0x08" ] || \
[ "$module_variant" = "0x0a" ]; then [ "$module_variant" = "0x0a" ]; then
INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##512MB.imx" INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##512MB.imx"
@ -123,7 +123,10 @@ if [ -z "${INSTALL_UBOOT_FILENAME}" ]; then
[ "$module_variant" = "0x05" ] || \ [ "$module_variant" = "0x05" ] || \
[ "$module_variant" = "0x07" ]; then [ "$module_variant" = "0x07" ]; then
INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##1GB.imx" INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##1GB.imx"
else elif [ "$module_variant" = "0x02" ] || \
[ "$module_variant" = "0x03" ] || \
[ "$module_variant" = "0x06" ] || \
[ "$module_variant" = "0x09" ]; then
INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##.imx" INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##.imx"
fi fi
fi fi