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 091be4fa4..a0359a376 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 @@ -39,8 +39,8 @@ show_usage() echo " -i Image name that prefixes the image filenames, such as 'dey-image-qt', " echo " 'dey-image-webkit', 'core-image-base'..." echo " Defaults to '##DEFAULT_IMAGE_NAME##' if not provided." - echo " -k Update includes dek blob file." - echo " (requires -t)." + echo " -k Update includes dek file." + echo " (implies -t)." echo " -n No wait. Skips 10 seconds delay to stop script." echo " -t Install Trustfence artifacts." echo " -u U-Boot filename." @@ -52,7 +52,7 @@ show_usage() # Params: # 1. partition # 2. file -# 3. dek blob file when updating an encrypted bootloader +# 3. dek file when updating an encrypted bootloader part_update() { echo "\033[36m" @@ -63,7 +63,7 @@ part_update() if [ "${TRUSTFENCE}" = "true" ] && [ "${1}" = "bootloader" ]; then uuu fb: download -f "${2}" - if [ -n "${DEK_BLOB_FILE}" ]; then + if [ -n "${DEK_FILE}" ]; then uuu fb: ucmd setenv uboot_size \${filesize} uuu fb: ucmd setenv fastboot_buffer \${initrd_addr} uuu fb: download -f "${3}" @@ -90,6 +90,7 @@ echo "############################################################" # -b, -d, -n (booleans) # -i # -u +# -k while getopts ':bdhi:k:ntu:' c do if [ "${c}" = ":" ]; then @@ -104,7 +105,7 @@ do d) INSTALL_DUALBOOT=true && BOOTCOUNT=true ;; h) show_usage ;; i) IMAGE_NAME=${OPTARG} ;; - k) DEK_BLOB_FILE=${OPTARG} ;; + k) DEK_FILE=${OPTARG} ;; n) NOWAIT=true ;; t) TRUSTFENCE=true ;; u) INSTALL_UBOOT_FILENAME=${OPTARG} ;; @@ -269,7 +270,7 @@ fi uuu fb: ucmd setenv forced_update 1 # Update U-Boot -part_update "bootloader" "${INSTALL_UBOOT_FILENAME}" "${DEK_BLOB_FILE}" +part_update "bootloader" "${INSTALL_UBOOT_FILENAME}" "${DEK_FILE}" # Set MMC to boot from BOOT1 partition uuu fb: ucmd mmc partconf 0 1 1 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 214fb4e6f..a818ad60b 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 @@ -39,8 +39,8 @@ show_usage() echo " -i Image name that prefixes the image filenames, such as 'dey-image-qt', " echo " 'dey-image-webkit', 'core-image-base'..." echo " Defaults to '##DEFAULT_IMAGE_NAME##' if not provided." - echo " -k Update includes dek blob file." - echo " (requires -t)." + echo " -k Update includes dek file." + echo " (implies -t)." echo " -n No wait. Skips 10 seconds delay to stop script." echo " -t Install TrustFence artifacts." echo " -u U-Boot filename." @@ -52,7 +52,7 @@ show_usage() # Params: # 1. partition # 2. file -# 3. dek blob file when updating an encrypted bootloader +# 3. dek file when updating an encrypted bootloader part_update() { echo "\033[36m" @@ -63,7 +63,7 @@ part_update() if [ "${TRUSTFENCE}" = "true" ] && [ "${1}" = "bootloader" ]; then uuu fb: download -f "${2}" - if [ -n "${DEK_BLOB_FILE}" ]; then + if [ -n "${DEK_FILE}" ]; then uuu fb: ucmd setenv uboot_size \${filesize} uuu fb: ucmd setenv fastboot_buffer \${initrd_addr} uuu fb: download -f "${3}" @@ -90,7 +90,7 @@ echo "############################################################" # -b, -d, -n (booleans) # -i # -u -# -k +# -k while getopts ':bdhi:k:ntu:' c do if [ "${c}" = ":" ]; then @@ -105,7 +105,7 @@ do d) INSTALL_DUALBOOT=true && BOOTCOUNT=true ;; h) show_usage ;; i) IMAGE_NAME=${OPTARG} ;; - k) DEK_BLOB_FILE=${OPTARG} ;; + k) DEK_FILE=${OPTARG} && TRUSTFENCE=true ;; n) NOWAIT=true ;; t) TRUSTFENCE=true ;; u) INSTALL_UBOOT_FILENAME=${OPTARG} ;; @@ -289,7 +289,7 @@ fi uuu fb: ucmd setenv forced_update 1 # Update U-Boot -part_update "bootloader" "${INSTALL_UBOOT_FILENAME}" "${DEK_BLOB_FILE}" +part_update "bootloader" "${INSTALL_UBOOT_FILENAME}" "${DEK_FILE}" # Set MMC to boot from BOOT1 partition uuu fb: ucmd mmc partconf 0 1 1 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 4df6795e7..4d5c36083 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 @@ -39,8 +39,8 @@ show_usage() echo " -i Image name that prefixes the image filenames, such as 'dey-image-qt', " echo " 'dey-image-webkit', 'core-image-base'..." echo " Defaults to '##DEFAULT_IMAGE_NAME##' if not provided." - echo " -k Update includes dek blob file." - echo " (requires -t)." + echo " -k Update includes dek file." + echo " (implies -t)." echo " -n No wait. Skips 10 seconds delay to stop script." echo " -t Install TrustFence artifacts." echo " -u U-Boot filename." @@ -56,7 +56,7 @@ show_usage() # Description: # - downloads image to RAM # - runs 'update' command from RAM -# 4. dek blob file when updating an encrypted u-boot +# 4. dek file when updating an encrypted u-boot part_update() { echo "\033[36m" @@ -75,7 +75,7 @@ part_update() fi uuu fb: download -f "${2}" if [ "${TRUSTFENCE}" = "true" ] && [ "${1}" = "uboot" ]; then - if [ -n "${DEK_BLOB_FILE}" ]; then + if [ -n "${DEK_FILE}" ]; then uuu fb: ucmd setenv uboot_size \${filesize} uuu fb: ucmd setenv fastboot_buffer \${initrd_addr} uuu fb: download -f "${4}" @@ -98,7 +98,7 @@ echo "############################################################" # -b, -d, -n (booleans) # -i # -u -# -k +# -k while getopts ':bdhi:k:ntu:' c do if [ "${c}" = ":" ]; then @@ -113,7 +113,7 @@ do d) INSTALL_DUALBOOT=true && BOOTCOUNT=true ;; h) show_usage ;; i) IMAGE_NAME=${OPTARG} ;; - k) DEK_BLOB_FILE=${OPTARG} ;; + k) DEK_FILE=${OPTARG} && TRUSTFENCE=true ;; n) NOWAIT=true ;; t) TRUSTFENCE=true ;; u) INSTALL_UBOOT_FILENAME=${OPTARG} ;; @@ -286,7 +286,7 @@ uuu fb: ucmd setenv fastboot_buffer \${loadaddr} uuu fb: ucmd setenv forced_update 1 # Update U-Boot -part_update "uboot" "${INSTALL_UBOOT_FILENAME}" 5000 "${DEK_BLOB_FILE}" +part_update "uboot" "${INSTALL_UBOOT_FILENAME}" 5000 "${DEK_FILE}" # Set 'bootcmd' for the second part of the script that will # - Reset environment to defaults 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 9d61627b2..f6fbdcd81 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 @@ -39,8 +39,8 @@ show_usage() echo " -i Image name that prefixes the image filenames, such as 'dey-image-qt', " echo " 'dey-image-webkit', 'core-image-base'..." echo " Defaults to '##DEFAULT_IMAGE_NAME##' if not provided." - echo " -k Update includes dek blob file." - echo " (requires -t)." + echo " -k Update includes dek file." + echo " (implies -t)." echo " -n No wait. Skips 10 seconds delay to stop script." echo " -t Install TrustFence artifacts." echo " -u U-Boot filename." @@ -52,7 +52,7 @@ show_usage() # Params: # 1. partition # 2. file -# 3. dek blob file when updating an encrypted bootloader +# 3. dek file when updating an encrypted bootloader part_update() { echo "\033[36m" @@ -63,7 +63,7 @@ part_update() if [ "${TRUSTFENCE}" = "true" ] && [ "${1}" = "bootloader" ]; then uuu fb: download -f "${2}" - if [ -n "${DEK_BLOB_KEY}" ]; then + if [ -n "${DEK_FILE}" ]; then uuu fb: ucmd setenv uboot_size \${filesize} uuu fb: ucmd setenv fastboot_buffer \${initrd_addr} uuu fb: download -f "${3}" @@ -90,7 +90,7 @@ echo "############################################################" # -b, -d, -n (booleans) # -i # -u -# -k +# -k while getopts ':bdhi:k:ntu:' c do if [ "${c}" = ":" ]; then @@ -105,7 +105,7 @@ do d) INSTALL_DUALBOOT=true && BOOTCOUNT=true ;; h) show_usage ;; i) IMAGE_NAME=${OPTARG} ;; - k) DEK_BLOB_KEY=${OPTARG} ;; + k) DEK_FILE=${OPTARG} && TRUSTFENCE=true ;; n) NOWAIT=true ;; t) TRUSTFENCE=true ;; u) INSTALL_UBOOT_FILENAME=${OPTARG} ;; @@ -241,7 +241,7 @@ uuu fb: ucmd setenv fastboot_buffer \${loadaddr} uuu fb: ucmd setenv forced_update 1 # Update U-Boot -part_update "bootloader" "${INSTALL_UBOOT_FILENAME}" "${DEK_BLOB_KEY}" +part_update "bootloader" "${INSTALL_UBOOT_FILENAME}" "${DEK_FILE}" # Set MMC to boot from BOOT1 partition uuu fb: ucmd mmc partconf 0 1 1 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 c49db40a8..88b258932 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 @@ -39,8 +39,8 @@ show_usage() echo " -i Image name that prefixes the image filenames, such as 'dey-image-qt', " echo " 'dey-image-webkit', 'core-image-base'..." echo " Defaults to '##DEFAULT_IMAGE_NAME##' if not provided." - echo " -k Update includes dek blob file." - echo " (requires -t)." + echo " -k Update includes dek file." + echo " (implies -t)." echo " -n No wait. Skips 10 seconds delay to stop script." echo " -t Install TrustFence artifacts." echo " -u U-Boot filename." @@ -52,7 +52,7 @@ show_usage() # Params: # 1. partition # 2. file -# 3. dek blob file when updating an encrypted bootloader +# 3. dek file when updating an encrypted bootloader part_update() { echo "\033[36m" @@ -63,7 +63,7 @@ part_update() if [ "${TRUSTFENCE}" = "true" ] && [ "${1}" = "bootloader" ]; then uuu fb: download -f "${2}" - if [ -n "${DEK_BLOB_KEY}" ]; then + if [ -n "${DEK_FILE}" ]; then uuu fb: ucmd setenv uboot_size \${filesize} uuu fb: ucmd setenv fastboot_buffer \${initrd_addr} uuu fb: download -f "${3}" @@ -90,7 +90,7 @@ echo "############################################################" # -b, -d, -n (booleans) # -i # -u -# -k +# -k while getopts ':bdhi:k:ntu:' c do if [ "${c}" = ":" ]; then @@ -105,7 +105,7 @@ do d) INSTALL_DUALBOOT=true && BOOTCOUNT=true ;; h) show_usage ;; i) IMAGE_NAME=${OPTARG} ;; - k) DEK_BLOB_KEY=${OPTARG} ;; + k) DEK_FILE=${OPTARG} && TRUSTFENCE=true ;; n) NOWAIT=true ;; t) TRUSTFENCE=true ;; u) INSTALL_UBOOT_FILENAME=${OPTARG} ;; @@ -248,7 +248,7 @@ uuu fb: ucmd setenv fastboot_buffer \${loadaddr} uuu fb: ucmd setenv forced_update 1 # Update U-Boot -part_update "bootloader" "${INSTALL_UBOOT_FILENAME}" "${DEK_BLOB_KEY}" +part_update "bootloader" "${INSTALL_UBOOT_FILENAME}" "${DEK_FILE}" # Set MMC to boot from BOOT1 partition uuu fb: ucmd mmc partconf 0 1 1 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 16a9315bd..be9f15de5 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 @@ -39,8 +39,8 @@ show_usage() echo " -i Image name that prefixes the image filenames, such as 'dey-image-qt', " echo " 'dey-image-webkit', 'core-image-base'..." echo " Defaults to '##DEFAULT_IMAGE_NAME##' if not provided." - echo " -k Update includes dek blob file." - echo " (requires -t)." + echo " -k Update includes dek file." + echo " (implies -t)." echo " -n No wait. Skips 10 seconds delay to stop script." echo " -u U-Boot filename." echo " -t Install TrustFence artifacts." @@ -54,7 +54,7 @@ show_usage() # Params: # 1. partition # 2. file -# 3. dek blob file when updating an encrypted bootloader +# 3. dek file when updating an encrypted bootloader part_update() { echo "\033[36m" @@ -65,7 +65,7 @@ part_update() if [ "${TRUSTFENCE}" = "true" ] && [ "${1}" = "bootloader" ]; then uuu fb: download -f "${2}" - if [ -n "${DEK_BLOB_KEY}" ]; then + if [ -n "${DEK_FILE}" ]; then uuu fb: ucmd setenv uboot_size \${filesize} uuu fb: ucmd setenv fastboot_buffer \${initrd_addr} uuu fb: download -f "${3}" @@ -92,7 +92,7 @@ echo "############################################################" # -b, -d, -n (booleans) # -i # -u -# -k +# -k while getopts ':bdhti:nu:Uk:' c do if [ "${c}" = ":" ]; then @@ -107,7 +107,7 @@ do d) INSTALL_DUALBOOT=true && BOOTCOUNT=true ;; h) show_usage ;; i) IMAGE_NAME=${OPTARG} ;; - k) DEK_BLOB_KEY=${OPTARG} ;; + k) DEK_FILE=${OPTARG} && TRUSTFENCE=true ;; n) NOWAIT=true ;; u) INSTALL_UBOOT_FILENAME=${OPTARG} ;; t) TRUSTFENCE=true ;; @@ -257,7 +257,7 @@ uuu fb: ucmd setenv fastboot_buffer \${loadaddr} uuu fb: ucmd setenv forced_update 1 # Update U-Boot -part_update "bootloader" "${INSTALL_UBOOT_FILENAME}" "${DEK_BLOB_KEY}" +part_update "bootloader" "${INSTALL_UBOOT_FILENAME}" "${DEK_FILE}" if [ "${INSTALL_REDUNDANT_UBOOT}" = true ]; then part_update bootloader_redundant "${INSTALL_UBOOT_FILENAME}" fi