[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-416-ga1bc38495
Brought to you by:
sszy
|
From: sszy <ss...@us...> - 2024-06-05 13:08:07
|
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 a1bc38495ff43125c471b130175abb73ead555c8 (commit)
from 85f2b3c3c0e32dee16c83b1116579368951cd484 (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 a1bc38495ff43125c471b130175abb73ead555c8
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Jun 5 15:06:36 2024 +0200
[BUILDROOT] handle i.MX91 as well
-----------------------------------------------------------------------
Summary of changes:
buildroot/target/device/armadeus/Makefile.in | 2 ++
buildroot/target/device/armadeus/rootfs/post_build.sh | 6 ++++--
buildroot/target/device/armadeus/rootfs/post_image_creation.sh | 6 +++---
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/buildroot/target/device/armadeus/Makefile.in b/buildroot/target/device/armadeus/Makefile.in
index 2aa176892..0b9fc9e9a 100644
--- a/buildroot/target/device/armadeus/Makefile.in
+++ b/buildroot/target/device/armadeus/Makefile.in
@@ -15,6 +15,7 @@ ifneq ($(BR2_CPU_NAME), "imx6")
ifneq ($(BR2_CPU_NAME), "imx6ul")
ifneq ($(BR2_CPU_NAME), "imx8mm")
ifneq ($(BR2_CPU_NAME), "imx8mn")
+ifneq ($(BR2_CPU_NAME), "imx91")
ifneq ($(BR2_CPU_NAME), "imx93")
define UBOOT_UPDATE_CONFIG_HEADER
$(SED) "s,^#define CONFIG_BOARD_NAME.*,#define CONFIG_BOARD_NAME $(BOARD_NAME),g;"\
@@ -51,6 +52,7 @@ endef
UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_POST_INSTALL_IMAGES_ACTION
endif # BR2_CPU_NAME != imx93
+endif # BR2_CPU_NAME != imx91
endif # BR2_CPU_NAME != imx8mn
endif # BR2_CPU_NAME != imx8mm
endif # BR2_CPU_NAME != imx6ul
diff --git a/buildroot/target/device/armadeus/rootfs/post_build.sh b/buildroot/target/device/armadeus/rootfs/post_build.sh
index cac0dc52d..5396190a1 100755
--- a/buildroot/target/device/armadeus/rootfs/post_build.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_build.sh
@@ -24,7 +24,7 @@ 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" ] && [ "$3" != "imx8mm" ] && [ "$3" != "imx8mn" ] && [ "$3" != "imx93" ]; then
+if [ "$3" != "imx6ul" ] && [ "$3" != "imx8mm" ] && [ "$3" != "imx8mn" ] && [ "$3" != "imx93" ] && [ "$3" != "imx91" ]; then
symlink_image $1/boot zImage $2-linux.bin
else
if [ -f "$1/boot/zImage" ]; then
@@ -46,6 +46,8 @@ if [ "$3" != "imxl" ]; then
echo "OPOS8MM" > $1/etc/machine
elif [ "$3" == "imx8mn" ]; then
echo "OPOS8MN" > $1/etc/machine
+ elif [ "$3" == "imx91" ]; then
+ echo "OPOS91" > $1/etc/machine
elif [ "$3" == "imx93" ]; then
echo "OPOS93" > $1/etc/machine
else
@@ -60,7 +62,7 @@ if [ "$3" != "imx6" ]; then
rm -rf $1/etc/init.d/S30wifi
fi
-if [ "$3" == "imx6ul" ] || [ "$3" == "imx8mm" ] || [ "$3" == "imx8mn" ] || [ "$3" == "imx93" ]; then
+if [ "$3" == "imx6ul" ] || [ "$3" == "imx8mm" ] || [ "$3" == "imx8mn" ] || [ "$3" == "imx91" ] || [ "$3" == "imx93" ]; 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 6ec51a864..68b6e3cba 100755
--- a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
@@ -48,7 +48,7 @@ if [ "$2" != "" ]; then
# OPOS8M{Mini,Nano}
symlink_image $1 u-boot.itb $2-u-boot.itb
- # OPOS93
+ # OPOS9{1,3}
symlink_image $1 imx9-boot-sd.bin $2-u-boot.bin
else
# Old BR compat
@@ -58,8 +58,8 @@ else
fi
fi
-# if target uses ext4 for rootfs and is not an opos6ul, an opos8m{mini,nano} or an opos93
-if [ -f "$1/rootfs.ext4" ] && [ "$3" != "imx6ul" ] && [ "$3" != "imx8mm" ] && [ "$3" != "imx8mn" ] && [ "$3" != "imx93" ]; then
+# if target uses ext4 for rootfs and is not an opos6ul, an opos8m{mini,nano} or an opos9{1,3}
+if [ -f "$1/rootfs.ext4" ] && [ "$3" != "imx6ul" ] && [ "$3" != "imx8mm" ] && [ "$3" != "imx8mn" ] && [ "$3" != "imx91" ] && [ "$3" != "imx93" ]; 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
|