[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-197-g0cdb23f1d

[Sébastien S. <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  0cdb23f1daeb371685c408327b1e93a62b34a20c (commit)
      from  43b8fbca7e7939e6ec5b0cf569b724af797128bd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0cdb23f1daeb371685c408327b1e93a62b34a20c
Author: Sébastien Szymanski <seb...@ar...>
Date:   Mon Jun 8 18:29:38 2020 +0200

    [BUILDROOT] post-{build,image}.sh: add OPOS8M{Mini,Nano} support

-----------------------------------------------------------------------

Summary of changes:
 buildroot/target/device/armadeus/rootfs/post_build.sh | 19 +++++++++++++++----
 .../device/armadeus/rootfs/post_image_creation.sh     | 10 +++++++---
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/buildroot/target/device/armadeus/rootfs/post_build.sh b/buildroot/target/device/armadeus/rootfs/post_build.sh
index f36a4b04c..48b244c87 100755
--- a/buildroot/target/device/armadeus/rootfs/post_build.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_build.sh
@@ -2,6 +2,9 @@
 #
 # Create custom directories and links of Armadeus rootfs
 #
+# arg1: BR target dir
+# arg2: board name
+# arg3: i.MX processor type
 
 if [ ! -d "$1" ]; then
 	echo "Target directory ($1) not valid !"
@@ -21,24 +24,30 @@ symlink_image()
 mkdir -p $1/boot
 ln -sfn . $1/boot/dtbs	# to keep compat with pre-6.0 APF6 U-Boots
 symlink_image $1/boot uImage $2-linux.bin
-if [ "$3" != "imx6ul" ]; then
+if [ "$3" != "imx6ul" ] && [ "$3" != "imx8mm" ] && [ "$3" != "imx8mn" ]; then
 	symlink_image $1/boot zImage $2-linux.bin
 else
 	if [ -f "$1/boot/zImage" ]; then
 		mv $1/boot/zImage $1/boot/$2-linux.bin
+	elif [ -f "$1/boot/Image" ]; then
+		mv $1/boot/Image $1/boot/$2-linux.bin
 	fi
 fi
 
 # !! Beware if using $2, because it can be changed for customers' BSP !!
 if [ "$3" != "imxl" ]; then
-	if [ "$3" != "imx6ul" ]; then
-		echo "APF"${3//[!0-9]/} > $1/etc/machine
-	else
+	if [ "$3" == "imx6ul" ]; then
 		if [ "$2" == "opos6ulnano" ]; then
 			echo "OPOS6ULNANO" > $1/etc/machine
                 else
 			echo "OPOS6UL" > $1/etc/machine
 		fi
+	elif [ "$3" == "imx8mm" ]; then
+		echo "OPOS8MMINI" > $1/etc/machine
+	elif [ "$3" == "imx8mn" ]; then
+		echo "OPOS8MNANO" > $1/etc/machine
+	else
+		echo "APF"${3//[!0-9]/} > $1/etc/machine
 	fi
 else
 	echo "APF9328" > $1/etc/machine
@@ -58,7 +67,9 @@ if [ "$3" == "imx6ul" ]; then
 			rm -rf "$firmware"
 		fi
 	done
+fi
 
+if [ "$3" == "imx6ul" ] || [ "$3" == "imx8mm" ] || [ "$3" == "imx8mn" ]; then
 	# Ask to mount HOME-DATA partition at each boot:
 	grep mmcblk0p3 $1/etc/fstab
 	if [ "$?" != "0" ]; then
diff --git a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
index 3758ceb96..2dc0c496d 100755
--- a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
@@ -35,14 +35,18 @@ if [ "$2" != "" ]; then
 	# linux
 	symlink_image $1 uImage $2-linux.bin
 	symlink_image $1 zImage $2-linux.bin
+	symlink_image $1 Image $2-linux.bin
 	symlink_image $1 $3-$2dev.dtb $2.dtb
 
 	# APF6
 	symlink_image $1 SPL $2-u-boot.spl
 	symlink_image $1 u-boot.img $2-u-boot.img
 
-	# OPOS6ULNANO
+	# OPOS6UL / OPOS6ULNANO
 	symlink_image $1 u-boot-dtb.img $2-u-boot.img
+
+	# OPOS8M{Mini,Nano}
+	symlink_image $1 u-boot.itb $2-u-boot.itb
 else
 	# Old BR compat
 	BOARD_NAME=`grep 'BR2_BOARD_NAME=' $BUILDROOT_CONFIG | cut -d = -f 2 | sed s/\"//g`
@@ -51,8 +55,8 @@ else
 	fi
 fi
 
-# if target uses ext4 for rootfs and is not an opos6ul,
-if [ -f "$1/rootfs.ext4" ] && [ "$3" != "imx6ul" ]; then
+# if target uses ext4 for rootfs and is not an opos6ul or an opos8m{mini,nano}
+if [ -f "$1/rootfs.ext4" ] && [ "$3" != "imx6ul" ] && [ "$3" != "imx8mm" ] && [ "$3" != "imx8mn" ]; then
 	# generate also boot.ext4:
 	rm -f $1/boot.ext4
 	$1/../host/sbin/mkfs.ext4 -L "BOOT" -r 1 -d $1/../target/boot/ $1/boot.ext4 "48M"


hooks/post-receive
-- 
armadeus