From 45677492bbb2bec8215e421c4db22ac9cf9eacaf Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 23 Apr 2019 11:32:58 +0200 Subject: images: drop the legacy update procedure Use the Toradex Easy Installer instead. If you included tdx-image-fstype.inc in your image recipes you will have to remove that include. Signed-off-by: Max Krummenacher --- recipes-images/images/files/library/imx6/update.sh | 310 --------------------- 1 file changed, 310 deletions(-) delete mode 100755 recipes-images/images/files/library/imx6/update.sh (limited to 'recipes-images/images/files/library/imx6/update.sh') diff --git a/recipes-images/images/files/library/imx6/update.sh b/recipes-images/images/files/library/imx6/update.sh deleted file mode 100755 index dc5e0dd..0000000 --- a/recipes-images/images/files/library/imx6/update.sh +++ /dev/null @@ -1,310 +0,0 @@ -#!/bin/sh -# Prepare files needed for flashing a Apalis/Colibri iMX6 module -# -# inspired by meta-fsl-arm/classes/image_types_fsl.bbclass - -# exit on error -set -e - -Flash() -{ - echo "To flash the Apalis/Colibri iMX6 module a running U-Boot is required. Boot the" - echo "module to the U-Boot prompt and" - echo "" - echo "insert the SD card, USB flash drive or when using TFTP connect Ethernet only" - echo "and enter:" - echo "'run setupdate'" - echo "" - echo "then to update all components enter:" - echo "'run update'" - echo "" - echo "to update a single component enter one of:" - echo "'run update_uboot'" - echo "'run update_kernel'" - echo "'run update_fdt'" - echo "'run update_rootfs'" - echo "" - echo "If you don't have a working U-Boot anymore, connect your PC to the module's USB" - echo "client port, bring the module in the serial download mode and start the" - echo "update.sh script with the -d option. This will copy U-Boot into the modules RAM" - echo "and execute it." -} - -Usage() -{ - echo "" - echo "Prepares and copies files for flashing internal eMMC of Apalis/Colibri iMX6" - echo "" - echo "Will require a running U-Boot on the target. Either one already flashed on the" - echo "eMMC or one copied over USB into the module's RAM" - echo "" - echo "-d : use USB connection to copy/execute U-Boot to/from module's RAM" - echo "-f : flash instructions" - echo "-h : prints this message" - echo "-m : module type: 0: autodetect from ./rootfs/etc/issues (default)" - echo " 1: Apalis iMX6" - echo " 2: Colibri iMX6" - echo "-o directory : output directory" - echo "" - echo "Example \"./update.sh -o /srv/tftp/\" copies the required files to /srv/tftp/" - echo "" - echo "*** For detailed recovery/update procedures, refer to the following website: ***" - echo "http://developer.toradex.com/knowledge-base/flashing-linux-on-imx6-modules" - echo "" -} - -# initialise options -KERNEL_IMAGETYPE="zImage" -MIN_PARTITION_FREE_SIZE=100 -MODTYPE_DETECT=0 -OUT_DIR="" -ROOTFSPATH=rootfs -SPLIT=1 -UBOOT_RECOVERY=0 -U_BOOT_BINARY=u-boot.img -SPL_BINARY=SPL - -while getopts "dfhm:o:" Option ; do - case $Option in - d) UBOOT_RECOVERY=1 - ;; - f) Flash - exit 0 - ;; - h) Usage - exit 0 - ;; - m) MODTYPE_DETECT=$OPTARG - ;; - o) OUT_DIR=$OPTARG - ;; - esac -done - -if [ "$OUT_DIR" = "" ] && [ "$UBOOT_RECOVERY" = "0" ] ; then - Usage - exit 1 -fi - -# is OUT_DIR an existing directory? -if [ ! -d "$OUT_DIR" ] && [ "$UBOOT_RECOVERY" = "0" ] ; then - echo "$OUT_DIR" "does not exist, exiting" - exit 1 -fi - -case $MODTYPE_DETECT in - 0) # auto detect MODTYPE from rootfs directory - if [ -f rootfs/etc/issue ] ; then - CNT=`grep -ic "Colibri.iMX6" rootfs/etc/issue || true` - if [ "$CNT" -ge 1 ] ; then - echo "Colibri iMX6 rootfs detected" - MODTYPE=colibri-imx6 - else - CNT=`grep -ic "imx6" rootfs/etc/issue || true` - if [ "$CNT" -ge 1 ] ; then - echo "Apalis iMX6 rootfs detected" - MODTYPE=apalis-imx6 - fi - fi - fi - if [ -e $MODTYPE ] ; then - echo "can not detect module type from ./rootfs/etc/issue" - echo "please specify the module type with the -m parameter" - echo "see help: '$ ./update.sh -h'" - echo "exiting" - exit 1 - fi - ;; - 1) MODTYPE=apalis-imx6 - echo "Apalis iMX6 rootfs specified" - ;; - 2) MODTYPE=colibri-imx6 - echo "Colibri iMX6 rootfs specified" - ;; - *) echo "-m paramter specifies an unknown value" - exit 1 - ;; -esac - -case "$MODTYPE" in - "apalis-imx6") - # assumed minimal eMMC size [in sectors of 512] - EMMC_SIZE=$(expr 1024 \* 3500 \* 2) - IMAGEFILE=root.ext4 - KERNEL_DEVICETREE="%kernel_device_trees%" - LOCPATH="`pwd`/imx_flash" - OUT_DIR="$OUT_DIR/apalis_imx6" - ;; - "colibri-imx6") - # assumed minimal eMMC size [in sectors of 512] - EMMC_SIZE=$(expr 1024 \* 3500 \* 2) - IMAGEFILE=root.ext4 - KERNEL_DEVICETREE="%kernel_device_trees%" - LOCPATH="`pwd`/imx_flash" - OUT_DIR="$OUT_DIR/colibri_imx6" - ;; - *) echo "script internal error, unknown module type set" - exit 1 - ;; -esac - -BINARIES=${MODTYPE}_bin - -#is only U-Boot to be copied to RAM? -if [ "$UBOOT_RECOVERY" -ge 1 ] ; then - cd ${BINARIES} - # do a load chain of first loading SPL then u-boot.img - sudo ${LOCPATH}/imx_usb - exit -fi - -#sanity check for awk programs -AWKTEST=`echo 100000000 | awk -v min=100 -v f=10000 '{rootfs_size=$1+f*512;rootfs_size=int(rootfs_size/1024/985); print (rootfs_size+min) }'` || true -[ "${AWKTEST}x" = "204x" ] || { echo >&2 "Program awk not available. Aborting."; exit 1; } - -#sanity check for correct untared rootfs -DEV_OWNER=`ls -ld rootfs/dev | awk '{print $3}'` -if [ "${DEV_OWNER}x" != "rootx" ] -then - printf "rootfs/dev is not owned by root, but it should!\n" - printf "\033[1mPlease unpack the tarball with root rights.\033[0m\n" - printf "e.g. sudo tar xjvf Apalis_iMX6_LinuxImageV2.6_20160331.tar.bz2\n" - exit 1 -fi - -#sanity check for existence of U-Boot and kernel -[ -e ${BINARIES}/${U_BOOT_BINARY} ] || { echo "${BINARIES}/${U_BOOT_BINARY} does not exist"; exit 1; } -[ -e ${BINARIES}/${SPL_BINARY} ] || { echo "${BINARIES}/${SPL_BINARY} does not exist"; exit 1; } -[ -e ${BINARIES}/${KERNEL_IMAGETYPE} ] || { echo "${BINARIES}/${KERNEL_IMAGETYPE} does not exist"; exit 1; } - -#Sanity check for some programs. Some distros have fs tools only in root's path -MCOPY=`command -v mcopy` || { echo >&2 "Program mcopy not available. Aborting."; exit 1; } -PARTED=`command -v parted` || PARTED=`sudo -s command -v parted` || { echo >&2 "Program parted not available. Aborting."; exit 1; } -MKFSVFAT=`command -v mkfs.fat` || MKFSVFAT=`sudo -s command -v mkfs.fat` || { echo >&2 "Program mkfs.fat not available. Aborting."; exit 1; } -MKFSEXT4=`command -v mkfs.ext4` || MKFSEXT4=`sudo -s command -v mkfs.ext4` || { echo >&2 "Program mkfs.ext4 not available. Aborting."; exit 1; } -dd --help >/dev/null 2>&1 || { echo >&2 "Program dd not available. Aborting."; exit 1; } - -#Install trap to write a sensible message in case any of the commands below -#exit premature... -trap '{ printf "\033[31mScript aborted unexpectedly...\033[0m\n"; }' EXIT - -#make the directory with the outputfiles writable -sudo chown $USER: ${BINARIES} - -#make a file with the used versions for U-Boot, kernel and rootfs -sudo touch ${BINARIES}/versions.txt -sudo chmod ugo+w ${BINARIES}/versions.txt -echo "Component Versions" > ${BINARIES}/versions.txt -basename "`readlink -e ${BINARIES}/${U_BOOT_BINARY}`" >> ${BINARIES}/versions.txt -basename "`readlink -e ${BINARIES}/${SPL_BINARY}`" >> ${BINARIES}/versions.txt -basename "`readlink -e ${BINARIES}/${KERNEL_IMAGETYPE}`" >> ${BINARIES}/versions.txt -ROOTFSVERSION=`grep -i imx6 rootfs/etc/issue || echo "Version Unknown"` -echo "Rootfs ${ROOTFSVERSION}" >> ${BINARIES}/versions.txt - -#create subdirectory for this module type -sudo mkdir -p "$OUT_DIR" - -# The eMMC layout used is: -# -# boot area partition 1 aka primary eMMC boot sector: -# with U-Boot boot loader and the U-Boot environment before the configblock at -# the end of that boot area partition -# -# boot area partition 2 aka secondary eMMC boot sector: -# reserved -# -# user area aka general purpose eMMC region: -# -# 0 -> IMAGE_ROOTFS_ALIGNMENT - reserved (not partitioned) -# IMAGE_ROOTFS_ALIGNMENT -> BOOT_SPACE - kernel and other data -# BOOT_SPACE -> SDIMG_SIZE - rootfs -# -# 4MiB 16MiB SDIMG_ROOTFS -# <-----------------------> <----------> <----------------------> -# ------------------------ ------------ ------------------------ -# | IMAGE_ROOTFS_ALIGNMENT | BOOT_SPACE | ROOTFS_SIZE | -# ------------------------ ------------ ------------------------ -# ^ ^ ^ ^ -# | | | | -# 0 4MiB 4MiB + 16MiB EMMC_SIZE - - -# Boot partition [in sectors of 512] -BOOT_START=$(expr 4096 \* 2) -# Rootfs partition [in sectors of 512] -ROOTFS_START=$(expr 20480 \* 2) -# Boot partition volume id -BOOTDD_VOLUME_ID="boot" - -echo "" -echo "Creating MBR file and do the partitioning" -# Initialize a sparse file -dd if=/dev/zero of=${BINARIES}/mbr.bin bs=512 count=0 seek=${EMMC_SIZE} -${PARTED} -s ${BINARIES}/mbr.bin mklabel msdos -${PARTED} -a none -s ${BINARIES}/mbr.bin unit s mkpart primary fat32 ${BOOT_START} $(expr ${ROOTFS_START} - 1 ) -# the partition spans to the end of the disk, even though the fs size will be smaller -# on the target the fs is then grown to the full size -${PARTED} -a none -s ${BINARIES}/mbr.bin unit s mkpart primary ext4 ${ROOTFS_START} $(expr ${EMMC_SIZE} \- ${ROOTFS_START} \- 1) -${PARTED} -s ${BINARIES}/mbr.bin unit s print -# get the size of the VFAT partition -BOOT_BLOCKS=$(LC_ALL=C ${PARTED} -s ${BINARIES}/mbr.bin unit b print \ - | awk '/ 1 / { print int(substr($4, 1, length($4 -1)) / 1024) }') -# now crop the file to only the MBR size -IMG_SIZE=512 -truncate -s $IMG_SIZE ${BINARIES}/mbr.bin - - -echo "" -echo "Creating VFAT partition image with the kernel" -rm -f ${BINARIES}/boot.vfat -${MKFSVFAT} -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${BINARIES}/boot.vfat $BOOT_BLOCKS -export MTOOLS_SKIP_CHECK=1 -mcopy -i ${BINARIES}/boot.vfat -s ${BINARIES}/${KERNEL_IMAGETYPE} ::/${KERNEL_IMAGETYPE} - -# Copy device tree file -COPIED=false -if test -n "${KERNEL_DEVICETREE}"; then - for DTB_FILE in ${KERNEL_DEVICETREE}; do - if [ -e "${BINARIES}/${DTB_FILE}" ]; then - mcopy -i ${BINARIES}/boot.vfat -s ${BINARIES}/${DTB_FILE} ::/${DTB_FILE} - #copy also to out_dir - sudo cp ${BINARIES}/${DTB_FILE} "$OUT_DIR/" - COPIED=true - fi - done - [ $COPIED = true ] || { echo "Did not find the devicetrees from KERNEL_DEVICETREE, ${KERNEL_DEVICETREE}. Aborting."; exit 1; } -fi - -echo "" -echo "Creating rootfs partition image" -#make the filesystem size size(rootfs used + MIN_PARTITION_FREE_SIZE) -#add about 4% to the rootfs to account for fs overhead. (/1024/985 instead of /1024/1024). -#add 512 bytes per file to account for small files -#(resize it later on target to fill the size of the partition it lives in) -NUMBER_OF_FILES=`sudo find ${ROOTFSPATH} | wc -l` -EXT_SIZE=`sudo du -DsB1 ${ROOTFSPATH} | awk -v min=$MIN_PARTITION_FREE_SIZE -v f=${NUMBER_OF_FILES} \ - '{rootfs_size=$1+f*512;rootfs_size=int(rootfs_size/1024/985); print (rootfs_size+min) }'` -rm -f ${BINARIES}/${IMAGEFILE} -sudo $LOCPATH/genext4fs.sh -d rootfs -b ${EXT_SIZE} ${BINARIES}/${IMAGEFILE} || exit 1 - - -#copy to $OUT_DIR -sudo cp ${BINARIES}/${U_BOOT_BINARY} ${BINARIES}/${SPL_BINARY} ${BINARIES}/${KERNEL_IMAGETYPE} ${BINARIES}/mbr.bin \ - ${BINARIES}/boot.vfat ${BINARIES}/flash*.img ${BINARIES}/versions.txt "$OUT_DIR" -sudo cp ${BINARIES}/fwd_blk.img "$OUT_DIR/../flash_blk.img" -sudo cp ${BINARIES}/fwd_eth.img "$OUT_DIR/../flash_eth.img" -sudo cp ${BINARIES}/fwd_mmc.img "$OUT_DIR/../flash_mmc.img" - -if [ "$SPLIT" -ge 1 ] ; then -sudo split -a 3 -b `expr 64 \* 1024 \* 1024` --numeric-suffixes=100 ${BINARIES}/${IMAGEFILE} "$OUT_DIR/root.ext4-" -fi - -#cleanup intermediate files -sudo rm ${BINARIES}/mbr.bin ${BINARIES}/boot.vfat ${BINARIES}/${IMAGEFILE} ${BINARIES}/versions.txt -sync - -#Remove trap and report success! -trap - EXIT -printf "\033[32mSuccessfully copied data to target folder.\033[0m\n\n" - -Flash -- cgit v1.2.3