include: env: phytec: Drop legacy RAUC boot logic

RAUC slot selection is now handled by the RAUC bootmeth, which all
phytec K3 boards use. Remove the unused env-based logic.

Signed-off-by: Wadim Egorov <w.egorov@phytec.de>
Reviewed-by: Martin Schwan <m.schwan@phytec.de>

diff --git a/include/env/phytec/k3_mmc.env b/include/env/phytec/k3_mmc.env
index 95d0204b6dade19d26aa73ca1f1d5d7f37d508ef..8129b35ea5ea8e352d7cb24f30d82b8b6b7fca99 100644 (file)
--- a/include/env/phytec/k3_mmc.env
+++ b/include/env/phytec/k3_mmc.env
@@ -7,15 +7,13 @@
 /* Logic for TI K3 based SoCs to boot from a MMC device. */
 
 #include <env/phytec/overlays.env>
-#include <env/phytec/rauc.env>
 
 mmcargs=setenv bootargs console=${console} earlycon=${earlycon}
-       root=/dev/mmcblk${mmcdev}p${mmcroot} ${raucargs} rootwait rw
+       root=/dev/mmcblk${mmcdev}p${mmcroot} rootwait rw
        ${optargs}
 mmcloadimage=load mmc ${mmcdev}:${mmcpart} ${kernel_addr_r} Image
 mmcloadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdtfile}
 mmcboot=echo DEPRECATION WARNING: mmcboot will be removed in future versions. Use standard boot instead.;
-       if test ${doraucboot} = 1; then run raucinit; fi;
        run mmcargs;
        mmc dev ${mmcdev};
        mmc rescan;

diff --git a/include/env/phytec/rauc.env b/include/env/phytec/rauc.env
deleted file mode 100644 (file)
index 89e17ff..0000000
--- a/include/env/phytec/rauc.env
+++ /dev/null
@@ -1,52 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-
-/* Logic to select a boot partition based on environment variables and switch
- * to the other if the boot fails. */
-
-doraucboot=0
-
-raucbootpart0=1
-raucrootpart0=5
-raucbootpart1=2
-raucrootpart1=6
-
-raucinit=
-       echo Booting RAUC A/B system;
-       test -n "${BOOT_ORDER}" || env set BOOT_ORDER "system0 system1";
-       test -n "${BOOT_system0_LEFT}" || env set BOOT_system0_LEFT 3;
-       test -n "${BOOT_system1_LEFT}" || env set BOOT_system1_LEFT 3;
-       env set raucstatus;
-       for BOOT_SLOT in "${BOOT_ORDER}"; do
-               if test "x${raucstatus}" != "x"; then
-                       echo Skipping remaing slots!;
-               elif test "x${BOOT_SLOT}" = "xsystem0"; then
-                       if test ${BOOT_system0_LEFT} -gt 0; then
-                               echo Found valid slot A, ${BOOT_system0_LEFT} attempts remaining;
-                               setexpr BOOT_system0_LEFT ${BOOT_system0_LEFT} - 1;
-                               env set mmcpart ${raucbootpart0};
-                               env set mmcroot ${raucrootpart0};
-                               env set raucargs rauc.slot=system0;
-                               env set raucstatus success;
-                       fi;
-               elif test "x${BOOT_SLOT}" = "xsystem1"; then
-                       if test ${BOOT_system1_LEFT} -gt 0; then
-                               echo Found valid slot B, ${BOOT_system1_LEFT} attempts remaining;
-                               setexpr BOOT_system1_LEFT ${BOOT_system1_LEFT} - 1;
-                               env set mmcpart ${raucbootpart1};
-                               env set mmcroot ${raucrootpart1};
-                               env set raucargs rauc.slot=system1;
-                               env set raucstatus success;
-                       fi;
-               fi;
-       done;
-       if test -n "${raucstatus}"; then
-               env delete raucstatus;
-               env save;
-       else
-               echo WARN: No valid slot found;
-               env set BOOT_system0_LEFT 3;
-               env set BOOT_system1_LEFT 3;
-               env delete raucstatus;
-               env save;
-               reset;
-       fi;