From ecad5dba32c5cf958cc79c788b90d8302a4e9ea0 Mon Sep 17 00:00:00 2001 From: Francisco Gil Date: Mon, 3 Jun 2024 09:06:07 +0200 Subject: [PATCH] uuu: fix incorrect command for trustfence update from uuu The command trustfence update doesn't require the partition argument. Besides of that, remove extra fi on the cc8m platforms. Signed-off-by: Francisco Gil --- .../ccimx6qpsbc/install_linux_fw_uuu.sh | 4 ++-- .../u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh | 4 ++-- .../u-boot-dey/ccimx8m/install_linux_fw_uuu.sh | 15 +++++++-------- .../u-boot-dey/ccimx8x/install_linux_fw_uuu.sh | 4 ++-- 4 files changed, 13 insertions(+), 14 deletions(-) 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 db5f31316..ff7a40188 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 @@ -68,9 +68,9 @@ part_update() uuu fb: ucmd setenv fastboot_buffer $initrd_addr uuu fb: download -f "${3}" uuu fb: ucmd setenv dek_size $filesize - uuu fb: ucmd trustfence update "${1}" ram \${loadaddr} \${uboot_size} \${initrd_addr} \${dek_size} + uuu fb: ucmd trustfence update ram \${loadaddr} \${uboot_size} \${initrd_addr} \${dek_size} else - uuu fb: ucmd trustfence update "${1}" ram \${fastboot_buffer} \${fastboot_bytes} + uuu fb: ucmd trustfence update ram \${fastboot_buffer} \${fastboot_bytes} fi else if [ "${1}" = "bootloader" ]; then 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 ccd0b05c6..113dbc4c5 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 @@ -68,9 +68,9 @@ part_update() uuu fb: ucmd setenv fastboot_buffer $initrd_addr uuu fb: download -f "${3}" uuu fb: ucmd setenv dek_size $filesize - uuu fb: ucmd trustfence update "${1}" ram \${loadaddr} \${uboot_size} \${initrd_addr} \${dek_size} + uuu fb: ucmd trustfence update ram \${loadaddr} \${uboot_size} \${initrd_addr} \${dek_size} else - uuu fb: ucmd trustfence update "${1}" ram \${fastboot_buffer} \${fastboot_bytes} + uuu fb: ucmd trustfence update ram \${fastboot_buffer} \${fastboot_bytes} fi else if [ "${1}" = "bootloader" ]; then 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 6e93187c6..a6151082b 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 @@ -64,14 +64,13 @@ part_update() if [ "${TRUSTFENCE}" = "true" ] && [ "${1}" = "bootloader" ]; then uuu fb: download -f "${2}" if [ -n "${DEK_BLOB_KEY}" ]; then - uuu fb: ucmd setenv uboot_size $filesize - uuu fb: ucmd setenv fastboot_buffer $initrd_addr - uuu fb: download -f "${3}" - uuu fb: ucmd setenv dek_size $filesize - uuu fb: ucmd trustfence update "${1}" ram \${loadaddr} \${uboot_size} \${initrd_addr} \${dek_size} - else - uuu fb: ucmd trustfence update "${1}" ram \${fastboot_buffer} \${fastboot_bytes} - fi + uuu fb: ucmd setenv uboot_size $filesize + uuu fb: ucmd setenv fastboot_buffer $initrd_addr + uuu fb: download -f "${3}" + uuu fb: ucmd setenv dek_size $filesize + uuu fb: ucmd trustfence update ram \${loadaddr} \${uboot_size} \${initrd_addr} \${dek_size} + else + uuu fb: ucmd trustfence update ram \${fastboot_buffer} \${fastboot_bytes} fi else if [ "${1}" = "bootloader" ]; then 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 760cfd8e4..9fb6fb0f5 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 @@ -68,9 +68,9 @@ part_update() uuu fb: ucmd setenv fastboot_buffer $initrd_addr uuu fb: download -f "${3}" uuu fb: ucmd setenv dek_size $filesize - uuu fb: ucmd trustfence update "${1}" ram \${loadaddr} \${uboot_size} \${initrd_addr} \${dek_size} + uuu fb: ucmd trustfence update ram \${loadaddr} \${uboot_size} \${initrd_addr} \${dek_size} else - uuu fb: ucmd trustfence update "${1}" ram \${fastboot_buffer} \${fastboot_bytes} + uuu fb: ucmd trustfence update ram \${fastboot_buffer} \${fastboot_bytes} fi else if [ "${1}" = "bootloader" ]; then