From 4a057144eec65188a9a8f92067c9d59242ec26d6 Mon Sep 17 00:00:00 2001 From: Isaac Hermida Date: Thu, 25 Jan 2024 17:41:04 +0100 Subject: [PATCH] u-boot-dey: installation scripts: do not check recovery image for dual systems Recovery image is not required for dual systems, so do not check it. https://onedigi.atlassian.net/browse/DEL-8859 Signed-off-by: Isaac Hermida --- .../u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_sd.txt | 6 +++++- .../u-boot-dey/ccimx6qpsbc/install_linux_fw_usb.txt | 6 +++++- .../u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh | 5 ++++- .../u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt | 6 +++++- .../u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt | 6 +++++- .../u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh | 5 ++++- .../u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt | 6 +++++- .../u-boot/u-boot-dey/ccimx6ul/install_linux_fw_usb.txt | 6 +++++- .../u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh | 7 +++++-- .../u-boot/u-boot-dey/ccimx8m/install_linux_fw_sd.txt | 6 +++++- .../u-boot/u-boot-dey/ccimx8m/install_linux_fw_usb.txt | 6 +++++- .../u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh | 7 +++++-- .../u-boot/u-boot-dey/ccimx8x/install_linux_fw_sd.txt | 6 +++++- .../u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt | 6 +++++- .../u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh | 7 +++++-- .../u-boot/u-boot-dey/ccimx93/install_linux_fw_sd.txt | 6 +++++- .../u-boot/u-boot-dey/ccimx93/install_linux_fw_usb.txt | 6 +++++- .../u-boot/u-boot-dey/ccimx93/install_linux_fw_uuu.sh | 7 +++++-- .../u-boot/u-boot-dey/ccmp1/install_linux_fw_sd.txt | 6 +++++- .../u-boot/u-boot-dey/ccmp1/install_linux_fw_usb.txt | 6 +++++- .../u-boot/u-boot-dey/ccmp1/install_linux_fw_uuu.sh | 8 ++++++-- 21 files changed, 104 insertions(+), 26 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_sd.txt index fa3fcf71f..b83524d0a 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_sd.txt @@ -56,7 +56,11 @@ setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4 # Check for presence of firmware files on the SD card -for install_f in ${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME}; do +FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" +if test "${dualboot}" != "yes"; then + FILES="${FILES} ${INSTALL_RECOVERY_FILENAME}" +fi +for install_f in ${FILES}; do if test ! -e mmc ${INSTALL_MMCDEV} ${install_f}; then echo "ERROR: Could not find file ${install_f}"; install_abort=1; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_usb.txt index 6825d13bd..1881db30e 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_usb.txt @@ -56,7 +56,11 @@ setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4 # Check for presence of firmware files on the USB -for install_f in ${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME}; do +FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" +if test "${dualboot}" != "yes"; then + FILES="${FILES} ${INSTALL_RECOVERY_FILENAME}" +fi +for install_f in ${FILES}; do if test ! -e usb ${INSTALL_USBDEV} ${install_f}; then echo "ERROR: Could not find file ${install_f}"; install_abort=1; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh index 5a22ff55d..3aefbabf0 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh @@ -166,7 +166,10 @@ if [ -f ${COMPRESSED_ROOTFS_IMAGE} ] && [ ! -f ${INSTALL_ROOTFS_FILENAME} ]; the fi # Verify existence of files before starting the update -FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME}" +FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" +if [ "${DUALBOOT}" != true ]; then + FILES="${FILES} ${INSTALL_RECOVERY_FILENAME}" +fi for f in ${FILES}; do if [ ! -f ${f} ]; then echo "\033[31m[ERROR] Could not find file '${f}'\033[0m" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt index b587cfe7f..aa426b077 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt @@ -63,7 +63,11 @@ setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4 # Check for presence of firmware files on the SD card -for install_f in ${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME}; do +FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" +if test "${dualboot}" != "yes"; then + FILES="${FILES} ${INSTALL_RECOVERY_FILENAME}" +fi +for install_f in ${FILES}; do if test ! -e mmc ${INSTALL_MMCDEV} ${install_f}; then echo "ERROR: Could not find file ${install_f}"; install_abort=1; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt index 367c7ae7c..ddc141d94 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt @@ -63,7 +63,11 @@ setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4 # Check for presence of firmware files on the USB -for install_f in ${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME}; do +FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" +if test "${dualboot}" != "yes"; then + FILES="${FILES} ${INSTALL_RECOVERY_FILENAME}" +fi +for install_f in ${FILES}; do if test ! -e usb ${INSTALL_USBDEV} ${install_f}; then echo "ERROR: Could not find file ${install_f}"; install_abort=1; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh index 1b30133ff..499762a32 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh @@ -185,7 +185,10 @@ if [ -f ${COMPRESSED_ROOTFS_IMAGE} ] && [ ! -f ${INSTALL_ROOTFS_FILENAME} ]; the fi # Verify existence of files before starting the update -FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME}" +FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" +if [ "${DUALBOOT}" != true ]; then + FILES"${INSTALL_RECOVERY_FILENAME}" +fi for f in ${FILES}; do if [ ! -f ${f} ]; then echo "\033[31m[ERROR] Could not find file '${f}'\033[0m" 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 b2486c79d..6beae5bcf 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 @@ -59,7 +59,11 @@ setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.ubifs setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ubifs # Check for presence of firmware files on the SD card -for install_f in ${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME}; do +FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" +if test "${dualboot}" != "yes"; then + FILES="${FILES} ${INSTALL_RECOVERY_FILENAME}" +fi +for install_f in ${FILES}; do if test ! -e mmc ${INSTALL_MMCDEV} ${install_f}; then echo "ERROR: Could not find file ${install_f}"; install_abort=1; 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 440709c04..3a88ce753 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 @@ -59,7 +59,11 @@ setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.ubifs setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ubifs # Check for presence of firmware files on the USB -for install_f in ${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME}; do +FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" +if test "${dualboot}" != "yes"; then + FILES="${FILES} ${INSTALL_RECOVERY_FILENAME}" +fi +for install_f in ${FILES}; do if test ! -e usb ${INSTALL_USBDEV} ${install_f}; then echo "ERROR: Could not find file ${install_f}"; install_abort=1; 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 390e9c713..79e306ec0 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 @@ -1,7 +1,7 @@ #!/bin/sh #=============================================================================== # -# Copyright (C) 2020-2023 by Digi International Inc. +# Copyright (C) 2020-2024 by Digi International Inc. # All rights reserved. # # This program is free software; you can redistribute it and/or modify it @@ -178,7 +178,10 @@ INSTALL_RECOVERY_FILENAME="${BASEFILENAME}-##MACHINE##.recovery.ubifs" INSTALL_ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ubifs" # Verify existence of files before starting the update -FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME}" +FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" +if [ "${DUALBOOT}" != true ]; then + FILES="${FILES} ${INSTALL_RECOVERY_FILENAME}" +fi for f in ${FILES}; do if [ ! -f ${f} ]; then echo "\033[31m[ERROR] Could not find file '${f}'\033[0m" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_sd.txt index 01bd2a074..466f98c81 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_sd.txt @@ -27,7 +27,11 @@ setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4 # Check for presence of firmware files on the SD card -for install_f in ${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME}; do +FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" +if test "${dualboot}" != "yes"; then + FILES="${FILES} ${INSTALL_RECOVERY_FILENAME}" +fi +for install_f in ${FILES}; do if test ! -e mmc ${INSTALL_MMCDEV} ${install_f}; then echo "ERROR: Could not find file ${install_f}"; install_abort=1; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_usb.txt index 41e894c18..4635ae21c 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_usb.txt @@ -27,7 +27,11 @@ setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4 # Check for presence of firmware files on the USB -for install_f in ${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME}; do +FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" +if test "${dualboot}" != "yes"; then + FILES="${FILES} ${INSTALL_RECOVERY_FILENAME}" +fi +for install_f in ${FILES}; do if test ! -e usb ${INSTALL_USBDEV} ${install_f}; then echo "ERROR: Could not find file ${install_f}"; install_abort=1; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh index 1ee6c2f79..e8377be78 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh @@ -1,7 +1,7 @@ #!/bin/sh #=============================================================================== # -# Copyright (C) 2020-2023 by Digi International Inc. +# Copyright (C) 2020-2024 by Digi International Inc. # All rights reserved. # # This program is free software; you can redistribute it and/or modify it @@ -134,7 +134,10 @@ if [ -f ${COMPRESSED_ROOTFS_IMAGE} ] && [ ! -f ${INSTALL_ROOTFS_FILENAME} ]; the fi # Verify existence of files before starting the update -FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME}" +FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" +if [ "${DUALBOOT}" != true ]; then + FILES="${FILES} ${INSTALL_RECOVERY_FILENAME}" +fi for f in ${FILES}; do if [ ! -f ${f} ]; then echo "\033[31m[ERROR] Could not find file '${f}'\033[0m" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_sd.txt index 3f621311a..4ff66b973 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_sd.txt @@ -39,7 +39,11 @@ setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4 # Check for presence of firmware files on the SD card -for install_f in ${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME}; do +FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" +if test "${dualboot}" != "yes"; then + FILES="${FILES} ${INSTALL_RECOVERY_FILENAME}" +fi +for install_f in ${FILES}; do if test ! -e mmc ${INSTALL_MMCDEV} ${install_f}; then echo "ERROR: Could not find file ${install_f}"; install_abort=1; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt index 1438c0739..f75804f65 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt @@ -39,7 +39,11 @@ setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4 # Check for presence of firmware files on the USB -for install_f in ${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME}; do +FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" +if test "${dualboot}" != "yes"; then + FILES="${FILES} ${INSTALL_RECOVERY_FILENAME}" +fi +for install_f in ${FILES}; do if test ! -e usb ${INSTALL_USBDEV} ${install_f}; then echo "ERROR: Could not find file ${install_f}"; install_abort=1; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh index 068e09ac0..8c4c0399b 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh @@ -1,7 +1,7 @@ #!/bin/sh #=============================================================================== # -# Copyright (C) 2020-2023 by Digi International Inc. +# Copyright (C) 2020-2024 by Digi International Inc. # All rights reserved. # # This program is free software; you can redistribute it and/or modify it @@ -141,7 +141,10 @@ if [ -f ${COMPRESSED_ROOTFS_IMAGE} ] && [ ! -f ${INSTALL_ROOTFS_FILENAME} ]; the fi # Verify existence of files before starting the update -FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME}" +FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" +if [ "${DUALBOOT}" != true ]; then + FILES="${FILES} ${INSTALL_RECOVERY_FILENAME}" +fi for f in ${FILES}; do if [ ! -f ${f} ]; then echo "\033[31m[ERROR] Could not find file '${f}'\033[0m" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_sd.txt index 153f27aa3..31f7bd298 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_sd.txt @@ -40,7 +40,11 @@ setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4 # Check for presence of firmware files on the SD card -for install_f in ${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME}; do +FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" +if test "${dualboot}" != "yes"; then + FILES="${FILES} ${INSTALL_RECOVERY_FILENAME}" +fi +for install_f in ${FILES}; do if test ! -e mmc ${INSTALL_MMCDEV} ${install_f}; then echo "ERROR: Could not find file ${install_f}"; install_abort=1; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_usb.txt index 5e536006b..d1a80f0d7 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_usb.txt @@ -40,7 +40,11 @@ setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4 # Check for presence of firmware files on the USB -for install_f in ${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME}; do +FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" +if test "${dualboot}" != "yes"; then + FILES="${FILES} ${INSTALL_RECOVERY_FILENAME}" +fi +for install_f in ${FILES}; do if test ! -e usb ${INSTALL_USBDEV} ${install_f}; then echo "ERROR: Could not find file ${install_f}"; install_abort=1; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_uuu.sh index fcf342151..7e1e51786 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_uuu.sh @@ -1,7 +1,7 @@ #!/bin/sh #=============================================================================== # -# Copyright (C) 2020-2023 by Digi International Inc. +# Copyright (C) 2020-2024 by Digi International Inc. # All rights reserved. # # This program is free software; you can redistribute it and/or modify it @@ -144,7 +144,10 @@ if [ -f ${COMPRESSED_ROOTFS_IMAGE} ] && [ ! -f ${INSTALL_ROOTFS_FILENAME} ]; the fi # Verify existence of files before starting the update -FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME}" +FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME}" +if [ "${DUALBOOT}" != true ]; then + FILES="${FILES} ${INSTALL_RECOVERY_FILENAME}" +fi for f in ${FILES}; do if [ ! -f ${f} ]; then echo "\033[31m[ERROR] Could not find file '${f}'\033[0m" 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 798a42ea1..6029d27b0 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 @@ -28,7 +28,11 @@ setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.ubifs setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ubifs # Check for presence of firmware files on the SD card -for install_f in ${INSTALL_ATF_FILENAME} ${INSTALL_FIP_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME}; do +FILES="${INSTALL_ATF_FILENAME} ${INSTALL_FIP_FILENAME} ${INSTALL_LINUX_FILENAME}" +if test "${dualboot}" != "yes"; then + FILES="${FILES} ${INSTALL_RECOVERY_FILENAME}" +fi +for install_f in ${FILES}; do if test ! -e mmc ${INSTALL_MMCDEV} ${install_f}; then echo "ERROR: Could not find file ${install_f}"; install_abort=1; 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 03415add1..7792fb112 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 @@ -28,7 +28,11 @@ setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.ubifs setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ubifs # Check for presence of firmware files on the USB -for install_f in ${INSTALL_ATF_FILENAME} ${INSTALL_FIP_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME}; do +FILES="${INSTALL_ATF_FILENAME} ${INSTALL_FIP_FILENAME} ${INSTALL_LINUX_FILENAME}" +if test "${dualboot}" != "yes"; then + FILES="${FILES} ${INSTALL_RECOVERY_FILENAME}" +fi +for install_f in ${FILES}; do if test ! -e usb ${INSTALL_USBDEV} ${install_f}; then echo "ERROR: Could not find file ${install_f}"; install_abort=1; 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 f08aaf979..2373e4587 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 @@ -1,7 +1,7 @@ #!/bin/sh #=============================================================================== # -# Copyright (C) 2022-2023 by Digi International Inc. +# Copyright (C) 2022-2024 by Digi International Inc. # All rights reserved. # # This program is free software; you can redistribute it and/or modify it @@ -145,7 +145,11 @@ INSTALL_RECOVERY_FILENAME="${BASEFILENAME}-##MACHINE##.recovery.ubifs" INSTALL_ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ubifs" # Verify existence of files before starting the update -FILES="${INSTALL_ATF_FILENAME} ${INSTALL_FIP_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME}" +FILES="${INSTALL_ATF_FILENAME} ${INSTALL_FIP_FILENAME} ${INSTALL_LINUX_FILENAME}" +if [ "${DUALBOOT}" != true ]; then + FILES="${FILES} ${INSTALL_RECOVERY_FILENAME}" +fi + for f in ${FILES}; do if [ ! -f ${f} ]; then echo "\033[31m[ERROR] Could not find file '${f}'\033[0m"