From f00cfb291022fdc09366574ac4918c69af56ff7f Mon Sep 17 00:00:00 2001 From: John Klug Date: Wed, 6 Oct 2021 08:31:11 -0500 Subject: Move gps0 symlink to UDEV --- recipes-core/udev/eudev/mtcdt/mtcdt.rules | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/recipes-core/udev/eudev/mtcdt/mtcdt.rules b/recipes-core/udev/eudev/mtcdt/mtcdt.rules index 5d528e6..fc510d9 100644 --- a/recipes-core/udev/eudev/mtcdt/mtcdt.rules +++ b/recipes-core/udev/eudev/mtcdt/mtcdt.rules @@ -1,6 +1,5 @@ ACTION=="remove", GOTO="mlinux_end" SUBSYSTEM!="tty", GOTO="mlinux_end" -KERNEL!="ttyXRUSB[0-9]*", GOTO="mlinux_end" SUBSYSTEMS=="usb", ENV{ID_IFACE}="$attr{bInterfaceNumber}" ENV{ID_IFACE}=="", GOTO="mlinux_end" @@ -8,7 +7,10 @@ ENV{ID_IFACE}=="", GOTO="mlinux_end" # Accessory Ports ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1412", ENV{ID_IFACE}=="00", SYMLINK+="ttyAP1" ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1414", ENV{ID_IFACE}=="00", SYMLINK+="ttyAP1" +ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6011", ENV{ID_IFACE}=="00", SYMLINK+="ttyAP1" ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1412", ENV{ID_IFACE}=="02", SYMLINK+="ttyAP2" ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1414", ENV{ID_IFACE}=="02", SYMLINK+="ttyAP2" - -LABEL="mlinux_end" +ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6011", ENV{ID_IFACE}=="02", SYMLINK+="ttyAP2" +ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1412", ENV{ID_IFACE}=="04", SYMLINK+="gps0" +ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1414", ENV{ID_IFACE}=="04", SYMLINK+="gps0" +ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6011", ENV{ID_IFACE}=="04", SYMLINK+="gps0" -- cgit v1.2.3 From 77df2beca2646db49b78ba3e1d28e6278e9e6711 Mon Sep 17 00:00:00 2001 From: John Klug Date: Mon, 18 Oct 2021 14:47:57 -0500 Subject: Add U-Blox USB Device --- recipes-core/udev/eudev/mtcdt/mtcdt.rules | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-core/udev/eudev/mtcdt/mtcdt.rules b/recipes-core/udev/eudev/mtcdt/mtcdt.rules index fc510d9..c1dc276 100644 --- a/recipes-core/udev/eudev/mtcdt/mtcdt.rules +++ b/recipes-core/udev/eudev/mtcdt/mtcdt.rules @@ -14,3 +14,4 @@ ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6011", ENV{ID_IFACE}=="02", SYMLINK+ ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1412", ENV{ID_IFACE}=="04", SYMLINK+="gps0" ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1414", ENV{ID_IFACE}=="04", SYMLINK+="gps0" ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6011", ENV{ID_IFACE}=="04", SYMLINK+="gps0" +ATTRS{idVendor}=="1546", ATTRS{idProduct}=="01a8", ENV{ID_IFACE}=="00", SYMLINK+="gps0" -- cgit v1.2.3 From a6b9cbf045b249635f234fcd7da370cb83a6e152 Mon Sep 17 00:00:00 2001 From: John Klug Date: Thu, 4 Nov 2021 02:46:27 -0500 Subject: Preserve mlinux_end --- recipes-core/udev/eudev/mtcdt/mtcdt.rules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-core/udev/eudev/mtcdt/mtcdt.rules b/recipes-core/udev/eudev/mtcdt/mtcdt.rules index c1dc276..a9af18d 100644 --- a/recipes-core/udev/eudev/mtcdt/mtcdt.rules +++ b/recipes-core/udev/eudev/mtcdt/mtcdt.rules @@ -15,3 +15,5 @@ ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1412", ENV{ID_IFACE}=="04", SYMLINK+ ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1414", ENV{ID_IFACE}=="04", SYMLINK+="gps0" ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6011", ENV{ID_IFACE}=="04", SYMLINK+="gps0" ATTRS{idVendor}=="1546", ATTRS{idProduct}=="01a8", ENV{ID_IFACE}=="00", SYMLINK+="gps0" + +LABEL="mlinux_end" -- cgit v1.2.3 From 2a2c1bfc8961f2e18c3e6bea931ee3ca18017744 Mon Sep 17 00:00:00 2001 From: John Klug Date: Mon, 8 Nov 2021 12:32:50 -0600 Subject: Remove FTDI USB, and add Atmel Serial --- recipes-core/udev/eudev/mtcdt/mtcdt-atmel-serial.rules | 12 ++++++++++++ recipes-core/udev/eudev/mtcdt/mtcdt.rules | 3 --- recipes-core/udev/eudev_%.bbappend | 2 ++ 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 recipes-core/udev/eudev/mtcdt/mtcdt-atmel-serial.rules diff --git a/recipes-core/udev/eudev/mtcdt/mtcdt-atmel-serial.rules b/recipes-core/udev/eudev/mtcdt/mtcdt-atmel-serial.rules new file mode 100644 index 0000000..741e533 --- /dev/null +++ b/recipes-core/udev/eudev/mtcdt/mtcdt-atmel-serial.rules @@ -0,0 +1,12 @@ +# Rules for Atmel Serial on MTCDT-0.2 +# These devices will not be present without +# loading an overlay. +ACTION=="remove", GOTO="mlinux_end" +SUBSYSTEM!="tty", GOTO="mlinux_end" + +# Accessory Ports +ATTRS{iomem_base}=="0xF8040000", SYMLINK+="gps0" +ATTRS{iomem_base}=="0xF8020000", SYMLINK+="ttyAP1" +ATTRS{iomem_base}=="0xF8028000", SYMLINK+="ttyAP2" + +LABEL="mlinux_end" diff --git a/recipes-core/udev/eudev/mtcdt/mtcdt.rules b/recipes-core/udev/eudev/mtcdt/mtcdt.rules index a9af18d..7436669 100644 --- a/recipes-core/udev/eudev/mtcdt/mtcdt.rules +++ b/recipes-core/udev/eudev/mtcdt/mtcdt.rules @@ -7,13 +7,10 @@ ENV{ID_IFACE}=="", GOTO="mlinux_end" # Accessory Ports ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1412", ENV{ID_IFACE}=="00", SYMLINK+="ttyAP1" ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1414", ENV{ID_IFACE}=="00", SYMLINK+="ttyAP1" -ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6011", ENV{ID_IFACE}=="00", SYMLINK+="ttyAP1" ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1412", ENV{ID_IFACE}=="02", SYMLINK+="ttyAP2" ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1414", ENV{ID_IFACE}=="02", SYMLINK+="ttyAP2" -ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6011", ENV{ID_IFACE}=="02", SYMLINK+="ttyAP2" ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1412", ENV{ID_IFACE}=="04", SYMLINK+="gps0" ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1414", ENV{ID_IFACE}=="04", SYMLINK+="gps0" -ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6011", ENV{ID_IFACE}=="04", SYMLINK+="gps0" ATTRS{idVendor}=="1546", ATTRS{idProduct}=="01a8", ENV{ID_IFACE}=="00", SYMLINK+="gps0" LABEL="mlinux_end" diff --git a/recipes-core/udev/eudev_%.bbappend b/recipes-core/udev/eudev_%.bbappend index 1a3bb30..e431ab0 100644 --- a/recipes-core/udev/eudev_%.bbappend +++ b/recipes-core/udev/eudev_%.bbappend @@ -4,8 +4,10 @@ PR .= ".mlinux8" SRC_URI_append_mtcdt = " \ file://accessory_ethernet.rules \ + file://mtcdt-atmel-serial.rules \ " do_install_append_mtcdt() { install -m 644 ${WORKDIR}/accessory_ethernet.rules ${D}${sysconfdir}/udev/rules.d/ + install -m 644 ${WORKDIR}/mtcdt-atmel-serial.rules ${D}${sysconfdir}/udev/rules.d/ } -- cgit v1.2.3 From 473d2079064cdd361a7510b0f0d19bbb9ab17a5a Mon Sep 17 00:00:00 2001 From: John Klug Date: Wed, 10 Nov 2021 05:47:43 -0600 Subject: gps0 on MTCDT-0.2 will be USB 1546:01a8 --- recipes-core/udev/eudev/mtcdt/mtcdt-atmel-serial.rules | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes-core/udev/eudev/mtcdt/mtcdt-atmel-serial.rules b/recipes-core/udev/eudev/mtcdt/mtcdt-atmel-serial.rules index 741e533..24d2148 100644 --- a/recipes-core/udev/eudev/mtcdt/mtcdt-atmel-serial.rules +++ b/recipes-core/udev/eudev/mtcdt/mtcdt-atmel-serial.rules @@ -5,7 +5,9 @@ ACTION=="remove", GOTO="mlinux_end" SUBSYSTEM!="tty", GOTO="mlinux_end" # Accessory Ports -ATTRS{iomem_base}=="0xF8040000", SYMLINK+="gps0" +# +# gps0 on MTCDT-0.2 will be USB 1546:01a8 +# ATTRS{iomem_base}=="0xF8040000", SYMLINK+="gps0" ATTRS{iomem_base}=="0xF8020000", SYMLINK+="ttyAP1" ATTRS{iomem_base}=="0xF8028000", SYMLINK+="ttyAP2" -- cgit v1.2.3 From 09f86010fa32f39906800c694447e892a5e5ce05 Mon Sep 17 00:00:00 2001 From: John Klug Date: Wed, 27 Oct 2021 11:35:14 -0500 Subject: mlinux-firmware-upgrade with factory reset --- .../mlinux-scripts/mlinux-firmware-upgrade | 66 ++++++++++++++++++++-- .../mlinux-scripts/mlinux-scripts_%.bbappend | 2 +- 2 files changed, 62 insertions(+), 6 deletions(-) diff --git a/recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade b/recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade index a377309..a6e6d68 100755 --- a/recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade +++ b/recipes-core/mlinux-scripts/mlinux-scripts/mlinux-firmware-upgrade @@ -1,9 +1,41 @@ #!/bin/bash dofile=/var/volatile/do_flash_upgrade +dofactoryreset=0 +id=$(id -u) +function usage { + echo "Usage: $0 -f upgrade.bin" + echo " \"-f\" factory reset" + echo " \"-h\" help" + exit 1 +} +if (($(id -u) != 0)) ; then + echo "You must be root to do a flash upgrade" + exit 1 +fi +while getopts "hf" arg; do + case $arg in + h) + usage + exit 1 + ;; + f) + mtd=$(cat /proc/mtd) + if ! [[ $mtd =~ at91bootstrap ]] ; then + echo Factory reset option is only supported on Atmel devices + exit 1 + fi + dofactoryreset=1 + ;; + *) + usage + ;; + esac +done +shift $((OPTIND-1)) + if [ $# != 1 ]; then - echo "Usage: $0 upgrade.bin" - exit 1 + usage fi set -e @@ -45,6 +77,23 @@ for (( i = 0; i < ${#files[@]}; i++ )); do done if (( $tobeflashed )); then + if ((dofactoryreset == 1)) ; then + for name in "u-Boot Config" "u-Boot Redundant Config" ; do + part=$(echo "$mtd" | grep "$name" | sed 's/:.*//') + if [[ $part =~ ^mtd[0-9] ]] ; then + flash_erase /dev/${part} 0 0 + fi + done + fuser -mk /var/config || true + for name in "User data" "Config" ; do + part=$(echo "$mtd" | grep "\"$name\"" | sed 's/:.*//') + num=$(echo "$part" | sed 's/mtd//') + if [[ $part =~ ^mtd[0-9] ]] ; then + umount -l /dev/mtdblock${num} || true + flash_erase -j /dev/${part} 0 0 + fi + done + fi mkdir -p /var/volatile/flash-upgrade mv -f $upgrade /var/volatile/flash-upgrade/upgrade.bin touch "${dofile}" @@ -59,9 +108,16 @@ if (( $tobeflashed )); then logger -s -t firmware_upgrade "Cannot set ownership of ${dofile} to root" exit 1 fi - logger -s -t firmware_upgrade "Rebooting" - sleep 1 - reboot + if ((dofactoryreset == 1)) ; then + logger -s -t firmware_upgrade "Power Off" + sleep 1 + poweroff + else + logger -s -t firmware_upgrade "Rebooting" + sleep 1 + reboot + fi + # NOTREACHED exit 0 else logger -s -t firmware_upgrade "Nothing to be flashed!" diff --git a/recipes-core/mlinux-scripts/mlinux-scripts_%.bbappend b/recipes-core/mlinux-scripts/mlinux-scripts_%.bbappend index ecda287..39c0807 100644 --- a/recipes-core/mlinux-scripts/mlinux-scripts_%.bbappend +++ b/recipes-core/mlinux-scripts/mlinux-scripts_%.bbappend @@ -1,6 +1,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PR .= ".mlinux0" +PR .= ".mlinux1" SRC_URI += " \ file://mlinux-firmware-upgrade \ -- cgit v1.2.3 From b862d04c25657c8d75454c562861cbe182bd7be6 Mon Sep 17 00:00:00 2001 From: John Klug Date: Mon, 8 Nov 2021 05:46:23 -0600 Subject: Must have an overlay for MTCDT-0.2 --- recipes-core/images/mlinux-minimal-image.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-core/images/mlinux-minimal-image.bb b/recipes-core/images/mlinux-minimal-image.bb index 5427a68..3337b89 100644 --- a/recipes-core/images/mlinux-minimal-image.bb +++ b/recipes-core/images/mlinux-minimal-image.bb @@ -30,7 +30,9 @@ CORE_FEATURES_append = " \ CORE_FEATURES_append = " mtd-utils mtd-utils-jffs2 fstab-jffs2" +# All except old MTR CORE_FEATURES_append_mtcap = " mt-dt-overlay " +CORE_FEATURES_append_mtrv1 = " mt-dt-overlay " CORE_FEATURES_append_mtcdt = " mt-dt-overlay " NETWORKING_FEATURES = "ppp ppp-waitforresetfunc curl iproute2 \ -- cgit v1.2.3 From c16c15c3a03a6435457cfc305326eaf244710ed1 Mon Sep 17 00:00:00 2001 From: Andrii Pientsov Date: Thu, 23 Dec 2021 13:25:10 +0200 Subject: Fix udev serial rules for MTCDT devices. --- recipes-core/udev/eudev/mtcdt/mtcdt-atmel-serial.rules | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipes-core/udev/eudev/mtcdt/mtcdt-atmel-serial.rules b/recipes-core/udev/eudev/mtcdt/mtcdt-atmel-serial.rules index 24d2148..edf6626 100644 --- a/recipes-core/udev/eudev/mtcdt/mtcdt-atmel-serial.rules +++ b/recipes-core/udev/eudev/mtcdt/mtcdt-atmel-serial.rules @@ -5,9 +5,8 @@ ACTION=="remove", GOTO="mlinux_end" SUBSYSTEM!="tty", GOTO="mlinux_end" # Accessory Ports -# -# gps0 on MTCDT-0.2 will be USB 1546:01a8 -# ATTRS{iomem_base}=="0xF8040000", SYMLINK+="gps0" + +ATTRS{iomem_base}=="0xF8040000", SYMLINK+="gps0" ATTRS{iomem_base}=="0xF8020000", SYMLINK+="ttyAP1" ATTRS{iomem_base}=="0xF8028000", SYMLINK+="ttyAP2" -- cgit v1.2.3