Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meta-digi-arm: uboot: Add firmware install script using fastboot support. 

This commit adds a installation script that uses fastboot support to
update the target firmware.

Signed-off-by: Mike Engel <Mike.Engel@digi.com>

https://jira.digi.com/browse/DEL-6845
This commit is contained in:
Mike Engel 2020-03-10 10:38:59 +01:00
parent 388ef5c388
commit e550d82c77
4 changed files with 191 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf
View File

@ -32,6 +32,7 @@ XBEE_TTY ?= "ttyMCA0"
# U-Boot script to be copied to the boot image # U-Boot script to be copied to the boot image
BOOT_SCRIPTS = "boot.scr:boot.scr" BOOT_SCRIPTS = "boot.scr:boot.scr"
UBOOT_HAS_FASTBOOT = "true"
# Flash image types # Flash image types
IMAGE_FSTYPES ?= "boot.vfat ext4 sdcard tar.bz2 recovery.vfat" IMAGE_FSTYPES ?= "boot.vfat ext4 sdcard tar.bz2 recovery.vfat"

7
meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc
View File

@ -25,6 +25,7 @@ SRC_URI = " \
SRC_URI_append = " \ SRC_URI_append = " \
file://boot.txt \ file://boot.txt \
file://install_linux_fw_sd.txt \ file://install_linux_fw_sd.txt \
${@oe.utils.conditional('UBOOT_HAS_FASTBOOT', 'true', 'file://install_linux_fw_uuu.sh', '', d)} \
" "
LOCALVERSION ?= "" LOCALVERSION ?= ""
@ -150,6 +151,12 @@ do_deploy_append() {
sed -i -e 's,##GRAPHICAL_BACKEND##,${GRAPHICAL_BACKEND},g' ${WORKDIR}/install_linux_fw_sd.txt sed -i -e 's,##GRAPHICAL_BACKEND##,${GRAPHICAL_BACKEND},g' ${WORKDIR}/install_linux_fw_sd.txt
mkimage -T script -n "DEY firmware install script" -C none -d ${WORKDIR}/install_linux_fw_sd.txt ${DEPLOYDIR}/install_linux_fw_sd.scr mkimage -T script -n "DEY firmware install script" -C none -d ${WORKDIR}/install_linux_fw_sd.txt ${DEPLOYDIR}/install_linux_fw_sd.scr
if [ ${@oe.utils.conditional('UBOOT_HAS_FASTBOOT', 'true', '', '', d)} ]; then
# DEY firmware install uuu script
sed -i -e 's,##GRAPHICAL_BACKEND##,${GRAPHICAL_BACKEND},g' ${WORKDIR}/install_linux_fw_uuu.sh
install 775 ${WORKDIR}/install_linux_fw_uuu.sh ${DEPLOYDIR}/
fi
# Boot script for DEY images (reconfigure on-the-fly if TRUSTFENCE is enabled) # Boot script for DEY images (reconfigure on-the-fly if TRUSTFENCE is enabled)
TMP_BOOTSCR="$(mktemp ${WORKDIR}/bootscr.XXXXXX)" TMP_BOOTSCR="$(mktemp ${WORKDIR}/bootscr.XXXXXX)"
sed -e "${TF_BOOTSCRIPT_SEDFILTER}" ${WORKDIR}/boot.txt > ${TMP_BOOTSCR} sed -e "${TF_BOOTSCRIPT_SEDFILTER}" ${WORKDIR}/boot.txt > ${TMP_BOOTSCR}

179
meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_uuu.sh Normal file
View File

@ -0,0 +1,179 @@
#!/bin/bash
#===============================================================================
#
# Copyright (C) 2020 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
clear
# Parse uuu cmd output
function getenv()
{
while read line; do
if echo "${line}" | grep -i "$1"; then
# Get the U-boot variable content
echo "${line}" | sed -e 's,'${1}=',,g'
else
# Delete the line to return nothing
sed -e 'd'
fi
done < <(uuu -v fb: ucmd printenv ${1})
}
#
# U-Boot script for installing Linux images created by Yocto into the eMMC
#
echo "############################################################"
echo "# Linux firmware install through USB OTG #"
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."
# Get U-Boot file name from cmdline when passed
if [ -n "$1" ]; then
INSTALL_UBOOT_FILENAME="$1"
fi
sleep 10
# Enable the redirect support to get u-boot variables values
uuu fb: ucmd setenv stdout serial,fastboot
# Determine U-Boot file to program basing on SOM's SOC type (linked to bus width)
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-ccimx8x-sbc-pro-1.2GHz_${module_ram}_${bus_width}.bin"
fi
else
INSTALL_UBOOT_FILENAME="imx-boot-ccimx8x-sbc-pro-1.2GHz_${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 " => sudo ./install_linux_fs_uuu.sh imx-boot-ccimx8x-sbc-pro-1.2GHz_1GB_32bit.bin"
echo " - For a QuadXPlus CPU with 2GB LPDDR4, run:"
echo " => sudo ./install_linux_fs_uuu.sh imx-boot-ccimx8x-sbc-pro-1.2GHz_2GB_32bit.bin"
echo " - For a DualX CPU with 1GB LPDDR4, run:"
echo " => sudo ./install_linux_fs_uuu.sh imx-boot-ccimx8x-sbc-pro-1.2GHz_1GB_16bit.bin"
echo " - For a DualX CPU with 512MB LPDDR4, run:"
echo " => sudo ./install_linux_fs_uuu.sh imx-boot-ccimx8x-sbc-pro-1.2GHz_512MB_16bit.bin"
echo ""
echo "2. Run the install script again."
echo ""
echo "Aborted"
echo ""
exit
fi
# Skip user confirmation for U-Boot update
uuu fb: ucmd setenv forced_update 1
# Update U-Boot
uuu fb: flash bootloader ${INSTALL_UBOOT_FILENAME}
# 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
INSTALL_LINUX_FILENAME="dey-image-qt-##GRAPHICAL_BACKEND##-ccimx8x-sbc-pro.boot.vfat"
INSTALL_RECOVERY_FILENAME="dey-image-qt-##GRAPHICAL_BACKEND##-ccimx8x-sbc-pro.recovery.vfat"
INSTALL_ROOTFS_FILENAME="dey-image-qt-##GRAPHICAL_BACKEND##-ccimx8x-sbc-pro.ext4"
# Wait that target returns from reset
sleep 3
# Update Linux
uuu fb: flash -raw2sparse linux ${INSTALL_LINUX_FILENAME}
# Update Recovery
uuu fb: flash -raw2sparse recovery ${INSTALL_RECOVERY_FILENAME}
# Update Rootfs
uuu fb: flash -raw2sparse 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
exit

4
meta-digi-dey/classes/dey-image-installer.bbclass
View File

@ -22,6 +22,10 @@ FSTYPES_WHITELIST = " \
generate_installer_zip () { generate_installer_zip () {
# Get list of files to pack # Get list of files to pack
INSTALLER_FILELIST="${DEPLOY_DIR_IMAGE}/install_linux_fw_sd.scr" INSTALLER_FILELIST="${DEPLOY_DIR_IMAGE}/install_linux_fw_sd.scr"
# Get UUU installation script
if readlink -e "${DEPLOY_DIR_IMAGE}/install_linux_fw_uuu.sh"; then
INSTALLER_FILELIST="${INSTALLER_FILELIST} ${DEPLOY_DIR_IMAGE}/install_linux_fw_uuu.sh"
fi
for ext in ${FSTYPES_WHITELIST}; do for ext in ${FSTYPES_WHITELIST}; do
if readlink -e "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${ext}" >/dev/null; then if readlink -e "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${ext}" >/dev/null; then
INSTALLER_FILELIST="${INSTALLER_FILELIST} ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${ext}" INSTALLER_FILELIST="${INSTALLER_FILELIST} ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${ext}"