From d23222a96caeca5f83d22ffd55e210da30eaa379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Fri, 23 Nov 2018 10:33:24 +0100 Subject: imx6: Add support for Toradex Apalis family of CoMs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch adds support for the following computer on modules (CoM) from Toradex[A]: Apalis iMX6 Quad 2GB IT - i.MX 6Quad 800MHz, 2GB DDR3, 4GB eMMC -40° to +85° C Temp Apalis iMX6 Quad 1GB - i.MX 6Quad 1GHz, 1GB DDR3, 4GB eMMC 0° to +70° C Temp Apalis iMX6 Dual 1GB IT - i.MX 6Dual 800MHz, 1GB DDR3, 4GB eMMC -40° to +85° C Temp Apalis iMX6 Dual 512MB - i.MX 6Dual 1GHz, 512MB DDR3, 4GB eMMC 0° to +70° C Temp I've developed and tested it on Quad 2GB IT v1.1A and Dual 512MB v1.1A CoMs, using Ixora[B] carrier board v1.0A, but it should hopefuly work on Eval[C] board as well. A. https://www.toradex.com/computer-on-modules/apalis-arm-family/nxp-freescale-imx-6 B. https://www.toradex.com/products/carrier-board/ixora-carrier-board C. https://www.toradex.com/products/carrier-board/apalis-evaluation-board Flashing/recovery instructions: 1. Download and compile imx_loader for OpenWrt from https://github.com/ynezz/imx_loader 2. Enter recovery mode as desribed in https://developer.toradex.com/knowledge-base/imx-recovery-mode 3. Connect board via USB to the host computer, check that it's connected by lsusb: 15a2:0054 Freescale Semiconductor, Inc. i.MX 6Dual/6Quad SystemOnChip in RecoveryMode 4. Copy following OpenWrt images to imx_loader directory: SPL u-boot.img u-boot-with-spl.imx openwrt-imx6-apalis-recovery.scr openwrt-imx6-apalis-squashfs.combined.bin 5. Run imx_usb in imx_loader directory Signed-off-by: Petr Štetiar --- target/linux/imx6/base-files/lib/imx6.sh | 36 +++++++++++++++++ .../imx6/base-files/lib/preinit/79_move_config | 20 +++++++++ .../linux/imx6/base-files/lib/upgrade/platform.sh | 47 ++++++++++++++++++++++ 3 files changed, 103 insertions(+) create mode 100644 target/linux/imx6/base-files/lib/preinit/79_move_config (limited to 'target/linux/imx6/base-files') diff --git a/target/linux/imx6/base-files/lib/imx6.sh b/target/linux/imx6/base-files/lib/imx6.sh index 1bf1439523..68caaff15f 100755 --- a/target/linux/imx6/base-files/lib/imx6.sh +++ b/target/linux/imx6/base-files/lib/imx6.sh @@ -6,6 +6,33 @@ IMX6_BOARD_NAME= IMX6_MODEL= +rootpartuuid() { + local cmdline=$(cat /proc/cmdline) + local bootpart=${cmdline##*root=} + bootpart=${bootpart%% *} + local uuid=${bootpart#PARTUUID=} + echo ${uuid%-02} +} + +bootdev_from_uuid() { + blkid | grep "PTUUID=\"$(rootpartuuid)\"" | cut -d : -f1 +} + +bootpart_from_uuid() { + blkid | grep $(rootpartuuid)-01 | cut -d : -f1 +} + +rootpart_from_uuid() { + blkid | grep $(rootpartuuid)-02 | cut -d : -f1 +} + +apalis_mount_boot() { + mkdir -p /boot + [ -f /boot/uImage ] || { + mount -o rw,noatime $(bootpart_from_uuid) /boot > /dev/null + } +} + imx6_board_detect() { local machine local name @@ -59,6 +86,15 @@ imx6_board_detect() { name="cubox-i" ;; + "Toradex Apalis iMX6Q/D Module on Ixora Carrier Board" |\ + "Toradex Apalis iMX6Q/D Module on Ixora Carrier Board V1.1") + name="apalis,ixora" + ;; + + "Toradex Apalis iMX6Q/D Module on Apalis Evaluation Board") + name="apalis,eval" + ;; + "Wandboard i.MX6 Dual Lite Board") name="wandboard" ;; diff --git a/target/linux/imx6/base-files/lib/preinit/79_move_config b/target/linux/imx6/base-files/lib/preinit/79_move_config new file mode 100644 index 0000000000..6b66fbd42d --- /dev/null +++ b/target/linux/imx6/base-files/lib/preinit/79_move_config @@ -0,0 +1,20 @@ +#!/bin/sh + +. /lib/imx6.sh +. /lib/functions.sh + +move_config() { + local board=$(board_name) + + case "$board" in + apalis*) + if [ -b $(bootpart_from_uuid) ]; then + apalis_mount_boot + [ -f /boot/sysupgrade.tgz ] && mv -f /boot/sysupgrade.tgz / + umount /boot + fi + ;; + esac +} + +boot_hook_add preinit_mount_root move_config diff --git a/target/linux/imx6/base-files/lib/upgrade/platform.sh b/target/linux/imx6/base-files/lib/upgrade/platform.sh index ab52291109..2d76b6b4af 100755 --- a/target/linux/imx6/base-files/lib/upgrade/platform.sh +++ b/target/linux/imx6/base-files/lib/upgrade/platform.sh @@ -2,10 +2,44 @@ # Copyright (C) 2010-2015 OpenWrt.org # +. /lib/imx6.sh + +RAMFS_COPY_BIN='blkid' + +enable_image_metadata_check() { + case "$(board_name)" in + apalis*) + REQUIRE_IMAGE_METADATA=1 + ;; + esac +} +enable_image_metadata_check + +apalis_copy_config() { + apalis_mount_boot + cp -af "$CONF_TAR" /boot/ + sync + umount /boot +} + +apalis_do_upgrade() { + local board_name=$(board_name) + board_name=${board_name/,/_} + + apalis_mount_boot + get_image "$1" | tar Oxf - sysupgrade-${board_name}/kernel > /boot/uImage + get_image "$1" | tar Oxf - sysupgrade-${board_name}/root > $(rootpart_from_uuid) + sync + umount /boot +} + platform_check_image() { local board=$(board_name) case "$board" in + apalis*) + return 0 + ;; *gw5*) nand_do_platform_check $board $1 return $?; @@ -20,8 +54,21 @@ platform_do_upgrade() { local board=$(board_name) case "$board" in + apalis*) + apalis_do_upgrade "$1" + ;; *gw5*) nand_do_upgrade "$1" ;; esac } + +platform_copy_config() { + local board=$(board_name) + + case "$board" in + apalis*) + apalis_copy_config + ;; + esac +} -- cgit v1.2.3