From ccb17b1c91cd96b4f3e7e26685c69f06b0048fdc Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Fri, 7 Jun 2024 15:55:53 +0200 Subject: [PATCH] uboot: Remove dead code --- board/common/uboot/scripts/ixbootmedia.sh | 6 ---- board/common/uboot/scripts/ixload.sh | 14 ---------- board/common/uboot/scripts/prepare_aux_mmc.sh | 5 ---- board/common/uboot/scripts/prepare_mmc.sh | 28 ------------------- 4 files changed, 53 deletions(-) delete mode 100644 board/common/uboot/scripts/ixbootmedia.sh delete mode 100644 board/common/uboot/scripts/ixload.sh delete mode 100644 board/common/uboot/scripts/prepare_aux_mmc.sh delete mode 100644 board/common/uboot/scripts/prepare_mmc.sh diff --git a/board/common/uboot/scripts/ixbootmedia.sh b/board/common/uboot/scripts/ixbootmedia.sh deleted file mode 100644 index 6ff4550d..00000000 --- a/board/common/uboot/scripts/ixbootmedia.sh +++ /dev/null @@ -1,6 +0,0 @@ -echo "Booting from ${devtype}${devnum} (order: ${BOOT_ORDER})" - -for s in "${BOOT_ORDER}"; do - setenv slot "${s}" - run ixbootslot -done diff --git a/board/common/uboot/scripts/ixload.sh b/board/common/uboot/scripts/ixload.sh deleted file mode 100644 index ea15f530..00000000 --- a/board/common/uboot/scripts/ixload.sh +++ /dev/null @@ -1,14 +0,0 @@ -${devtype} dev ${devnum} -${devtype} read ${ramdisk_addr_r} ${devoffs} 0x10 - -fdt addr ${ramdisk_addr_r} -fdt get value squashaddr /images/ramdisk data-position -fdt get value squashsize /images/ramdisk data-size - -setexpr blkcnt ${squashaddr} + ${squashsize} -setexpr blkcnt ${blkcnt} + 0x1ff -setexpr blkcnt ${blkcnt} / 0x200 - -${devtype} read ${ramdisk_addr_r} ${devoffs} ${blkcnt} - - diff --git a/board/common/uboot/scripts/prepare_aux_mmc.sh b/board/common/uboot/scripts/prepare_aux_mmc.sh deleted file mode 100644 index 4fcbc38d..00000000 --- a/board/common/uboot/scripts/prepare_aux_mmc.sh +++ /dev/null @@ -1,5 +0,0 @@ -if part number mmc 0 aux auxpart; then - if load mmc 0:${auxpart} ${loadaddr} /uboot.env; then - env import -b ${loadaddr} ${filesize} BOOT_ORDER DEBUG - fi -fi diff --git a/board/common/uboot/scripts/prepare_mmc.sh b/board/common/uboot/scripts/prepare_mmc.sh deleted file mode 100644 index f6929a89..00000000 --- a/board/common/uboot/scripts/prepare_mmc.sh +++ /dev/null @@ -1,28 +0,0 @@ -setenv devtype mmc -setenv devnum 0 -part start ${devtype} ${devnum} ${slot} devoffs - -${devtype} dev ${devnum} -${devtype} read ${ramdisk_addr_r} ${devoffs} 0x10 - -setenv bootargs_root "root=/dev/dm-0 dm-mod.create=\"rootfs,,0,ro,0" - -setenv old_fdt_addr ${fdt_addr} -if fdt addr ${ramdisk_addr_r}; then - fdt get value sqoffs /images/rootfs data-position - fdt get value sqsize /images/rootfs data-size - fdt addr ${old_fdt_addr} - - setexpr sqaddr ${ramdisk_addr_r} + ${sqoffs} - setexpr sqblknr ${sqoffs} / 0x200 - setexpr sqblkcnt ${sqsize} / 0x200 - setexpr fitblkcnt ${sqblknr} + ${sqblkcnt} - - if ${devtype} read ${ramdisk_addr_r} ${devoffs} ${fitblkcnt}; then - setexpr decsqblkcnt fmt %u ${sqblkcnt} - setexpr decsqblknr fmt %u ${sqblknr} - setenv bootargs_root "${bootargs_root} ${decsqblkcnt} linear PARTLABEL=${slot} ${decsqblknr}\"" - setenv ramdisk "-" - setenv prepared ok - fi -fi