Initial commit

target/linux/layerscape/base-files/lib/preinit/02_sysinfo_fixup

@@ -0,0 +1,13 @@
+do_sysinfo_layerscape_fixup() {
+	[ -e /tmp/sysinfo/board_name ] || return
+	[ -e /proc/cmdline ] || return
+	cmdline=$(strings /proc/cmdline)
+	case "${cmdline}" in
+		*root=/dev/mmcblk*)
+			board="$(strings /tmp/sysinfo/board_name)-sdboot"
+			echo ${board} > /tmp/sysinfo/board_name
+		;;
+	esac
+}
+
+boot_hook_add preinit_main do_sysinfo_layerscape_fixup

target/linux/layerscape/base-files/lib/preinit/05_layerscape_reorder_eth

@@ -0,0 +1,26 @@
+reorder_layerscape_interfaces() {
+	if [ ! -f /tmp/sysinfo/board_name ]; then
+		echo "No board name found, not doing reorder_layerscape_interfaces"
+		return 0
+	fi
+
+	board=$(cat /tmp/sysinfo/board_name)
+	case "$board" in
+	traverse,ls1043v|\
+	traverse,ls1043s)
+
+		# Reorder ethernet interfaces to match the physical order
+		ip link set eth2 name fm1-mac3
+		ip link set eth4 name eth2
+		ip link set eth3 name fm1-mac4
+		ip link set eth5 name eth3
+		ip link set fm1-mac3 name eth4
+		ip link set fm1-mac4 name eth5
+		;;
+	default)
+		echo "Unknown board $board"
+		;;
+	esac
+}
+
+boot_hook_add preinit_main reorder_layerscape_interfaces

target/linux/layerscape/base-files/lib/preinit/79_move_config

@@ -0,0 +1,27 @@
+. /lib/functions.sh
+. /lib/upgrade/common.sh
+
+BOOTPART=/dev/mmcblk0p1
+
+move_config() {
+	local board=$(board_name)
+
+	case "$board" in
+	fsl,ls1012a-frwy-sdboot | \
+	fsl,ls1021a-iot-sdboot | \
+	fsl,ls1021a-twr-sdboot | \
+	fsl,ls1043a-rdb-sdboot | \
+	fsl,ls1046a-frwy-sdboot | \
+	fsl,ls1046a-rdb-sdboot | \
+	fsl,ls1088a-rdb-sdboot)
+		if [ -b $BOOTPART ]; then
+			mkdir -p /boot
+			mount -t ext4 -o rw,noatime $BOOTPART /boot 2>&1
+			[ -f "/boot/$BACKUP_FILE" ] && mv -f "/boot/$BACKUP_FILE" /
+			umount /boot
+		fi
+		;;
+	esac
+}
+
+boot_hook_add preinit_mount_root move_config

target/linux/layerscape/base-files/lib/upgrade/platform.sh

@@ -0,0 +1,157 @@
+#
+# Copyright 2015-2019 Traverse Technologies
+# Copyright 2020 NXP
+#
+
+RAMFS_COPY_BIN="/usr/sbin/fw_printenv /usr/sbin/fw_setenv /usr/sbin/ubinfo /bin/echo"
+RAMFS_COPY_DATA="/etc/fw_env.config /var/lock/fw_printenv.lock"
+
+REQUIRE_IMAGE_METADATA=1
+
+platform_do_upgrade_sdboot() {
+	local diskdev partdev parttype=ext4
+	local tar_file="$1"
+	local board_dir=$(tar tf $tar_file | grep -m 1 '^sysupgrade-.*/$')
+	board_dir=${board_dir%/}
+
+	export_bootdevice && export_partdevice diskdev 0 || {
+		echo "Unable to determine upgrade device"
+		return 1
+	}
+
+	if export_partdevice partdev 1; then
+		mount -t $parttype -o rw,noatime "/dev/$partdev" /mnt 2>&1
+		echo "Writing kernel..."
+		tar xf $tar_file ${board_dir}/kernel -O > /mnt/fitImage
+		umount /mnt
+	fi
+
+	echo "Erasing rootfs..."
+	dd if=/dev/zero of=/dev/mmcblk0p2 bs=1M > /dev/null 2>&1
+	echo "Writing rootfs..."
+	tar xf $tar_file ${board_dir}/root -O  | dd of=/dev/mmcblk0p2 bs=512k > /dev/null 2>&1
+
+}
+platform_do_upgrade_traverse_nandubi() {
+	bootsys=$(fw_printenv bootsys | awk -F= '{{print $2}}')
+	newbootsys=2
+	if [ "$bootsys" -eq "2" ]; then
+		newbootsys=1
+	fi
+
+	# If nand_do_upgrade succeeds, we don't have an opportunity to add any actions of
+	# our own, so do it here and set back on failure
+	echo "Setting bootsys to #${newbootsys}"
+	fw_setenv bootsys $newbootsys
+	CI_UBIPART="nandubi"
+	CI_KERNPART="kernel${newbootsys}"
+	CI_ROOTPART="rootfs${newbootsys}"
+	nand_do_upgrade "$1" || (echo "Upgrade failed, setting bootsys ${bootsys}" && fw_setenv bootsys $bootsys)
+
+}
+platform_copy_config_sdboot() {
+	local diskdev partdev parttype=ext4
+
+	export_bootdevice && export_partdevice diskdev 0 || {
+		echo "Unable to determine upgrade device"
+		return 1
+	}
+
+	if export_partdevice partdev 1; then
+		mount -t $parttype -o rw,noatime "/dev/$partdev" /mnt 2>&1
+		echo "Saving config backup..."
+		cp -af "$UPGRADE_BACKUP" "/mnt/$BACKUP_FILE"
+		umount /mnt
+	fi
+}
+platform_copy_config() {
+	local board=$(board_name)
+
+	case "$board" in
+	fsl,ls1012a-frwy-sdboot | \
+	fsl,ls1021a-iot-sdboot | \
+	fsl,ls1021a-twr-sdboot | \
+	fsl,ls1043a-rdb-sdboot | \
+	fsl,ls1046a-frwy-sdboot | \
+	fsl,ls1046a-rdb-sdboot | \
+	fsl,ls1088a-rdb-sdboot | \
+	fsl,lx2160a-rdb-sdboot)
+		platform_copy_config_sdboot
+		;;
+	esac
+}
+platform_check_image() {
+	local board=$(board_name)
+
+	case "$board" in
+	traverse,ls1043v | \
+	traverse,ls1043s)
+		nand_do_platform_check "traverse-ls1043" $1
+		return $?
+		;;
+	fsl,ls1012a-frdm | \
+	fsl,ls1012a-frwy-sdboot | \
+	fsl,ls1012a-rdb | \
+	fsl,ls1021a-iot-sdboot | \
+	fsl,ls1021a-twr | \
+	fsl,ls1021a-twr-sdboot | \
+	fsl,ls1043a-rdb | \
+	fsl,ls1043a-rdb-sdboot | \
+	fsl,ls1046a-frwy | \
+	fsl,ls1046a-frwy-sdboot | \
+	fsl,ls1046a-rdb | \
+	fsl,ls1046a-rdb-sdboot | \
+	fsl,ls1088a-rdb | \
+	fsl,ls1088a-rdb-sdboot | \
+	fsl,ls2088a-rdb | \
+	fsl,lx2160a-rdb | \
+	fsl,lx2160a-rdb-sdboot)
+		return 0
+		;;
+	*)
+		echo "Sysupgrade is not currently supported on $board"
+		;;
+	esac
+
+	return 1
+}
+platform_do_upgrade() {
+	local board=$(board_name)
+
+	# Force the creation of fw_printenv.lock
+	mkdir -p /var/lock
+	touch /var/lock/fw_printenv.lock
+
+	case "$board" in
+	traverse,ls1043v | \
+	traverse,ls1043s)
+		platform_do_upgrade_traverse_nandubi "$1"
+		;;
+	fsl,ls1012a-frdm | \
+	fsl,ls1012a-rdb | \
+	fsl,ls1021a-twr | \
+	fsl,ls1043a-rdb | \
+	fsl,ls1046a-frwy | \
+	fsl,ls1046a-rdb | \
+	fsl,ls1088a-rdb | \
+	fsl,ls2088a-rdb | \
+	fsl,lx2160a-rdb)
+		PART_NAME=firmware
+		default_do_upgrade "$1"
+		;;
+	fsl,ls1012a-frwy-sdboot | \
+	fsl,ls1021a-iot-sdboot | \
+	fsl,ls1021a-twr-sdboot | \
+	fsl,ls1043a-rdb-sdboot | \
+	fsl,ls1046a-frwy-sdboot | \
+	fsl,ls1046a-rdb-sdboot | \
+	fsl,ls1088a-rdb-sdboot | \
+	fsl,lx2160a-rdb-sdboot)
+		platform_do_upgrade_sdboot "$1"
+		return 0
+		;;
+	*)
+		echo "Sysupgrade is not currently supported on $board"
+		;;
+	esac
+}