installers: add missing ##SIGNED## placeholder to uboot filenames

This gets substituted when TrustFence is enabled to "signed/encrypted"
or removed when TrustFence is disabled.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
This commit is contained in:
Hector Palacios 2025-07-02 21:15:13 +02:00
parent 9672b2a80a
commit 41810d5c17
6 changed files with 35 additions and 35 deletions

View File

@ -10,9 +10,9 @@ BASEFILENAME=0
# Determine U-Boot file to program basing on module variant # Determine U-Boot file to program basing on module variant
# If module_variant is unknown or not set, return error asking the user # If module_variant is unknown or not set, return error asking the user
if test "${module_variant}" = "0x01" || test "${module_variant}" = "0x02"; then if test "${module_variant}" = "0x01" || test "${module_variant}" = "0x02"; then
setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##2GB.imx; setenv INSTALL_UBOOT_FILENAME u-boot-##SIGNED##-##MACHINE##2GB.imx;
elif test "${module_variant}" = "0x03"; then elif test "${module_variant}" = "0x03"; then
setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##1GB.imx; setenv INSTALL_UBOOT_FILENAME u-boot-##SIGNED##-##MACHINE##1GB.imx;
fi fi
# Use 'test -n ...' because 'test -z ...' does not work well on old versions of # Use 'test -n ...' because 'test -z ...' does not work well on old versions of
@ -25,9 +25,9 @@ else
echo ""; echo "";
echo "1. Set variable 'INSTALL_UBOOT_FILENAME' depending on your ConnectCore 6 QuadPlus variant:"; echo "1. Set variable 'INSTALL_UBOOT_FILENAME' depending on your ConnectCore 6 QuadPlus variant:";
echo " - For a QuadPlus CPU with 2GB DDR3, run:"; echo " - For a QuadPlus CPU with 2GB DDR3, run:";
echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##2GB.imx"; echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##SIGNED##-##MACHINE##2GB.imx";
echo " - For a DualPlus CPU with 1GB DDR3, run:"; echo " - For a DualPlus CPU with 1GB DDR3, run:";
echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##1GB.imx"; echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##SIGNED##-##MACHINE##1GB.imx";
echo ""; echo "";
echo ""; echo "";
echo "2. Run the install script again."; echo "2. Run the install script again.";

View File

@ -142,9 +142,9 @@ if [ -z ${INSTALL_UBOOT_FILENAME} ]; then
# If module_variant is unknown or not set, return error asking the user # If module_variant is unknown or not set, return error asking the user
if [ "$module_variant" = "0x01" ] || \ if [ "$module_variant" = "0x01" ] || \
[ "$module_variant" = "0x02" ]; then [ "$module_variant" = "0x02" ]; then
INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##2GB.imx" INSTALL_UBOOT_FILENAME="u-boot-##SIGNED##-##MACHINE##2GB.imx"
elif [ "$module_variant" = "0x03" ]; then elif [ "$module_variant" = "0x03" ]; then
INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##1GB.imx" INSTALL_UBOOT_FILENAME="u-boot-##SIGNED##-##MACHINE##1GB.imx"
fi fi
# U-Boot when the checked value is empty. # U-Boot when the checked value is empty.
@ -159,9 +159,9 @@ if [ -z ${INSTALL_UBOOT_FILENAME} ]; then
echo "" echo ""
echo "1. Set variable 'INSTALL_UBOOT_FILENAME' depending on your ConnectCore 6 QuadPlus variant:" echo "1. Set variable 'INSTALL_UBOOT_FILENAME' depending on your ConnectCore 6 QuadPlus variant:"
echo " - For a QuadPlus CPU with 2GB DDR3, run:" echo " - For a QuadPlus CPU with 2GB DDR3, run:"
echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##2GB.imx" echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##SIGNED##-##MACHINE##2GB.imx"
echo " - For a DualPlus CPU with 1GB DDR3, run:" echo " - For a DualPlus CPU with 1GB DDR3, run:"
echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##1GB.imx" echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##SIGNED##-##MACHINE##1GB.imx"
echo "" echo ""
echo "" echo ""
echo "2. Run the install script again." echo "2. Run the install script again."

View File

@ -10,11 +10,11 @@ BASEFILENAME=0
# Determine U-Boot file to program basing on module variant # Determine U-Boot file to program basing on module variant
# If module_variant is unknown or not set, return error asking the user # If module_variant is unknown or not set, return error asking the user
if test "${module_variant}" = "0x12"; then if test "${module_variant}" = "0x12"; then
setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6qsbc2GB.imx; setenv INSTALL_UBOOT_FILENAME u-boot-##SIGNED##-ccimx6qsbc2GB.imx;
elif test "${module_variant}" = "0x02" || test "${module_variant}" = "0x04" || test "${module_variant}" = "0x05" || test "${module_variant}" = "0x0b" || test "${module_variant}" = "0x11" || test "${module_variant}" = "0x14" || test "${module_variant}" = "0x15" || test "${module_variant}" = "0x16"; then elif test "${module_variant}" = "0x02" || test "${module_variant}" = "0x04" || test "${module_variant}" = "0x05" || test "${module_variant}" = "0x0b" || test "${module_variant}" = "0x11" || test "${module_variant}" = "0x14" || test "${module_variant}" = "0x15" || test "${module_variant}" = "0x16"; then
setenv INSTALL_UBOOT_FILENAME u-boot-cc${soc_family}sbc.imx; setenv INSTALL_UBOOT_FILENAME u-boot-##SIGNED##-cc${soc_family}sbc.imx;
elif test "${module_variant}" = "0x03" || test "${module_variant}" = "0x0c" || test "${module_variant}" = "0x0e" || test "${module_variant}" = "0x0f" || test "${module_variant}" = "0x13"; then elif test "${module_variant}" = "0x03" || test "${module_variant}" = "0x0c" || test "${module_variant}" = "0x0e" || test "${module_variant}" = "0x0f" || test "${module_variant}" = "0x13"; then
setenv INSTALL_UBOOT_FILENAME u-boot-cc${soc_family}sbc512MB.imx; setenv INSTALL_UBOOT_FILENAME u-boot-##SIGNED##-cc${soc_family}sbc512MB.imx;
fi fi
# Use 'test -n ...' because 'test -z ...' does not work well on old versions of # Use 'test -n ...' because 'test -z ...' does not work well on old versions of
@ -27,15 +27,15 @@ else
echo ""; echo "";
echo "1. Set variable 'INSTALL_UBOOT_FILENAME' depending on your ConnectCore 6 variant:"; echo "1. Set variable 'INSTALL_UBOOT_FILENAME' depending on your ConnectCore 6 variant:";
echo " - For a Quad/Dual CPU with 2GB DDR3, run:"; echo " - For a Quad/Dual CPU with 2GB DDR3, run:";
echo " => setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6qsbc2GB.imx"; echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##SIGNED##-ccimx6qsbc2GB.imx";
echo " - For a Quad/Dual CPU with 1GB DDR3, run:"; echo " - For a Quad/Dual CPU with 1GB DDR3, run:";
echo " => setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6qsbc.imx"; echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##SIGNED##-ccimx6qsbc.imx";
echo " - For a Quad/Dual CPU with 512MB DDR3, run:"; echo " - For a Quad/Dual CPU with 512MB DDR3, run:";
echo " => setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6qsbc512MB.imx"; echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##SIGNED##-ccimx6qsbc512MB.imx";
echo " - For a DualLite/Solo CPU with 1GB DDR3, run:"; echo " - For a DualLite/Solo CPU with 1GB DDR3, run:";
echo " => setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6dlsbc.imx"; echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##SIGNED##-ccimx6dlsbc.imx";
echo " - For a DualLite/Solo CPU with 512MB DDR3, run:"; echo " - For a DualLite/Solo CPU with 512MB DDR3, run:";
echo " => setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6dlsbc512MB.imx"; echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##SIGNED##-ccimx6dlsbc512MB.imx";
echo ""; echo "";
echo "2. Run the install script again."; echo "2. Run the install script again.";
echo ""; echo "";

View File

@ -142,7 +142,7 @@ 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 [ "$module_variant" = "0x12" ]; then if [ "$module_variant" = "0x12" ]; then
INSTALL_UBOOT_FILENAME="u-boot-cc${soc_family}sbc2GB.imx" INSTALL_UBOOT_FILENAME="u-boot-##SIGNED##-cc${soc_family}sbc2GB.imx"
elif [ "$module_variant" = "0x02" ] || \ elif [ "$module_variant" = "0x02" ] || \
[ "$module_variant" = "0x04" ] || \ [ "$module_variant" = "0x04" ] || \
[ "$module_variant" = "0x05" ] || \ [ "$module_variant" = "0x05" ] || \
@ -151,13 +151,13 @@ if [ -z ${INSTALL_UBOOT_FILENAME} ]; then
[ "$module_variant" = "0x14" ] || \ [ "$module_variant" = "0x14" ] || \
[ "$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-##SIGNED##-cc${soc_family}sbc.imx"
elif [ "$module_variant" = "0x03" ] || \ elif [ "$module_variant" = "0x03" ] || \
[ "$module_variant" = "0x0c" ] || \ [ "$module_variant" = "0x0c" ] || \
[ "$module_variant" = "0x0e" ] || \ [ "$module_variant" = "0x0e" ] || \
[ "$module_variant" = "0x0f" ] || \ [ "$module_variant" = "0x0f" ] || \
[ "$module_variant" = "0x13" ]; then [ "$module_variant" = "0x13" ]; then
INSTALL_UBOOT_FILENAME="u-boot-cc${soc_family}sbc512MB.imx" INSTALL_UBOOT_FILENAME="u-boot-##SIGNED##-cc${soc_family}sbc512MB.imx"
fi fi
fi fi
@ -173,15 +173,15 @@ if [ -z ${INSTALL_UBOOT_FILENAME} ]; then
echo "" echo ""
echo "1. Set variable 'INSTALL_UBOOT_FILENAME' depending on your ConnectCore 6 variant:" echo "1. Set variable 'INSTALL_UBOOT_FILENAME' depending on your ConnectCore 6 variant:"
echo " - For a Quad/Dual CPU with 2GB DDR3, run:" echo " - For a Quad/Dual CPU with 2GB DDR3, run:"
echo " => setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6qsbc2GB.imx" echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##SIGNED##-ccimx6qsbc2GB.imx"
echo " - For a Quad/Dual CPU with 1GB DDR3, run:" echo " - For a Quad/Dual CPU with 1GB DDR3, run:"
echo " => setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6qsbc.imx" echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##SIGNED##-ccimx6qsbc.imx"
echo " - For a Quad/Dual CPU with 512MB DDR3, run:" echo " - For a Quad/Dual CPU with 512MB DDR3, run:"
echo " => setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6qsbc512MB.imx" echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##SIGNED##-ccimx6qsbc512MB.imx"
echo " - For a DualLite/Solo CPU with 1GB DDR3, run:" echo " - For a DualLite/Solo CPU with 1GB DDR3, run:"
echo " => setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6dlsbc.imx" echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##SIGNED##-ccimx6dlsbc.imx"
echo " - For a DualLite/Solo CPU with 512MB DDR3, run:" echo " - For a DualLite/Solo CPU with 512MB DDR3, run:"
echo " => setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6dlsbc512MB.imx" echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##SIGNED##-ccimx6dlsbc512MB.imx"
echo "" echo ""
echo "2. Run the install script again." echo "2. Run the install script again."
echo "" echo ""

View File

@ -10,11 +10,11 @@ BASEFILENAME=0
# Determine U-Boot file to program basing on module variant # Determine U-Boot file to program basing on module variant
# If module_variant is unknown or not set, return error asking the user # If module_variant is unknown or not set, return error asking the user
if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x03" || test "${module_variant}" = "0x06" || test "${module_variant}" = "0x09"; 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; setenv INSTALL_UBOOT_FILENAME u-boot-##SIGNED##-##MACHINE##.imx;
elif test "${module_variant}" = "0x04" || test "${module_variant}" = "0x05" || test "${module_variant}" = "0x07"; then elif test "${module_variant}" = "0x04" || test "${module_variant}" = "0x05" || test "${module_variant}" = "0x07"; then
setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##1GB.imx; setenv INSTALL_UBOOT_FILENAME u-boot-##SIGNED##-##MACHINE##1GB.imx;
elif test "${module_variant}" = "0x08" || test "${module_variant}" = "0x0a"; then elif test "${module_variant}" = "0x08" || test "${module_variant}" = "0x0a"; then
setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##512MB.imx setenv INSTALL_UBOOT_FILENAME u-boot-##SIGNED##-##MACHINE##512MB.imx
fi fi
setenv INSTALL_MEDIA_INDEX ##INSTALL_MEDIA_INDEX## setenv INSTALL_MEDIA_INDEX ##INSTALL_MEDIA_INDEX##
@ -30,11 +30,11 @@ else
echo ""; echo "";
echo "1. Set variable 'INSTALL_UBOOT_FILENAME' depending on your ConnectCore 6UL variant:"; echo "1. Set variable 'INSTALL_UBOOT_FILENAME' depending on your ConnectCore 6UL variant:";
echo " - For a SOM with 1GB DDR3, run:"; echo " - For a SOM with 1GB DDR3, run:";
echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##1GB.imx"; echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##SIGNED##-##MACHINE##1GB.imx";
echo " - For a SOM with 512MB DDR3, run:"; echo " - For a SOM with 512MB DDR3, run:";
echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##512MB.imx"; echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##SIGNED##-##MACHINE##512MB.imx";
echo " - For a SOM with 256MB DDR3, run:"; echo " - For a SOM with 256MB DDR3, run:";
echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##.imx"; echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##SIGNED##-##MACHINE##.imx";
echo ""; echo "";
echo "2. Run the install script again."; echo "2. Run the install script again.";
echo ""; echo "";

View File

@ -159,12 +159,12 @@ if [ -z "${INSTALL_UBOOT_FILENAME}" ]; then
elif [ "$module_variant" = "0x04" ] || \ elif [ "$module_variant" = "0x04" ] || \
[ "$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-##SIGNED##-##MACHINE##1GB.imx"
elif [ "$module_variant" = "0x02" ] || \ elif [ "$module_variant" = "0x02" ] || \
[ "$module_variant" = "0x03" ] || \ [ "$module_variant" = "0x03" ] || \
[ "$module_variant" = "0x06" ] || \ [ "$module_variant" = "0x06" ] || \
[ "$module_variant" = "0x09" ]; then [ "$module_variant" = "0x09" ]; then
INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##.imx" INSTALL_UBOOT_FILENAME="u-boot-##SIGNED##-##MACHINE##.imx"
fi fi
fi fi
@ -180,11 +180,11 @@ if [ -z "${INSTALL_UBOOT_FILENAME}" ]; then
echo "" echo ""
echo "1. Add U-boot file name, depending on your ConnectCore 6UL variant, to script command line:" echo "1. Add U-boot file name, depending on your ConnectCore 6UL variant, to script command line:"
echo " - For a SOM with 1GB DDR3, run:" echo " - For a SOM with 1GB DDR3, run:"
echo " => ./install_linux_fw_uuu.sh -u u-boot-##MACHINE##1GB.imx" echo " => ./install_linux_fw_uuu.sh -u u-boot-##SIGNED##-##MACHINE##1GB.imx"
echo " - For a SOM with 512MB DDR3, run:" echo " - For a SOM with 512MB DDR3, run:"
echo " => ./install_linux_fw_uuu.sh -u u-boot-##MACHINE##512MB.imx" echo " => ./install_linux_fw_uuu.sh -u u-boot-##SIGNED##-##MACHINE##512MB.imx"
echo " - For a SOM with 256MB DDR3, run:" echo " - For a SOM with 256MB DDR3, run:"
echo " => ./install_linux_fw_uuu.sh -u u-boot-##MACHINE##.imx" echo " => ./install_linux_fw_uuu.sh -u u-boot-##SIGNED##-##MACHINE##.imx"
echo "" echo ""
echo "2. Run the install script again." echo "2. Run the install script again."
echo "" echo ""