From 9f3ab7c9d90ffac72489f024435139b68d18e724 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Fri, 28 May 2021 12:39:26 +0200 Subject: [PATCH] u-boot-dey: group identical files per SOM or SOM family With the generalization done in previous commits, we have now several files that are identical and can be merged into a common SOM or SOM family folder. Signed-off-by: Hector Palacios --- .../install_linux_fw_sd.txt | 0 .../install_linux_fw_usb.txt | 0 .../install_linux_fw_uuu.sh | 0 .../ccimx6ulstarter/install_linux_fw_sd.txt | 177 ----------- .../ccimx6ulstarter/install_linux_fw_usb.txt | 178 ----------- .../ccimx6ulstarter/install_linux_fw_uuu.sh | 248 ---------------- .../install_linux_fw_sd.txt | 0 .../install_linux_fw_usb.txt | 0 .../install_linux_fw_uuu.sh | 0 .../ccimx8mn-dvk/install_linux_fw_sd.txt | 159 ---------- .../ccimx8mn-dvk/install_linux_fw_usb.txt | 160 ---------- .../ccimx8mn-dvk/install_linux_fw_uuu.sh | 216 -------------- .../install_linux_fw_usb.txt | 229 --------------- .../ccimx8x-sbc-pro/install_linux_fw_sd.txt | 230 --------------- .../ccimx8x-sbc-pro/install_linux_fw_uuu.sh | 278 ------------------ .../install_linux_fw_sd.txt | 0 .../install_linux_fw_usb.txt | 0 .../install_linux_fw_uuu.sh | 0 18 files changed, 1875 deletions(-) rename meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/{ccimx6ulsbc => ccimx6ul}/install_linux_fw_sd.txt (100%) rename meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/{ccimx6ulsbc => ccimx6ul}/install_linux_fw_usb.txt (100%) rename meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/{ccimx6ulsbc => ccimx6ul}/install_linux_fw_uuu.sh (100%) delete mode 100644 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt delete mode 100644 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_usb.txt delete mode 100755 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_uuu.sh rename meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/{ccimx8mm-dvk => ccimx8m}/install_linux_fw_sd.txt (100%) rename meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/{ccimx8mm-dvk => ccimx8m}/install_linux_fw_usb.txt (100%) rename meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/{ccimx8mm-dvk => ccimx8m}/install_linux_fw_uuu.sh (100%) delete mode 100644 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_sd.txt delete mode 100644 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_usb.txt delete mode 100755 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_uuu.sh delete mode 100644 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_usb.txt delete mode 100644 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt delete mode 100644 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_uuu.sh rename meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/{ccimx8x-sbc-express => ccimx8x}/install_linux_fw_sd.txt (100%) rename meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/{ccimx8x-sbc-pro => ccimx8x}/install_linux_fw_usb.txt (100%) rename meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/{ccimx8x-sbc-express => ccimx8x}/install_linux_fw_uuu.sh (100%) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt similarity index 100% rename from meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_sd.txt rename to meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_usb.txt similarity index 100% rename from meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_usb.txt rename to meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_usb.txt diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh similarity index 100% rename from meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_uuu.sh rename to meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt deleted file mode 100644 index 115046ade..000000000 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_sd.txt +++ /dev/null @@ -1,177 +0,0 @@ -# -# U-Boot script for installing Linux images created by Yocto from the micro SD -# card into the NAND -# - -echo "############################################################" -echo "# Linux firmware install from micro SD #" -echo "############################################################" -echo "" -echo " This process will erase your NAND and will install a new" -echo " U-Boot and Linux firmware images on the NAND." -echo "" -echo " Press CTRL+C now if you wish to abort or wait 10 seconds" -echo " to continue." - -sleep 10 -if test $? -eq 1; then - echo "Aborted by user."; - exit; -fi - -# Determine U-Boot file to program basing on module variant -if test -n "${module_variant}"; then - if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x03" || test "${module_variant}" = "0x06" || test "${module_variant}" = "0x0a"; then - setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##.imx; - elif test "${module_variant}" = "0x04" || test "${module_variant}" = "0x05" || test "${module_variant}" = "0x07"; then - setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##1GB.imx; - elif test "${module_variant}" = "0x08" || test "${module_variant}" = "0x09"; then - setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##512MB.imx - fi -fi - -# Use 'test -n ...' because 'test -z ...' does not work well on old versions of -# u-boot when the checked value is empty. -if test -n "${INSTALL_UBOOT_FILENAME}"; then - true; -else - echo ""; - echo "[ERROR] Cannot determine U-Boot file for this module!"; - echo ""; - echo "1. Set variable 'INSTALL_UBOOT_FILENAME' depending on your ConnectCore 6UL variant:"; - echo " - For a SOM with 1GB DDR3, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##1GB.imx"; - echo " - For a SOM with 512MB DDR3, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##512MB.imx"; - echo " - For a SOM with 256MB DDR3, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##.imx"; - echo ""; - echo "2. Run the install script again."; - echo ""; - echo "Aborted"; - echo ""; - exit; -fi; - -setenv INSTALL_MMCDEV 0 - -if test -z "${image-name}"; then - setenv image-name ##DEFAULT_IMAGE_NAME## -fi -GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##" -for g in ${GRAPHICAL_IMAGES}; do - if test "${image-name}" = "${g}"; then - BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" - fi -done -if test -z "${BASEFILENAME}"; then - BASEFILENAME="${image-name}" -fi -setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.ubifs -setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.ubifs -setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ubifs - -# Check for presence of firmware files on the SD card -for install_f in ${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME} ${INSTALL_ROOTFS_FILENAME}; do - if test ! -e mmc ${INSTALL_MMCDEV} ${install_f}; then - echo "ERROR: Could not find file ${install_f}"; - install_abort=1; - fi; -done -if test -n "${install_abort}"; then - echo "Aborted."; - exit; -fi - -# Skip user confirmation for U-Boot update -setenv forced_update 1 - -# Set bootdelay to zero so that firmware update is run immediately after -# the first reset. -setenv bootdelay 0 - -# Update U-Boot -echo "" -echo "" -echo ">> Installing U-Boot boot loader (target will reset)" -echo "" -echo "" -update uboot mmc ${INSTALL_MMCDEV} ${INSTALL_UBOOT_FILENAME} -if test $? -eq 1; then - # Use old-style update with source file system argument - update uboot mmc ${INSTALL_MMCDEV} fat ${INSTALL_UBOOT_FILENAME} - if test $? -eq 1; then - echo "[ERROR] Failed to update U-Boot boot loader!"; - echo ""; - echo "Aborted."; - exit; - fi -fi - -# Set 'bootcmd' to the second part of the script that will -# - Reset environment to defaults -# - Save the environment -# - Update the 'linux' partition -# - Update the 'recovery' partition -# - Update the 'rootfs' partition -# - Erase the 'update' partition -# - Configure recovery to wipe 'update' partition -# - Run 'recovery' and let the system boot after -setenv bootcmd " - env default -a; - saveenv; - echo \"\"; - echo \"\"; - echo \">> Installing Linux kernel and device tree files\"; - echo \"\"; - echo \"\"; - nand erase.part linux; - update linux mmc ${INSTALL_MMCDEV} ${INSTALL_LINUX_FILENAME}; - if test \$? -eq 1; then - echo \"[ERROR] Failed to update linux partition!\"; - echo \"\"; - echo \"Aborted.\"; - exit; - fi; - echo \"\"; - echo \"\"; - echo \">> Installing recovery\"; - echo \"\"; - echo \"\"; - nand erase.part recovery; - update recovery mmc ${INSTALL_MMCDEV} ${INSTALL_RECOVERY_FILENAME}; - if test \$? -eq 1; then - echo \"[ERROR] Failed to update recovery partition!\"; - echo \"\"; - echo \"Aborted.\"; - exit; - fi; - echo \"\"; - echo \"\"; - echo \">> Installing Linux root file system\"; - echo \"\"; - echo \"\"; - nand erase.part rootfs; - update rootfs mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; - if test \$? -eq 1; then - echo \"[ERROR] Failed to update rootfs partition!\"; - echo \"\"; - echo \"Aborted.\"; - exit; - fi; - echo \"\"; - nand erase.part update; - setenv boot_recovery yes; - setenv recovery_command wipe_update; - saveenv; - echo \"\"; - echo \"\"; - echo \">> Firmware installation complete. Rebooting into recovery mode for final deployment.\"; - echo \"\"; - echo \"\"; - sleep 1; - reset; -" - -saveenv -reset diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_usb.txt deleted file mode 100644 index 3f8cec07b..000000000 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_usb.txt +++ /dev/null @@ -1,178 +0,0 @@ -# -# U-Boot script for installing Linux images created by Yocto from a USB stick -# into the NAND -# - -echo "#######################################################" -echo "# Linux firmware install from USB #" -echo "#######################################################" -echo "" -echo " This process will erase your NAND and will install a new" -echo " U-Boot and Linux firmware images on the NAND." -echo "" -echo " Press CTRL+C now if you wish to abort or wait 10 seconds" -echo " to continue." - -sleep 10 -if test $? -eq 1; then - echo "Aborted by user."; - exit; -fi - -# Determine U-Boot file to program basing on module variant -if test -n "${module_variant}"; then - if test "${module_variant}" = "0x02" || test "${module_variant}" = "0x03" || test "${module_variant}" = "0x06" || test "${module_variant}" = "0x0a"; then - setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##.imx; - elif test "${module_variant}" = "0x04" || test "${module_variant}" = "0x05" || test "${module_variant}" = "0x07"; then - setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##1GB.imx; - elif test "${module_variant}" = "0x08" || test "${module_variant}" = "0x09"; then - setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##512MB.imx - fi -fi - -# Use 'test -n ...' because 'test -z ...' does not work well on old versions of -# u-boot when the checked value is empty. -if test -n "${INSTALL_UBOOT_FILENAME}"; then - true; -else - echo ""; - echo "[ERROR] Cannot determine U-Boot file for this module!"; - echo ""; - echo "1. Set variable 'INSTALL_UBOOT_FILENAME' depending on your ConnectCore 6UL variant:"; - echo " - For a SOM with 1GB DDR3, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##1GB.imx"; - echo " - For a SOM with 512MB DDR3, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##512MB.imx"; - echo " - For a SOM with 256MB DDR3, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME u-boot-##MACHINE##.imx"; - echo ""; - echo "2. Run the install script again."; - echo ""; - echo "Aborted"; - echo ""; - exit; -fi; - -setenv INSTALL_USBDEV 0 - -if test -z "${image-name}"; then - setenv image-name ##DEFAULT_IMAGE_NAME## -fi -GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##" -for g in ${GRAPHICAL_IMAGES}; do - if test "${image-name}" = "${g}"; then - BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" - fi -done -if test -z "${BASEFILENAME}"; then - BASEFILENAME="${image-name}" -fi -setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.ubifs -setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.ubifs -setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ubifs - -# Check for presence of firmware files on the USB -for install_f in ${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME} ${INSTALL_ROOTFS_FILENAME}; do - if test ! -e mmc ${INSTALL_USBDEV} ${install_f}; then - echo "ERROR: Could not find file ${install_f}"; - install_abort=1; - fi; -done -if test -n "${install_abort}"; then - echo "Aborted."; - exit; -fi - -# Skip user confirmation for U-Boot update -setenv forced_update 1 - -# Set bootdelay to zero so that firmware update is run immediately after -# the first reset. -setenv bootdelay 0 - -# Update U-Boot -echo "" -echo "" -echo ">> Installing U-Boot boot loader (target will reset)" -echo "" -echo "" -update uboot usb ${INSTALL_USBDEV} ${INSTALL_UBOOT_FILENAME} -if test $? -eq 1; then - # Use old-style update with source file system argument - update uboot mmc ${INSTALL_USBDEV} fat ${INSTALL_UBOOT_FILENAME} - if test $? -eq 1; then - echo "[ERROR] Failed to update U-Boot boot loader!"; - echo ""; - echo "Aborted."; - exit; - fi -fi - -# Set 'bootcmd' to the second part of the script that will -# - Reset environment to defaults -# - Save the environment -# - Update the 'linux' partition -# - Update the 'recovery' partition -# - Update the 'rootfs' partition -# - Erase the 'update' partition -# - Configure recovery to wipe 'update' partition -# - Run 'recovery' and let the system boot after -setenv bootcmd " - env default -a; - saveenv; - usb start; - echo \"\"; - echo \"\"; - echo \">> Installing Linux kernel and device tree files\"; - echo \"\"; - echo \"\"; - nand erase.part linux; - update linux usb ${INSTALL_USBDEV} ${INSTALL_LINUX_FILENAME}; - if test \$? -eq 1; then - echo \"[ERROR] Failed to update linux partition!\"; - echo \"\"; - echo \"Aborted.\"; - exit; - fi; - echo \"\"; - echo \"\"; - echo \">> Installing recovery\"; - echo \"\"; - echo \"\"; - nand erase.part recovery; - update recovery usb ${INSTALL_USBDEV} ${INSTALL_RECOVERY_FILENAME}; - if test \$? -eq 1; then - echo \"[ERROR] Failed to update recovery partition!\"; - echo \"\"; - echo \"Aborted.\"; - exit; - fi; - echo \"\"; - echo \"\"; - echo \">> Installing Linux root file system\"; - echo \"\"; - echo \"\"; - nand erase.part rootfs; - update rootfs usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; - if test \$? -eq 1; then - echo \"[ERROR] Failed to update rootfs partition!\"; - echo \"\"; - echo \"Aborted.\"; - exit; - fi; - echo \"\"; - nand erase.part update; - setenv boot_recovery yes; - setenv recovery_command wipe_update; - saveenv; - echo \"\"; - echo \"\"; - echo \">> Firmware installation complete. Rebooting into recovery mode for final deployment.\"; - echo \"\"; - echo \"\"; - sleep 1; - reset; -" - -saveenv -reset diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_uuu.sh deleted file mode 100755 index c6971b7b0..000000000 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_uuu.sh +++ /dev/null @@ -1,248 +0,0 @@ -#!/bin/sh -#=============================================================================== -# -# Copyright (C) 2020-2021 by Digi International Inc. -# All rights reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 as published by -# the Free Software Foundation. -# -# -# Description: -# Script to flash Yocto build artifacts over USB to the target. -#=============================================================================== -# set -x - -# -# U-Boot script for installing Linux images created by Yocto -# - -# Parse uuu cmd output -getenv() -{ - uuu -v fb: ucmd printenv "${1}" | sed -ne "s,^${1}=,,g;T;p" -} - -show_usage() -{ - echo "Usage: $0 [options]" - echo "" - echo " Options:" - echo " -h Show this help." - 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 " -n No wait. Skips 10 seconds delay to stop script." - echo " -u U-Boot filename." - echo " Auto-determined by variant if not provided." - exit 2 -} - -# Update a partition -# Params: -# 1. partition -# 2. file -# 3. timeout (in ms) -# Description: -# - downloads image to RAM -# - runs 'update' command from RAM -part_update() -{ - echo "\033[36m" - echo "=====================================================================================" - echo "Updating '${1}' partition with file: ${2}" - echo "=====================================================================================" - echo "\033[0m" - - uuu fb: download -f "${2}" - uuu "fb[-t ${3}]:" ucmd update "${1}" ram \${fastboot_buffer} \${fastboot_bytes} -} - -clear -echo "############################################################" -echo "# Linux firmware install through USB OTG #" -echo "############################################################" - -# Command line admits the following parameters: -# -u -# -i -while getopts 'hi:nu:' c -do - case $c in - h) show_usage ;; - i) IMAGE_NAME=${OPTARG} ;; - n) NOWAIT=true ;; - u) INSTALL_UBOOT_FILENAME=${OPTARG} ;; - esac -done - -echo "" -echo "Determining image files to use..." - -# Enable the redirect support to get u-boot variables values -uuu fb: ucmd setenv stdout serial,fastboot - -# Determine U-Boot filename if not provided -if [ -z "${INSTALL_UBOOT_FILENAME}" ]; then - module_variant=$(getenv "module_variant") - # Determine U-Boot file to program basing on SOM's variant - if [ -n "$module_variant" ]; then - if [ "$module_variant" = "0x08" ] || \ - [ "$module_variant" = "0x09" ]; then - INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##512MB.imx" - elif [ "$module_variant" = "0x04" ] || \ - [ "$module_variant" = "0x05" ] || \ - [ "$module_variant" = "0x07" ]; then - INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##1GB.imx" - else - INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##.imx" - fi - fi - - # remove redirect - uuu fb: ucmd setenv stdout serial - - # U-Boot when the checked value is empty. - if [ -n "${INSTALL_UBOOT_FILENAME}" ]; then - true - else - echo "" - echo "[ERROR] Cannot determine U-Boot file for this module!" - echo "" - echo "1. Add U-boot file name, depending on your ConnectCore 8X variant, to script command line:" - echo " - For a SOM with 1GB DDR3, run:" - echo " => ./install_linux_fs_uuu.sh -u u-boot-##MACHINE##1GB.imx" - echo " - For a SOM with 512MB DDR3, run:" - echo " => ./install_linux_fs_uuu.sh -u u-boot-##MACHINE##512MB.imx" - echo " - For a SOM with 256MB DDR3, run:" - echo " => ./install_linux_fs_uuu.sh -u u-boot-##MACHINE##.imx" - echo "" - echo "2. Run the install script again." - echo "" - echo "Aborted" - echo "" - exit - fi -fi - -# Determine linux, recovery, and rootfs image filenames to update -if [ -z "${IMAGE_NAME}" ]; then - IMAGE_NAME="##DEFAULT_IMAGE_NAME##" -fi -GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##" -for g in ${GRAPHICAL_IMAGES}; do - if [ "${IMAGE_NAME}" = "${g}" ]; then - BASEFILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##" - fi -done -if [ -z "${BASEFILENAME}" ]; then - BASEFILENAME="${IMAGE_NAME}" -fi -INSTALL_LINUX_FILENAME="${BASEFILENAME}-##MACHINE##.boot.ubifs" -INSTALL_RECOVERY_FILENAME="${BASEFILENAME}-##MACHINE##.recovery.ubifs" -INSTALL_ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ubifs" - -# Verify existance of files before starting the update -FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME} ${INSTALL_ROOTFS_FILENAME}" -for f in ${FILES}; do - if [ ! -f ${f} ]; then - echo "\033[31m[ERROR] Could not find file '${f}'\033[0m" - ABORT=true - fi -done; - -[ "${ABORT}" = true ] && exit 1 - -# Print warning about storage media being deleted -if [ ! "${NOWAIT}" = true ]; then - WAIT=10 - echo "" - echo " ====================" - echo " = IMPORTANT! =" - echo " ====================" - echo " This process will erase your NAND and will install the following files" - echo " on the partitions of the NAND." - echo "" - echo " PARTITION FILENAME" - echo " --------- --------" - echo " bootloader ${INSTALL_UBOOT_FILENAME}" - echo " linux ${INSTALL_LINUX_FILENAME}" - echo " recovery ${INSTALL_RECOVERY_FILENAME}" - echo " rootfs ${INSTALL_ROOTFS_FILENAME}" - echo "" - echo " Press CTRL+C now if you wish to abort." - echo "" - while [ ${WAIT} -gt 0 ]; do - printf "\r Update process starts in %d " ${WAIT} - sleep 1 - WAIT=$(( ${WAIT} - 1 )) - done - printf "\r \n" - echo " Starting update process" -fi - -# Set fastboot buffer address to $loadaddr, just in case -uuu fb: ucmd setenv fastboot_buffer \${loadaddr} - -# Skip user confirmation for U-Boot update -uuu fb: ucmd setenv forced_update 1 - -# Update U-Boot -part_update "uboot" "${INSTALL_UBOOT_FILENAME}" 5000 - -# Set 'bootcmd' for the second part of the script that will -# - Reset environment to defaults -# - Save the environment -# - Update the 'linux' partition -# - Update the 'recovery' partition -# - Update the 'rootfs' partition -# - Erase the 'update' partition -uuu fb: ucmd setenv bootcmd " - env default -a; - saveenv; - echo \"\"; - echo \"\"; - echo \">> Installing Linux firmware\"; - echo \"\"; - echo \"\"; - fastboot 0; -" - -uuu fb: ucmd saveenv -uuu fb: acmd reset - -# Wait for the target to reset -sleep 3 - -# Set fastboot buffer address to $loadaddr -uuu fb: ucmd setenv fastboot_buffer \${loadaddr} - -# Update Linux -part_update "linux" "${INSTALL_LINUX_FILENAME}" 15000 - -# Update Recovery -part_update "recovery" "${INSTALL_RECOVERY_FILENAME}" 15000 - -# Update Rootfs -part_update "rootfs" "${INSTALL_ROOTFS_FILENAME}" 90000 - -# Erase the 'Update' partition -uuu fb: ucmd nand erase.part update - -# Configure u-boot to boot into recovery mode -uuu fb: ucmd setenv boot_recovery yes -uuu fb: ucmd setenv recovery_command wipe_update - -uuu fb: ucmd saveenv - -# Reset the target -uuu fb: acmd reset - -echo "\033[32m" -echo "=============================================================" -echo "Done! Wait for the target to complete first boot process." -echo "=============================================================" -echo "\033[0m" - -exit diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_sd.txt similarity index 100% rename from meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/install_linux_fw_sd.txt rename to meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_sd.txt diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_usb.txt similarity index 100% rename from meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/install_linux_fw_usb.txt rename to meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_usb.txt diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh similarity index 100% rename from meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/install_linux_fw_uuu.sh rename to meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_sd.txt deleted file mode 100644 index ddb57af6c..000000000 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_sd.txt +++ /dev/null @@ -1,159 +0,0 @@ -# -# U-Boot script for installing Linux images created by Yocto from the SD -# card into the eMMC -# - -echo "############################################################" -echo "# Linux firmware install from micro SD #" -echo "############################################################" -echo "" -echo " This process will erase your eMMC and will install a new" -echo " U-Boot and Linux firmware images on the eMMC." -echo "" -echo " Press CTRL+C now if you wish to abort or wait 10 seconds" -echo " to continue." - -sleep 10 -if test $? -eq 1; then - echo "Aborted by user."; - exit; -fi - -setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##.bin; -setenv INSTALL_MMCDEV 1 - -if test -z "${image-name}"; then - setenv image-name ##DEFAULT_IMAGE_NAME## -fi -GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##" -for g in ${GRAPHICAL_IMAGES}; do - if test "${image-name}" = "${g}"; then - BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" - fi -done -if test -z "${BASEFILENAME}"; then - BASEFILENAME="${image-name}" -fi -setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat -setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat -setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4 - -# Check for presence of firmware files on the SD card -for install_f in ${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME} ${INSTALL_ROOTFS_FILENAME}; do - if test ! -e mmc ${INSTALL_MMCDEV} ${install_f}; then - echo "ERROR: Could not find file ${install_f}"; - install_abort=1; - fi; -done -if test -n "${install_abort}"; then - echo "Aborted."; - exit; -fi - -# Skip user confirmation for U-Boot update -setenv forced_update 1 - -# Set bootdelay to zero so that firmware update is run immediately after -# the first reset. -setenv bootdelay 0 - -# Set target MMC device index to eMMC -setenv mmcdev 0 - -# Update U-Boot -echo "" -echo "" -echo ">> Installing U-Boot boot loader (target will reset)" -echo "" -echo "" -update uboot mmc ${INSTALL_MMCDEV} ${INSTALL_UBOOT_FILENAME} -if test $? -eq 1; then - # Use old-style update with source file system argument - update uboot mmc ${INSTALL_MMCDEV} fat ${INSTALL_UBOOT_FILENAME} - if test $? -eq 1; then - echo "[ERROR] Failed to update U-Boot boot loader!"; - echo ""; - echo "Aborted."; - exit; - fi -fi - -# Set 'bootcmd' to the second part of the script that will -# - Reset environment to defaults -# - Save the environment -# - Force on-the-fly updates to avoid possible verification errors -# - Partition the eMMC user data area for Linux -# - Update the 'linux' partition -# - Update the 'recovery' partition -# - Update the 'rootfs' partition -# - Configure recovery to wipe 'update' partition -# - Disable on-the-fly updates -# - Run 'recovery' and let the system boot after -setenv bootcmd " - env default -a; - saveenv; - setenv otf-update yes; - echo \"\"; - echo \"\"; - echo \">> Creating Linux partition table on the eMMC\"; - echo \"\"; - echo \"\"; - run partition_mmc_linux; - if test \$? -eq 1; then - echo \"[ERROR] Failed to create Linux partition table!\"; - echo \"\"; - echo \"Aborted.\"; - exit; - fi; - echo \"\"; - echo \"\"; - echo \">> Installing Linux kernel and device tree files\"; - echo \"\"; - echo \"\"; - update linux mmc ${INSTALL_MMCDEV} ${INSTALL_LINUX_FILENAME}; - if test \$? -eq 1; then - echo \"[ERROR] Failed to update linux partition!\"; - echo \"\"; - echo \"Aborted.\"; - exit; - fi; - echo \"\"; - echo \"\"; - echo \">> Installing recovery\"; - echo \"\"; - echo \"\"; - update recovery mmc ${INSTALL_MMCDEV} ${INSTALL_RECOVERY_FILENAME}; - if test \$? -eq 1; then - echo \"[ERROR] Failed to update recovery partition!\"; - echo \"\"; - echo \"Aborted.\"; - exit; - fi; - echo \"\"; - echo \"\"; - echo \">> Installing Linux root file system\"; - echo \"\"; - echo \"\"; - update rootfs mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; - if test \$? -eq 1; then - echo \"[ERROR] Failed to update rootfs partition!\"; - echo \"\"; - echo \"Aborted.\"; - exit; - fi; - echo \"\"; - setenv boot_recovery yes; - setenv recovery_command wipe_update; - setenv otf-update; - saveenv; - echo \"\"; - echo \"\"; - echo \">> Firmware installation complete. Rebooting into recovery mode for final deployment.\"; - echo \"\"; - echo \"\"; - sleep 1; - reset; -" - -saveenv -reset diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_usb.txt deleted file mode 100644 index ec72bb8d0..000000000 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_usb.txt +++ /dev/null @@ -1,160 +0,0 @@ -# -# U-Boot script for installing Linux images created by Yocto from a USB stick -# into the eMMC -# - -echo "######################################################" -echo "# Linux firmware install from USB #" -echo "######################################################" -echo "" -echo " This process will erase your eMMC and will install a new" -echo " U-Boot and Linux firmware images on the eMMC." -echo "" -echo " Press CTRL+C now if you wish to abort or wait 10 seconds" -echo " to continue." - -sleep 10 -if test $? -eq 1; then - echo "Aborted by user."; - exit; -fi - -setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##.bin; -setenv INSTALL_USBDEV 0 - -if test -z "${image-name}"; then - setenv image-name ##DEFAULT_IMAGE_NAME## -fi -GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##" -for g in ${GRAPHICAL_IMAGES}; do - if test "${image-name}" = "${g}"; then - BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" - fi -done -if test -z "${BASEFILENAME}"; then - BASEFILENAME="${image-name}" -fi -setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat -setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat -setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4 - -# Check for presence of firmware files on the USB -for install_f in ${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME} ${INSTALL_ROOTFS_FILENAME}; do - if test ! -e usb ${INSTALL_USBDEV} ${install_f}; then - echo "ERROR: Could not find file ${install_f}"; - install_abort=1; - fi; -done -if test -n "${install_abort}"; then - echo "Aborted."; - exit; -fi - -# Skip user confirmation for U-Boot update -setenv forced_update 1 - -# Set bootdelay to zero so that firmware update is run immediately after -# the first reset. -setenv bootdelay 0 - -# Set target MMC device index to eMMC -setenv mmcdev 0 - -# Update U-Boot -echo "" -echo "" -echo ">> Installing U-Boot boot loader (target will reset)" -echo "" -echo "" -update uboot usb ${INSTALL_USBDEV} ${INSTALL_UBOOT_FILENAME} -if test $? -eq 1; then - # Use old-style update with source file system argument - update uboot mmc ${INSTALL_USBDEV} fat ${INSTALL_UBOOT_FILENAME} - if test $? -eq 1; then - echo "[ERROR] Failed to update U-Boot boot loader!"; - echo ""; - echo "Aborted."; - exit; - fi -fi - -# Set 'bootcmd' to the second part of the script that will -# - Reset environment to defaults -# - Save the environment -# - Force on-the-fly updates to avoid possible verification errors -# - Partition the eMMC user data area for Linux -# - Update the 'linux' partition -# - Update the 'recovery' partition -# - Update the 'rootfs' partition -# - Configure recovery to wipe 'update' partition -# - Disable on-the-fly updates -# - Run 'recovery' and let the system boot after -setenv bootcmd " - env default -a; - saveenv; - setenv otf-update yes; - echo \"\"; - echo \"\"; - echo \">> Creating Linux partition table on the eMMC\"; - echo \"\"; - echo \"\"; - run partition_mmc_linux; - if test \$? -eq 1; then - echo \"[ERROR] Failed to create Linux partition table!\"; - echo \"\"; - echo \"Aborted.\"; - exit; - fi; - usb start; - echo \"\"; - echo \"\"; - echo \">> Installing Linux kernel and device tree files\"; - echo \"\"; - echo \"\"; - update linux usb ${INSTALL_USBDEV} ${INSTALL_LINUX_FILENAME}; - if test \$? -eq 1; then - echo \"[ERROR] Failed to update linux partition!\"; - echo \"\"; - echo \"Aborted.\"; - exit; - fi; - echo \"\"; - echo \"\"; - echo \">> Installing recovery\"; - echo \"\"; - echo \"\"; - update recovery usb ${INSTALL_USBDEV} ${INSTALL_RECOVERY_FILENAME}; - if test \$? -eq 1; then - echo \"[ERROR] Failed to update recovery partition!\"; - echo \"\"; - echo \"Aborted.\"; - exit; - fi; - echo \"\"; - echo \"\"; - echo \">> Installing Linux root file system\"; - echo \"\"; - echo \"\"; - update rootfs usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; - if test \$? -eq 1; then - echo \"[ERROR] Failed to update rootfs partition!\"; - echo \"\"; - echo \"Aborted.\"; - exit; - fi; - echo \"\"; - setenv boot_recovery yes; - setenv recovery_command wipe_update; - setenv otf-update; - saveenv; - echo \"\"; - echo \"\"; - echo \">> Firmware installation complete. Rebooting into recovery mode for final deployment.\"; - echo \"\"; - echo \"\"; - sleep 1; - reset; -" - -saveenv -reset diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_uuu.sh deleted file mode 100755 index 48ecd611a..000000000 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_uuu.sh +++ /dev/null @@ -1,216 +0,0 @@ -#!/bin/sh -#=============================================================================== -# -# Copyright (C) 2020-2021 by Digi International Inc. -# All rights reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 as published by -# the Free Software Foundation. -# -# -# Description: -# Script to flash Yocto build artifacts over USB to the target. -#=============================================================================== -# set -x - -# -# U-Boot script for installing Linux images created by Yocto -# - -# Parse uuu cmd output -getenv() -{ - uuu -v fb: ucmd printenv "${1}" | sed -ne "s,^${1}=,,g;T;p" -} - -show_usage() -{ - echo "Usage: $0 [options]" - echo "" - echo " Options:" - echo " -h Show this help." - 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 " -n No wait. Skips 10 seconds delay to stop script." - echo " -u U-Boot filename." - echo " Auto-determined by variant if not provided." - exit 2 -} - -# Update a partition -# Params: -# 1. partition -# 2. file -part_update() -{ - echo "\033[36m" - echo "=====================================================================================" - echo "Updating '${1}' partition with file: ${2}" - echo "=====================================================================================" - echo "\033[0m" - - if [ "${1}" = "bootloader" ]; then - uuu fb: flash "${1}" "${2}" - else - uuu fb: flash -raw2sparse "${1}" "${2}" - fi -} - -clear -echo "############################################################" -echo "# Linux firmware install through USB OTG #" -echo "############################################################" - -# Command line admits the following parameters: -# -u -# -i -while getopts 'hi:nu:' c -do - case $c in - h) show_usage ;; - i) IMAGE_NAME=${OPTARG} ;; - n) NOWAIT=true ;; - u) INSTALL_UBOOT_FILENAME=${OPTARG} ;; - esac -done - -echo "" -echo "Determining image files to use..." - -# Determine U-Boot file to program basing on SOM's SOC type (linked to bus width) -if [ -z "${INSTALL_UBOOT_FILENAME}" ]; then - INSTALL_UBOOT_FILENAME="imx-boot-##MACHINE##.bin" -fi - -# Determine linux, recovery, and rootfs image filenames to update -if [ -z "${IMAGE_NAME}" ]; then - IMAGE_NAME="##DEFAULT_IMAGE_NAME##" -fi -GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##" -for g in ${GRAPHICAL_IMAGES}; do - if [ "${IMAGE_NAME}" = "${g}" ]; then - BASEFILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##" - fi -done -if [ -z "${BASEFILENAME}" ]; then - BASEFILENAME="${IMAGE_NAME}" -fi -INSTALL_LINUX_FILENAME="${BASEFILENAME}-##MACHINE##.boot.vfat" -INSTALL_RECOVERY_FILENAME="${BASEFILENAME}-##MACHINE##.recovery.vfat" -INSTALL_ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ext4" - -# Verify existance of files before starting the update -FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME} ${INSTALL_ROOTFS_FILENAME}" -for f in ${FILES}; do - if [ ! -f ${f} ]; then - echo "\033[31m[ERROR] Could not find file '${f}'\033[0m" - ABORT=true - fi -done; - -[ "${ABORT}" = true ] && exit 1 - -# Print warning about storage media being deleted -if [ ! "${NOWAIT}" = true ]; then - WAIT=10 - echo "" - echo " ====================" - echo " = IMPORTANT! =" - echo " ====================" - echo " This process will erase your eMMC and will install the following files" - echo " on the partitions of the eMMC." - echo "" - echo " PARTITION FILENAME" - echo " --------- --------" - echo " bootloader ${INSTALL_UBOOT_FILENAME}" - echo " linux ${INSTALL_LINUX_FILENAME}" - echo " recovery ${INSTALL_RECOVERY_FILENAME}" - echo " rootfs ${INSTALL_ROOTFS_FILENAME}" - echo "" - echo " Press CTRL+C now if you wish to abort." - echo "" - while [ ${WAIT} -gt 0 ]; do - printf "\r Update process starts in %d " ${WAIT} - sleep 1 - WAIT=$(( ${WAIT} - 1 )) - done - printf "\r \n" - echo " Starting update process" -fi - -# Set fastboot buffer address to $loadaddr, just in case -uuu fb: ucmd setenv fastboot_buffer \${loadaddr} - -# Skip user confirmation for U-Boot update -uuu fb: ucmd setenv forced_update 1 - -# Update U-Boot -part_update "bootloader" "${INSTALL_UBOOT_FILENAME}" - -# Set MMC to boot from BOOT1 partition -uuu fb: ucmd mmc partconf 0 1 1 1 - -# Set 'bootcmd' for the second part of the script that will -# - Reset environment to defaults -# - Save the environment -# - Partition the eMMC user data area for Linux -# - Update the 'linux' partition -# - Update the 'recovery' partition -# - Update the 'rootfs' partition -uuu fb: ucmd setenv bootcmd " - env default -a; - saveenv; - echo \"\"; - echo \"\"; - echo \">> Creating Linux partition table on the eMMC\"; - echo \"\"; - echo \"\"; - run partition_mmc_linux; - if test \$? -eq 1; then - echo \"[ERROR] Failed to create Linux partition table!\"; - echo \"\"; - echo \"Aborted.\"; - exit; - fi; - echo \"\"; - echo \"\"; - echo \">> Start installation Linux firmware files\"; - echo \"\"; - echo \"\"; - saveenv; - fastboot 0; -" - -uuu fb: ucmd saveenv -uuu fb: acmd reset - -# Wait for the target to reset -sleep 3 - -# Update Linux -part_update "linux" "${INSTALL_LINUX_FILENAME}" - -# Update Recovery -part_update "recovery" "${INSTALL_RECOVERY_FILENAME}" - -# Update Rootfs -part_update "rootfs" "${INSTALL_ROOTFS_FILENAME}" - -# Configure u-boot to boot into recovery mode -uuu fb: ucmd setenv boot_recovery yes -uuu fb: ucmd setenv recovery_command wipe_update - -uuu fb: ucmd saveenv - -# Reset the target -uuu fb: acmd reset - -echo "\033[32m" -echo "=============================================================" -echo "Done! Wait for the target to complete first boot process." -echo "=============================================================" -echo "\033[0m" - -exit diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_usb.txt deleted file mode 100644 index 18f1439de..000000000 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_usb.txt +++ /dev/null @@ -1,229 +0,0 @@ -# -# U-Boot script for installing Linux images created by Yocto from a USB stick -# into the eMMC -# - -echo "######################################################" -echo "# Linux firmware install from USB #" -echo "######################################################" -echo "" -echo " This process will erase your eMMC and will install a new" -echo " U-Boot and Linux firmware images on the eMMC." -echo "" -echo " Press CTRL+C now if you wish to abort or wait 10 seconds" -echo " to continue." - -sleep 10 -if test $? -eq 1; then - echo "Aborted by user."; - exit; -fi - -# Since SOMs with the B0 SOC might have an older U-Boot that doesn't export the -# SOC revision to the environment, use B0 by default -if test -z "${soc_rev}"; then - setenv soc_rev B0 -fi - -# In case this script is used to update to a newer release whose imx-boot file -# is not recognized by the SECO fw check, bypass it by default. The script has -# the necessary logic to choose the correct imx-boot file for the target's SOC. -setenv skip-uboot-check "yes" - -# Determine U-Boot file to program basing on SOM's RAM size and SOC type (linked to bus width) -bus_width="32bit" -if test -n "${module_ram}" && test -n "${soc_type}"; then - if test "${soc_type}" = "imx8dx"; then - bus_width="16bit" - fi - setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-${module_ram}_${bus_width}.bin; -else - # Determine U-Boot file to program basing on SOM's variant - if test -n "${module_variant}"; then - if test "${module_variant}" = "0x01"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-1GB_32bit.bin; - elif test "${module_variant}" = "0x02"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-2GB_32bit.bin; - elif test "${module_variant}" = "0x03"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-2GB_32bit.bin; - elif test "${module_variant}" = "0x04"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-1GB_16bit.bin; - elif test "${module_variant}" = "0x05"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-1GB_16bit.bin; - elif test "${module_variant}" = "0x06"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-512MB_16bit.bin; - elif test "${module_variant}" = "0x07"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-1GB_32bit.bin; - elif test "${module_variant}" = "0x08"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-1GB_32bit.bin; - elif test "${module_variant}" = "0x09"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-512MB_16bit.bin; - elif test "${module_variant}" = "0x0A"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-1GB_16bit.bin; - elif test "${module_variant}" = "0x0B"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-1GB_16bit.bin; - fi - fi -fi - -# Use 'test -n ...' because 'test -z ...' does not work well on old versions of -# u-boot when the checked value is empty. -if test -n "${INSTALL_UBOOT_FILENAME}"; then - true; -else - echo ""; - echo "[ERROR] Cannot determine U-Boot file for this module!"; - echo ""; - echo "1. Set variable 'INSTALL_UBOOT_FILENAME' depending on your ConnectCore 8X variant:"; - echo " - For a QuadXPlus CPU with 1GB LPDDR4, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-1GB_32bit.bin"; - echo " - For a QuadXPlus CPU with 2GB LPDDR4, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-2GB_32bit.bin"; - echo " - For a DualX CPU with 1GB LPDDR4, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-1GB_16bit.bin"; - echo ""; - echo "2. Run the install script again."; - echo ""; - echo "Aborted"; - echo ""; - exit; -fi; - -setenv INSTALL_USBDEV 0 - -if test -z "${image-name}"; then - setenv image-name ##DEFAULT_IMAGE_NAME## -fi -GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##" -for g in ${GRAPHICAL_IMAGES}; do - if test "${image-name}" = "${g}"; then - BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" - fi -done -if test -z "${BASEFILENAME}"; then - BASEFILENAME="${image-name}" -fi -setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat -setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat -setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4 - -# Check for presence of firmware files on the USB -for install_f in ${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME} ${INSTALL_ROOTFS_FILENAME}; do - if test ! -e mmc ${INSTALL_USBDEV} ${install_f}; then - echo "ERROR: Could not find file ${install_f}"; - install_abort=1; - fi; -done -if test -n "${install_abort}"; then - echo "Aborted."; - exit; -fi - -# Skip user confirmation for U-Boot update -setenv forced_update 1 - -# Set bootdelay to zero so that firmware update is run immediately after -# the first reset. -setenv bootdelay 0 - -# Set target MMC device index to eMMC -setenv mmcdev 0 - -# Update U-Boot -echo "" -echo "" -echo ">> Installing U-Boot boot loader (target will reset)" -echo "" -echo "" -update uboot usb ${INSTALL_USBDEV} ${INSTALL_UBOOT_FILENAME} -if test $? -eq 1; then - # Use old-style update with source file system argument - update uboot mmc ${INSTALL_USBDEV} fat ${INSTALL_UBOOT_FILENAME} - if test $? -eq 1; then - echo "[ERROR] Failed to update U-Boot boot loader!"; - echo ""; - echo "Aborted."; - exit; - fi -fi - -# Set 'bootcmd' to the second part of the script that will -# - Reset environment to defaults -# - Save the environment -# - Force on-the-fly updates to avoid possible verification errors -# - Partition the eMMC user data area for Linux -# - Update the 'linux' partition -# - Update the 'recovery' partition -# - Update the 'rootfs' partition -# - Configure recovery to wipe 'update' partition -# - Disable on-the-fly updates -# - Run 'recovery' and let the system boot after -setenv bootcmd " - env default -a; - saveenv; - setenv otf-update yes; - echo \"\"; - echo \"\"; - echo \">> Creating Linux partition table on the eMMC\"; - echo \"\"; - echo \"\"; - run partition_mmc_linux; - if test \$? -eq 1; then - echo \"[ERROR] Failed to create Linux partition table!\"; - echo \"\"; - echo \"Aborted.\"; - exit; - fi; - usb start; - echo \"\"; - echo \"\"; - echo \">> Installing Linux kernel and device tree files\"; - echo \"\"; - echo \"\"; - update linux usb ${INSTALL_USBDEV} ${INSTALL_LINUX_FILENAME}; - if test \$? -eq 1; then - echo \"[ERROR] Failed to update linux partition!\"; - echo \"\"; - echo \"Aborted.\"; - exit; - fi; - echo \"\"; - echo \"\"; - echo \">> Installing recovery\"; - echo \"\"; - echo \"\"; - update recovery usb ${INSTALL_USBDEV} ${INSTALL_RECOVERY_FILENAME}; - if test \$? -eq 1; then - echo \"[ERROR] Failed to update recovery partition!\"; - echo \"\"; - echo \"Aborted.\"; - exit; - fi; - echo \"\"; - echo \"\"; - echo \">> Installing Linux root file system\"; - echo \"\"; - echo \"\"; - update rootfs usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; - if test \$? -eq 1; then - echo \"[ERROR] Failed to update rootfs partition!\"; - echo \"\"; - echo \"Aborted.\"; - exit; - fi; - echo \"\"; - setenv boot_recovery yes; - setenv recovery_command wipe_update; - setenv otf-update; - saveenv; - echo \"\"; - echo \"\"; - echo \">> Firmware installation complete. Rebooting into recovery mode for final deployment.\"; - echo \"\"; - echo \"\"; - sleep 1; - reset; -" - -saveenv -reset diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt deleted file mode 100644 index f811db5d7..000000000 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt +++ /dev/null @@ -1,230 +0,0 @@ -# -# U-Boot script for installing Linux images created by Yocto from the SD -# card into the eMMC -# - -echo "############################################################" -echo "# Linux firmware install from micro SD #" -echo "############################################################" -echo "" -echo " This process will erase your eMMC and will install a new" -echo " U-Boot and Linux firmware images on the eMMC." -echo "" -echo " Press CTRL+C now if you wish to abort or wait 10 seconds" -echo " to continue." - -sleep 10 -if test $? -eq 1; then - echo "Aborted by user."; - exit; -fi - -# Since SOMs with the B0 SOC might have an older U-Boot that doesn't export the -# SOC revision to the environment, use B0 by default -if test -z "${soc_rev}"; then - setenv soc_rev B0 -fi - -# In case this script is used to update to a newer release whose imx-boot file -# is not recognized by the SECO fw check, bypass it by default. The script has -# the necessary logic to choose the correct imx-boot file for the target's SOC. -setenv skip-uboot-check "yes" - -# Determine U-Boot file to program basing on SOM's RAM size and SOC type (linked to bus width) -bus_width="32bit" -if test -n "${module_ram}" && test -n "${soc_type}"; then - if test "${soc_type}" = "imx8dx"; then - bus_width="16bit" - fi - setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-${module_ram}_${bus_width}.bin; -else - # Determine U-Boot file to program basing on SOM's variant - if test -n "${module_variant}"; then - if test "${module_variant}" = "0x01"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-1GB_32bit.bin; - elif test "${module_variant}" = "0x02"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-2GB_32bit.bin; - elif test "${module_variant}" = "0x03"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-2GB_32bit.bin; - elif test "${module_variant}" = "0x04"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-1GB_16bit.bin; - elif test "${module_variant}" = "0x05"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-1GB_16bit.bin; - elif test "${module_variant}" = "0x06"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-512MB_16bit.bin; - elif test "${module_variant}" = "0x07"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-1GB_32bit.bin; - elif test "${module_variant}" = "0x08"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-1GB_32bit.bin; - elif test "${module_variant}" = "0x09"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-512MB_16bit.bin; - elif test "${module_variant}" = "0x0A"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-1GB_16bit.bin; - elif test "${module_variant}" = "0x0B"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-1GB_16bit.bin; - fi - fi -fi - -# Use 'test -n ...' because 'test -z ...' does not work well on old versions of -# u-boot when the checked value is empty. -if test -n "${INSTALL_UBOOT_FILENAME}"; then - true; -else - echo ""; - echo "[ERROR] Cannot determine U-Boot file for this module!"; - echo ""; - echo "1. Set variable 'INSTALL_UBOOT_FILENAME' depending on your ConnectCore 8X variant:"; - echo " - For a QuadXPlus CPU with 1GB LPDDR4, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-1GB_32bit.bin"; - echo " - For a QuadXPlus CPU with 2GB LPDDR4, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-2GB_32bit.bin"; - echo " - For a DualX CPU with 1GB LPDDR4, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-1GB_16bit.bin"; - echo " - For a DualX CPU with 512MB LPDDR4, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##-${soc_rev}-512MB_16bit.bin"; - echo ""; - echo "2. Run the install script again."; - echo ""; - echo "Aborted"; - echo ""; - exit; -fi; - -setenv INSTALL_MMCDEV 1 - -if test -z "${image-name}"; then - setenv image-name ##DEFAULT_IMAGE_NAME## -fi -GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##" -for g in ${GRAPHICAL_IMAGES}; do - if test "${image-name}" = "${g}"; then - BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" - fi -done -if test -z "${BASEFILENAME}"; then - BASEFILENAME="${image-name}" -fi -setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat -setenv INSTALL_RECOVERY_FILENAME ${BASEFILENAME}-##MACHINE##.recovery.vfat -setenv INSTALL_ROOTFS_FILENAME ${BASEFILENAME}-##MACHINE##.ext4 - -# Check for presence of firmware files on the SD card -for install_f in ${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME} ${INSTALL_ROOTFS_FILENAME}; do - if test ! -e mmc ${INSTALL_MMCDEV} ${install_f}; then - echo "ERROR: Could not find file ${install_f}"; - install_abort=1; - fi; -done -if test -n "${install_abort}"; then - echo "Aborted."; - exit; -fi - -# Skip user confirmation for U-Boot update -setenv forced_update 1 - -# Set bootdelay to zero so that firmware update is run immediately after -# the first reset. -setenv bootdelay 0 - -# Set target MMC device index to eMMC -setenv mmcdev 0 - -# Update U-Boot -echo "" -echo "" -echo ">> Installing U-Boot boot loader (target will reset)" -echo "" -echo "" -update uboot mmc ${INSTALL_MMCDEV} ${INSTALL_UBOOT_FILENAME} -if test $? -eq 1; then - # Use old-style update with source file system argument - update uboot mmc ${INSTALL_MMCDEV} fat ${INSTALL_UBOOT_FILENAME} - if test $? -eq 1; then - echo "[ERROR] Failed to update U-Boot boot loader!"; - echo ""; - echo "Aborted."; - exit; - fi -fi - -# Set 'bootcmd' to the second part of the script that will -# - Reset environment to defaults -# - Save the environment -# - Force on-the-fly updates to avoid possible verification errors -# - Partition the eMMC user data area for Linux -# - Update the 'linux' partition -# - Update the 'recovery' partition -# - Update the 'rootfs' partition -# - Configure recovery to wipe 'update' partition -# - Disable on-the-fly updates -# - Run 'recovery' and let the system boot after -setenv bootcmd " - env default -a; - saveenv; - setenv otf-update yes; - echo \"\"; - echo \"\"; - echo \">> Creating Linux partition table on the eMMC\"; - echo \"\"; - echo \"\"; - run partition_mmc_linux; - if test \$? -eq 1; then - echo \"[ERROR] Failed to create Linux partition table!\"; - echo \"\"; - echo \"Aborted.\"; - exit; - fi; - echo \"\"; - echo \"\"; - echo \">> Installing Linux kernel and device tree files\"; - echo \"\"; - echo \"\"; - update linux mmc ${INSTALL_MMCDEV} ${INSTALL_LINUX_FILENAME}; - if test \$? -eq 1; then - echo \"[ERROR] Failed to update linux partition!\"; - echo \"\"; - echo \"Aborted.\"; - exit; - fi; - echo \"\"; - echo \"\"; - echo \">> Installing recovery\"; - echo \"\"; - echo \"\"; - update recovery mmc ${INSTALL_MMCDEV} ${INSTALL_RECOVERY_FILENAME}; - if test \$? -eq 1; then - echo \"[ERROR] Failed to update recovery partition!\"; - echo \"\"; - echo \"Aborted.\"; - exit; - fi; - echo \"\"; - echo \"\"; - echo \">> Installing Linux root file system\"; - echo \"\"; - echo \"\"; - update rootfs mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; - if test \$? -eq 1; then - echo \"[ERROR] Failed to update rootfs partition!\"; - echo \"\"; - echo \"Aborted.\"; - exit; - fi; - echo \"\"; - setenv boot_recovery yes; - setenv recovery_command wipe_update; - setenv otf-update; - saveenv; - echo \"\"; - echo \"\"; - echo \">> Firmware installation complete. Rebooting into recovery mode for final deployment.\"; - echo \"\"; - echo \"\"; - sleep 1; - reset; -" - -saveenv -reset diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_uuu.sh deleted file mode 100644 index 88eed85b3..000000000 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_uuu.sh +++ /dev/null @@ -1,278 +0,0 @@ -#!/bin/sh -#=============================================================================== -# -# Copyright (C) 2020-2021 by Digi International Inc. -# All rights reserved. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 as published by -# the Free Software Foundation. -# -# -# Description: -# Script to flash Yocto build artifacts over USB to the target. -#=============================================================================== -# set -x - -# -# U-Boot script for installing Linux images created by Yocto -# - -# Parse uuu cmd output -getenv() -{ - uuu -v fb: ucmd printenv "${1}" | sed -ne "s,^${1}=,,g;T;p" -} - -show_usage() -{ - echo "Usage: $0 [options]" - echo "" - echo " Options:" - echo " -h Show this help." - 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 " -n No wait. Skips 10 seconds delay to stop script." - echo " -u U-Boot filename." - echo " Auto-determined by variant if not provided." - exit 2 -} - -# Update a partition -# Params: -# 1. partition -# 2. file -part_update() -{ - echo "\033[36m" - echo "=====================================================================================" - echo "Updating '${1}' partition with file: ${2}" - echo "=====================================================================================" - echo "\033[0m" - - if [ "${1}" = "bootloader" ]; then - uuu fb: flash "${1}" "${2}" - else - uuu fb: flash -raw2sparse "${1}" "${2}" - fi -} - -clear -echo "############################################################" -echo "# Linux firmware install through USB OTG #" -echo "############################################################" - -# Command line admits the following parameters: -# -u -# -i -while getopts 'hi:nu:' c -do - case $c in - h) show_usage ;; - i) IMAGE_NAME=${OPTARG} ;; - n) NOWAIT=true ;; - u) INSTALL_UBOOT_FILENAME=${OPTARG} ;; - esac -done - -echo "" -echo "Determining image files to use..." - -# Determine U-Boot file to program basing on SOM's SOC type (linked to bus width) -if [ -z ${INSTALL_UBOOT_FILENAME} ]; then - # Enable the redirect support to get u-boot variables values - uuu fb: ucmd setenv stdout serial,fastboot - - # Since SOMs with the B0 SOC might have an older U-Boot that doesn't export the - # SOC revision to the environment, use B0 by default - soc_rev=$(getenv "soc_rev") - if [ -z "${soc_rev}" ]; then - soc_rev="B0" - fi - - bus_width="32bit" - soc_type=$(getenv "soc_type") - if [ "$soc_type" = "imx8dx" ]; then - bus_width="16bit" - fi - - module_ram=$(getenv "module_ram") - if [ -z "${module_ram}" ]; then - module_variant=$(getenv "module_variant") - # Determine U-Boot file to program basing on SOM's variant - if [ -n "$module_variant" ]; then - if [ "$module_variant" == "0x01" ] || \ - [ "$module_variant" == "0x04" ] || \ - [ "$module_variant" == "0x05" ]; then - module_ram="1GB" - elif [ "$module_variant" == "0x02" ] || \ - [ "$module_variant" == "0x03" ]; then - module_ram="2GB" - else - module_ram="512MB" - fi - INSTALL_UBOOT_FILENAME="imx-boot-##MACHINE##-${soc_rev}-${module_ram}_${bus_width}.bin" - fi - else - INSTALL_UBOOT_FILENAME="imx-boot-##MACHINE##-${soc_rev}-${module_ram}_${bus_width}.bin" - fi - - # remove redirect - uuu fb: ucmd setenv stdout serial - - # U-Boot when the checked value is empty. - if [ -n "${INSTALL_UBOOT_FILENAME}" ]; then - true - else - echo "" - echo "[ERROR] Cannot determine U-Boot file for this module!" - echo "" - echo "1. Add U-boot file name, depending on your ConnectCore 8X variant, to script command line:" - echo " - For a QuadXPlus CPU with 1GB LPDDR4, run:" - echo " => ./install_linux_fs_uuu.sh -u imx-boot-##MACHINE##-${soc_rev}-1GB_32bit.bin" - echo " - For a QuadXPlus CPU with 2GB LPDDR4, run:" - echo " => ./install_linux_fs_uuu.sh -u imx-boot-##MACHINE##-${soc_rev}-2GB_32bit.bin" - echo " - For a DualX CPU with 1GB LPDDR4, run:" - echo " => ./install_linux_fs_uuu.sh -u imx-boot-##MACHINE##-${soc_rev}-1GB_16bit.bin" - echo " - For a DualX CPU with 512MB LPDDR4, run:" - echo " => ./install_linux_fs_uuu.sh -u imx-boot-##MACHINE##-${soc_rev}-512MB_16bit.bin" - echo "" - echo "2. Run the install script again." - echo "" - echo "Aborted" - echo "" - exit - fi -fi - -# Determine linux, recovery, and rootfs image filenames to update -if [ -z "${IMAGE_NAME}" ]; then - IMAGE_NAME="##DEFAULT_IMAGE_NAME##" -fi -GRAPHICAL_IMAGES="##GRAPHICAL_IMAGES##" -for g in ${GRAPHICAL_IMAGES}; do - if [ "${IMAGE_NAME}" = "${g}" ]; then - BASEFILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##" - fi -done -if [ -z "${BASEFILENAME}" ]; then - BASEFILENAME="${IMAGE_NAME}" -fi -INSTALL_LINUX_FILENAME="${BASEFILENAME}-##MACHINE##.boot.vfat" -INSTALL_RECOVERY_FILENAME="${BASEFILENAME}-##MACHINE##.recovery.vfat" -INSTALL_ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ext4" - -# Verify existance of files before starting the update -FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME} ${INSTALL_ROOTFS_FILENAME}" -for f in ${FILES}; do - if [ ! -f ${f} ]; then - echo "\033[31m[ERROR] Could not find file '${f}'\033[0m" - ABORT=true - fi -done; - -[ "${ABORT}" = true ] && exit 1 - -# Print warning about storage media being deleted -if [ ! "${NOWAIT}" = true ]; then - WAIT=10 - echo "" - echo " ====================" - echo " = IMPORTANT! =" - echo " ====================" - echo " This process will erase your eMMC and will install the following files" - echo " on the partitions of the eMMC." - echo "" - echo " PARTITION FILENAME" - echo " --------- --------" - echo " bootloader ${INSTALL_UBOOT_FILENAME}" - echo " linux ${INSTALL_LINUX_FILENAME}" - echo " recovery ${INSTALL_RECOVERY_FILENAME}" - echo " rootfs ${INSTALL_ROOTFS_FILENAME}" - echo "" - echo " Press CTRL+C now if you wish to abort." - echo "" - while [ ${WAIT} -gt 0 ]; do - printf "\r Update process starts in %d " ${WAIT} - sleep 1 - WAIT=$(( ${WAIT} - 1 )) - done - printf "\r \n" - echo " Starting update process" -fi - -# Skip user confirmation for U-Boot update -uuu fb: ucmd setenv forced_update 1 - -# Update U-Boot -part_update "bootloader" "${INSTALL_UBOOT_FILENAME}" - -# Set MMC to boot from BOOT1 partition -uuu fb: ucmd mmc partconf 0 1 1 1 - -# Set 'bootcmd' for the second part of the script that will -# - Reset environment to defaults -# - Save the environment -# - Partition the eMMC user data area for Linux -# - Update the 'linux' partition -# - Update the 'recovery' partition -# - Update the 'rootfs' partition -uuu fb: ucmd setenv bootcmd " - env default -a; - saveenv; - echo \"\"; - echo \"\"; - echo \">> Creating Linux partition table on the eMMC\"; - echo \"\"; - echo \"\"; - run partition_mmc_linux; - if test \$? -eq 1; then - echo \"[ERROR] Failed to create Linux partition table!\"; - echo \"\"; - echo \"Aborted.\"; - exit; - fi; - echo \"\"; - echo \"\"; - echo \">> Start installation Linux firmware files\"; - echo \"\"; - echo \"\"; - saveenv; - fastboot 1; -" - -uuu fb: ucmd saveenv -uuu fb: acmd reset - -# Wait for the target to reset -sleep 3 - -# Set fastboot buffer address to $loadaddr, just in case -uuu fb: ucmd setenv fastboot_buffer \${loadaddr} - -# Update Linux -part_update "linux" "${INSTALL_LINUX_FILENAME}" - -# Update Recovery -part_update "recovery" "${INSTALL_RECOVERY_FILENAME}" - -# Update Rootfs -part_update "rootfs" "${INSTALL_ROOTFS_FILENAME}" - -# Configure u-boot to boot into recovery mode -uuu fb: ucmd setenv boot_recovery yes -uuu fb: ucmd setenv recovery_command wipe_update - -uuu fb: ucmd saveenv - -# Reset the target -uuu fb: acmd reset - -echo "\033[32m" -echo "=============================================================" -echo "Done! Wait for the target to complete first boot process." -echo "=============================================================" -echo "\033[0m" - -exit diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_sd.txt similarity index 100% rename from meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt rename to meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_sd.txt diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt similarity index 100% rename from meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_usb.txt rename to meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh similarity index 100% rename from meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_uuu.sh rename to meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh