[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-528-g38d5e0ea8
Brought to you by:
sszy
|
From: sszy <ss...@us...> - 2026-08-05 15:15:32
|
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 38d5e0ea8789221449f0d052e29344c6d1f9ef7b (commit)
via 604b46abd05849484a0edfe591db564fe4c9ef2f (commit)
from ec2a91a8ee8562cc1f803a49db7af5f057fd75d7 (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 38d5e0ea8789221449f0d052e29344c6d1f9ef7b
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Aug 5 17:07:42 2026 +0200
[BUILDROOT] Makefile.in: use $(filter ...) instead of several ifneq
Signed-off-by: Sébastien Szymanski <seb...@ar...>
commit 604b46abd05849484a0edfe591db564fe4c9ef2f
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Aug 5 16:46:34 2026 +0200
[BUILDROOT] post_image_creation.sh: simplify if condition for boot.ext4
Signed-off-by: Sébastien Szymanski <seb...@ar...>
-----------------------------------------------------------------------
Summary of changes:
buildroot/target/device/armadeus/Makefile.in | 14 ++------------
.../target/device/armadeus/rootfs/post_image_creation.sh | 4 ++--
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/buildroot/target/device/armadeus/Makefile.in b/buildroot/target/device/armadeus/Makefile.in
index 0b9fc9e9a..913f945f4 100644
--- a/buildroot/target/device/armadeus/Makefile.in
+++ b/buildroot/target/device/armadeus/Makefile.in
@@ -11,12 +11,7 @@ ARMADEUS_DTB_IMAGE_NAME:=$(addsuffix .dtb,$(BOARD_NAME))
LINUX26_KERNEL_NAME:=$(BOARD_NAME)-linux.bin
# !! if you modify the following, please also update scripts/quiltify.sh !!
-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")
+ifneq ($(filter $(CPU_NAME),imx27 imx28 imx51),)
define UBOOT_UPDATE_CONFIG_HEADER
$(SED) "s,^#define CONFIG_BOARD_NAME.*,#define CONFIG_BOARD_NAME $(BOARD_NAME),g;"\
$(@D)/include/configs/$(UBOOT_BOARD_NAME).h
@@ -51,12 +46,7 @@ define UBOOT_POST_INSTALL_IMAGES_ACTION
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
-endif # BR2_CPU_NAME != imx6
+endif
define LINUX_POST_EXTRACT_ACTION
ln -sf $(TOPDIR)/../target/linux/modules $(@D)/drivers/armadeus
diff --git a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
index 68b6e3cba..a3066dcda 100755
--- a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
@@ -58,8 +58,8 @@ else
fi
fi
-# 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
+# if target uses ext4 for rootfs and is an APF6
+if [ -f "$1/rootfs.ext4" ] && [ "$3" == "imx6" ]; 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
|