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

u-boot-dey: install fip-b unconditionally in install scripts 

Partitions 'fip-a' and 'fip-b' are redundant at the moment. They are
not currently part of the dualboot system. In consequence, program
both partitons unconditionally during the install process.

Signed-off-by: Gonzalo Ruiz <Gonzalo.Ruiz@digi.com>
This commit is contained in:
Gonzalo Ruiz 2023-03-06 16:13:30 +01:00
parent 739f1b6ab0
commit 732f8cb0cf
3 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_sd.txt
View File

@ -51,9 +51,7 @@ echo " --------- --------"
echo " fsbl1 ${INSTALL_ATF_FILENAME}" echo " fsbl1 ${INSTALL_ATF_FILENAME}"
echo " fsbl2 ${INSTALL_ATF_FILENAME}" echo " fsbl2 ${INSTALL_ATF_FILENAME}"
echo " fip-a ${INSTALL_FIP_FILENAME}" echo " fip-a ${INSTALL_FIP_FILENAME}"
if test "${install_dualboot}" = "yes"; then echo " fip-b ${INSTALL_FIP_FILENAME}"
echo " fip-b ${INSTALL_FIP_FILENAME}"
fi
if test "${dualboot}" = "yes"; then if test "${dualboot}" = "yes"; then
echo " linux_a ${INSTALL_LINUX_FILENAME}" echo " linux_a ${INSTALL_LINUX_FILENAME}"
if test "${install_dualboot}" = "yes"; then if test "${install_dualboot}" = "yes"; then
@ -117,14 +115,12 @@ if test $? -eq 1; then
echo "Aborted."; echo "Aborted.";
exit; exit;
fi fi
if test "${install_dualboot}" = "yes"; then update fip-b mmc ${INSTALL_MMCDEV} ${INSTALL_FIP_FILENAME}
update fip-b mmc ${INSTALL_MMCDEV} ${INSTALL_FIP_FILENAME} if test $? -eq 1; then
if test $? -eq 1; then echo "[ERROR] Failed to update fip-b!";
echo "[ERROR] Failed to update fip-b!"; echo "";
echo ""; echo "Aborted.";
echo "Aborted."; exit;
exit;
fi
fi fi
# Check if uboot_config volume exists (U-Boot env) # Check if uboot_config volume exists (U-Boot env)

18
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_usb.txt
View File

@ -51,9 +51,7 @@ echo " --------- --------"
echo " fsbl1 ${INSTALL_ATF_FILENAME}" echo " fsbl1 ${INSTALL_ATF_FILENAME}"
echo " fsbl2 ${INSTALL_ATF_FILENAME}" echo " fsbl2 ${INSTALL_ATF_FILENAME}"
echo " fip-a ${INSTALL_FIP_FILENAME}" echo " fip-a ${INSTALL_FIP_FILENAME}"
if test "${install_dualboot}" = "yes"; then echo " fip-b ${INSTALL_FIP_FILENAME}"
echo " fip-b ${INSTALL_FIP_FILENAME}"
fi
if test "${dualboot}" = "yes"; then if test "${dualboot}" = "yes"; then
echo " linux_a ${INSTALL_LINUX_FILENAME}" echo " linux_a ${INSTALL_LINUX_FILENAME}"
if test "${install_dualboot}" = "yes"; then if test "${install_dualboot}" = "yes"; then
@ -117,14 +115,12 @@ if test $? -eq 1; then
echo "Aborted."; echo "Aborted.";
exit; exit;
fi fi
if test "${install_dualboot}" = "yes"; then update fip-b usb ${INSTALL_USBDEV} ${INSTALL_FIP_FILENAME}
update fip-b usb ${INSTALL_USBDEV} ${INSTALL_FIP_FILENAME} if test $? -eq 1; then
if test $? -eq 1; then echo "[ERROR] Failed to update fip-b!";
echo "[ERROR] Failed to update fip-b!"; echo "";
echo ""; echo "Aborted.";
echo "Aborted."; exit;
exit;
fi
fi fi
# Check if uboot_config volume exists (U-Boot env) # Check if uboot_config volume exists (U-Boot env)

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

@ -171,9 +171,7 @@ if [ "${NOWAIT}" != true ]; then
printf " fsbl1\t${INSTALL_ATF_FILENAME}\n" printf " fsbl1\t${INSTALL_ATF_FILENAME}\n"
printf " fsbl2\t${INSTALL_ATF_FILENAME}\n" printf " fsbl2\t${INSTALL_ATF_FILENAME}\n"
printf " fip-a\t${INSTALL_FIP_FILENAME}\n" printf " fip-a\t${INSTALL_FIP_FILENAME}\n"
if [ "${INSTALL_DUALBOOT}" = true ]; then printf " fip-b\t${INSTALL_FIP_FILENAME}\n"
printf " fip-b\t${INSTALL_FIP_FILENAME}\n"
fi
if [ "${DUALBOOT}" = true ]; then if [ "${DUALBOOT}" = true ]; then
printf " ${LINUX_NAME}_a\t${INSTALL_LINUX_FILENAME}\n" printf " ${LINUX_NAME}_a\t${INSTALL_LINUX_FILENAME}\n"
if [ "${INSTALL_DUALBOOT}" = true ]; then if [ "${INSTALL_DUALBOOT}" = true ]; then
@ -212,9 +210,7 @@ part_update "fsbl2" "${INSTALL_ATF_FILENAME}" 5000
# Update FIP # Update FIP
part_update "fip-a" "${INSTALL_FIP_FILENAME}" 5000 part_update "fip-a" "${INSTALL_FIP_FILENAME}" 5000
if [ "${INSTALL_DUALBOOT}" = true ]; then part_update "fip-b" "${INSTALL_FIP_FILENAME}" 5000
part_update "fip-b" "${INSTALL_FIP_FILENAME}" 5000
fi
# Environment volume does not exist and needs to be created # Environment volume does not exist and needs to be created
if [ "${RUNVOLS}" = true ]; then if [ "${RUNVOLS}" = true ]; then