From fa3028a17e2305f4468f8461ac7f1143e122a501 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Tue, 28 Sep 2021 12:15:20 +0200 Subject: [PATCH] uboot: install sd/usb: convert double condition in a simpler single condition Signed-off-by: Hector Palacios --- .../u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_sd.txt | 2 +- .../u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_usb.txt | 2 +- .../u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt | 2 +- .../u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt | 2 +- .../u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt | 4 ++-- .../u-boot/u-boot-dey/ccimx6ul/install_linux_fw_usb.txt | 4 ++-- .../u-boot/u-boot-dey/ccimx8m/install_linux_fw_sd.txt | 2 +- .../u-boot/u-boot-dey/ccimx8m/install_linux_fw_usb.txt | 2 +- .../u-boot/u-boot-dey/ccimx8x/install_linux_fw_sd.txt | 2 +- .../u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt | 2 +- 10 files changed, 12 insertions(+), 12 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 95cdb1a8c..804b47eb4 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 @@ -243,7 +243,7 @@ setenv bootcmd " echo \"\"; echo \"\"; echo \">> Firmware installation complete.\"; - if test ! -n \$\{dualboot\} || test \$\{dualboot\} = no; then + if test \"\$\{dualboot\}\" != yes; then echo \"Rebooting into recovery mode for final deployment.\"; fi; echo \"\"; 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 cb49d84fd..ac8b70021 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 @@ -246,7 +246,7 @@ setenv bootcmd " echo \"\"; echo \"\"; echo \">> Firmware installation complete.\"; - if test ! -n \$\{dualboot\} || test \$\{dualboot\} = no; then + if test \"\$\{dualboot\}\" != yes; then echo \"Rebooting into recovery mode for final deployment.\"; fi; echo \"\"; 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 798d0f77a..caec690ee 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 @@ -254,7 +254,7 @@ setenv bootcmd " echo \"\"; echo \"\"; echo \">> Firmware installation complete.\"; - if test ! -n \$\{dualboot\} || test \$\{dualboot\} = no; then + if test \"\$\{dualboot\}\" != yes; then echo \"Rebooting into recovery mode for final deployment.\"; fi; echo \"\"; 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 42b76cc29..371e26a92 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 @@ -257,7 +257,7 @@ setenv bootcmd " echo \"\"; echo \"\"; echo \">> Firmware installation complete.\"; - if test ! -n \$\{dualboot\} || test \$\{dualboot\} = no; then + if test \"\$\{dualboot\}\" != yes; then echo \"Rebooting into recovery mode for final deployment.\"; fi; echo \"\"; 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 9a8494f19..2f6f87610 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 @@ -236,7 +236,7 @@ setenv bootcmd " exit; fi; echo \"\"; - if test ! -n \$\{ubisysvols\} || test \"\$\{ubisysvols\}\" = no; then + if test \"\$\{ubisysvols\}\" != yes; then nand erase.part update; fi; setenv boot_recovery yes; @@ -246,7 +246,7 @@ setenv bootcmd " echo \"\"; echo \"\"; echo \">> Firmware installation complete.\"; - if test ! -n \$\{dualboot\} || test \$\{dualboot\} = no; then + if test \"\$\{dualboot\}\" != yes; then echo \"Rebooting into recovery mode for final deployment.\"; fi; echo \"\"; 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 7c7cf8c14..2210bc23c 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 @@ -237,7 +237,7 @@ setenv bootcmd " exit; fi; echo \"\"; - if test ! -n \$\{ubisysvols\} || test \"\$\{ubisysvols\}\" = no; then + if test \"\$\{ubisysvols\}\" != yes; then nand erase.part update; fi; setenv boot_recovery yes; @@ -247,7 +247,7 @@ setenv bootcmd " echo \"\"; echo \"\"; echo \">> Firmware installation complete.\"; - if test ! -n \$\{dualboot\} || test \$\{dualboot\} = no; then + if test \"\$\{dualboot\}\" != yes; then echo \"Rebooting into recovery mode for final deployment.\"; fi; echo \"\"; 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 59a2851f5..d47c025e9 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 @@ -221,7 +221,7 @@ setenv bootcmd " echo \"\"; echo \"\"; echo \">> Firmware installation complete.\"; - if test ! -n \$\{dualboot\} || test \$\{dualboot\} = no; then + if test \"\$\{dualboot\}\" != yes; then echo \"Rebooting into recovery mode for final deployment.\"; fi; echo \"\"; 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 80b87ad27..0e9336b79 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 @@ -222,7 +222,7 @@ setenv bootcmd " echo \"\"; echo \"\"; echo \">> Firmware installation complete.\"; - if test ! -n \$\{dualboot\} || test \$\{dualboot\} = no; then + if test \"\$\{dualboot\}\" != yes; then echo \"Rebooting into recovery mode for final deployment.\"; fi; echo \"\"; 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 61083e1d6..5e2ec8b92 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 @@ -292,7 +292,7 @@ setenv bootcmd " echo \"\"; echo \"\"; echo \">> Firmware installation complete.\"; - if test ! -n \$\{dualboot\} || test \$\{dualboot\} = no; then + if test \"\$\{dualboot\}\" != yes; then echo \"Rebooting into recovery mode for final deployment.\"; fi; echo \"\"; 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 e7591bfb7..ee1baa94c 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 @@ -295,7 +295,7 @@ setenv bootcmd " echo \"\"; echo \"\"; echo \">> Firmware installation complete.\"; - if test ! -n \$\{dualboot\} || test \$\{dualboot\} = no; then + if test \"\$\{dualboot\}\" != yes; then echo \"Rebooting into recovery mode for final deployment.\"; fi; echo \"\";