From 732f8cb0cf9a9d681decac68364c415c3dda021d Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Mon, 6 Mar 2023 16:13:30 +0100 Subject: [PATCH] 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 --- .../u-boot-dey/ccmp1/install_linux_fw_sd.txt | 18 +++++++----------- .../u-boot-dey/ccmp1/install_linux_fw_usb.txt | 18 +++++++----------- .../u-boot-dey/ccmp1/install_linux_fw_uuu.sh | 8 ++------ 3 files changed, 16 insertions(+), 28 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_sd.txt index 4e86519f6..cdfa0d917 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_sd.txt @@ -51,9 +51,7 @@ echo " --------- --------" echo " fsbl1 ${INSTALL_ATF_FILENAME}" echo " fsbl2 ${INSTALL_ATF_FILENAME}" echo " fip-a ${INSTALL_FIP_FILENAME}" -if test "${install_dualboot}" = "yes"; then - echo " fip-b ${INSTALL_FIP_FILENAME}" -fi +echo " fip-b ${INSTALL_FIP_FILENAME}" if test "${dualboot}" = "yes"; then echo " linux_a ${INSTALL_LINUX_FILENAME}" if test "${install_dualboot}" = "yes"; then @@ -117,14 +115,12 @@ if test $? -eq 1; then echo "Aborted."; exit; fi -if test "${install_dualboot}" = "yes"; then - update fip-b mmc ${INSTALL_MMCDEV} ${INSTALL_FIP_FILENAME} - if test $? -eq 1; then - echo "[ERROR] Failed to update fip-b!"; - echo ""; - echo "Aborted."; - exit; - fi +update fip-b mmc ${INSTALL_MMCDEV} ${INSTALL_FIP_FILENAME} +if test $? -eq 1; then + echo "[ERROR] Failed to update fip-b!"; + echo ""; + echo "Aborted."; + exit; fi # Check if uboot_config volume exists (U-Boot env) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_usb.txt index 393da9d47..6a0fa9968 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_usb.txt @@ -51,9 +51,7 @@ echo " --------- --------" echo " fsbl1 ${INSTALL_ATF_FILENAME}" echo " fsbl2 ${INSTALL_ATF_FILENAME}" echo " fip-a ${INSTALL_FIP_FILENAME}" -if test "${install_dualboot}" = "yes"; then - echo " fip-b ${INSTALL_FIP_FILENAME}" -fi +echo " fip-b ${INSTALL_FIP_FILENAME}" if test "${dualboot}" = "yes"; then echo " linux_a ${INSTALL_LINUX_FILENAME}" if test "${install_dualboot}" = "yes"; then @@ -117,14 +115,12 @@ if test $? -eq 1; then echo "Aborted."; exit; fi -if test "${install_dualboot}" = "yes"; then - update fip-b usb ${INSTALL_USBDEV} ${INSTALL_FIP_FILENAME} - if test $? -eq 1; then - echo "[ERROR] Failed to update fip-b!"; - echo ""; - echo "Aborted."; - exit; - fi +update fip-b usb ${INSTALL_USBDEV} ${INSTALL_FIP_FILENAME} +if test $? -eq 1; then + echo "[ERROR] Failed to update fip-b!"; + echo ""; + echo "Aborted."; + exit; fi # Check if uboot_config volume exists (U-Boot env) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_uuu.sh index 5c203eca0..def428e67 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_uuu.sh @@ -171,9 +171,7 @@ if [ "${NOWAIT}" != true ]; then printf " fsbl1\t${INSTALL_ATF_FILENAME}\n" printf " fsbl2\t${INSTALL_ATF_FILENAME}\n" printf " fip-a\t${INSTALL_FIP_FILENAME}\n" - if [ "${INSTALL_DUALBOOT}" = true ]; then - printf " fip-b\t${INSTALL_FIP_FILENAME}\n" - fi + printf " fip-b\t${INSTALL_FIP_FILENAME}\n" if [ "${DUALBOOT}" = true ]; then printf " ${LINUX_NAME}_a\t${INSTALL_LINUX_FILENAME}\n" if [ "${INSTALL_DUALBOOT}" = true ]; then @@ -212,9 +210,7 @@ part_update "fsbl2" "${INSTALL_ATF_FILENAME}" 5000 # Update FIP part_update "fip-a" "${INSTALL_FIP_FILENAME}" 5000 -if [ "${INSTALL_DUALBOOT}" = true ]; then - part_update "fip-b" "${INSTALL_FIP_FILENAME}" 5000 -fi +part_update "fip-b" "${INSTALL_FIP_FILENAME}" 5000 # Environment volume does not exist and needs to be created if [ "${RUNVOLS}" = true ]; then