[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-406-g55188b10c
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-406-g55188b10c
|
From: sszy <ss...@us...> - 2024-03-26 16:45:06
|
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 55188b10ca2c3c07cb6e963260c2e42f5934f534 (commit)
from 83ae3cf12806a3c9857b43d320530945dbba4791 (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 55188b10ca2c3c07cb6e963260c2e42f5934f534
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Dec 18 14:19:49 2023 +0100
[BUILDROOT] add OPOS93 and OPOS93Dev support
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci.yml | 2 +-
Makefile | 2 +
buildroot/configs/opos93-a0-legacy-6.1_defconfig | 121 +++++++++++++++++++++
buildroot/target/device/armadeus/Makefile.in | 2 +
.../opos93/opos93-linux-legacy-6.1.fragment | 2 +
.../target/device/armadeus/rootfs/post_build.sh | 6 +-
.../device/armadeus/rootfs/post_image_creation.sh | 7 +-
7 files changed, 137 insertions(+), 5 deletions(-)
create mode 100644 buildroot/configs/opos93-a0-legacy-6.1_defconfig
create mode 100644 buildroot/target/device/armadeus/opos93/opos93-linux-legacy-6.1.fragment
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 16401e9ba..b076beafd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,7 +31,7 @@ stages:
- cp -r -L buildroot/output/images output-images
parallel:
matrix:
- - ARMADEUS_PLATFORM: [apf27, apf28, apf51, apf6, opos6ul, opos6ulnano, opos8mm-legacy-5.10]
+ - ARMADEUS_PLATFORM: [apf27, apf28, apf51, apf6, opos6ul, opos6ulnano, opos8mm-legacy-5.10, opos93-a0-legacy-6.1]
timeout: 4h
build-merge-request:
diff --git a/Makefile b/Makefile
index 54db33989..8d302e874 100644
--- a/Makefile
+++ b/Makefile
@@ -71,6 +71,8 @@ ECHO_CONFIGURATION_NOT_DEFINED:= echo -en "\033[1m"; \
echo " "$(shell find $(ARMADEUS_CONFIG_DIR) -name "opos6ulsp*_defconfig" | sed 's/.*\///');\
echo " opos8mm: " >&2; \
echo " "$(shell find $(ARMADEUS_CONFIG_DIR) -name "opos8mm*_defconfig" | sed 's/.*\///');\
+ echo " opos93: " >&2; \
+ echo " "$(shell find $(ARMADEUS_CONFIG_DIR) -name "opos93*_defconfig" | sed 's/.*\///');\
echo " "; \
echo -en "\033[0m";
diff --git a/buildroot/configs/opos93-a0-legacy-6.1_defconfig b/buildroot/configs/opos93-a0-legacy-6.1_defconfig
new file mode 100644
index 000000000..1dd76a36f
--- /dev/null
+++ b/buildroot/configs/opos93-a0-legacy-6.1_defconfig
@@ -0,0 +1,121 @@
+BR2_aarch64=y
+BR2_cortex_a55=y
+BR2_ARM_FPU_VFPV4D16=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_DL_DIR="$(BASE_DIR)/../downloads"
+BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
+BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
+BR2_TARGET_GENERIC_HOSTNAME="opos93"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttyLP0"
+BR2_TARGET_TZ_ZONELIST="europe etcetera"
+BR2_TARGET_LOCALTIME="Europe/Paris"
+BR2_ROOTFS_OVERLAY="$(ARMADEUS_PATH)/rootfs/target_overlay"
+BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx9-bootloader-prepare.sh $(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="opos93 imx93"
+BR2_TARGET_ARMADEUS=y
+BR2_BOARD_NAME="opos93"
+BR2_CPU_NAME="imx93"
+BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://gitlab.com/armadeus/armadeus-linux.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="3d5468f1a21745fd2a71d5511b48f674eb775ff4"
+BR2_LINUX_KERNEL_DEFCONFIG="imx_v8"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-legacy-6.1.fragment"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx93-opos93dev"
+BR2_LINUX_KERNEL_INSTALL_TARGET=y
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y
+BR2_PACKAGE_LINUX_TOOLS_GPIO=y
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
+BR2_PACKAGE_ALSA_UTILS=y
+BR2_PACKAGE_ALSA_UTILS_ALSALOOP=y
+BR2_PACKAGE_ALSA_UTILS_AMIXER=y
+BR2_PACKAGE_ALSA_UTILS_APLAY=y
+BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
+BR2_PACKAGE_YAVTA=y
+BR2_PACKAGE_DROPWATCH=y
+BR2_PACKAGE_E2FSPROGS=y
+BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
+BR2_PACKAGE_MMC_UTILS=y
+BR2_PACKAGE_MMC_UTILS_ENABLE_DANGEROUS_COMMANDS=y
+BR2_PACKAGE_FB_TEST_APP=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_FREESCALE_IMX=y
+BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93=y
+BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX93A0=y
+BR2_PACKAGE_FIRMWARE_ELE_IMX=y
+BR2_PACKAGE_FIRMWARE_IMX=y
+BR2_PACKAGE_UBOOT_TOOLS=y
+BR2_PACKAGE_LIBDRM=y
+BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
+BR2_PACKAGE_DTC=y
+BR2_PACKAGE_DTC_PROGRAMS=y
+BR2_PACKAGE_LIBGPIOD=y
+BR2_PACKAGE_LIBGPIOD_TOOLS=y
+BR2_PACKAGE_LIBV4L=y
+BR2_PACKAGE_LIBV4L_UTILS=y
+BR2_PACKAGE_TSLIB=y
+BR2_PACKAGE_LIBMNL=y
+BR2_PACKAGE_LIBNFNETLINK=y
+BR2_PACKAGE_LIBNL_TOOLS=y
+BR2_PACKAGE_BLUEZ_TOOLS=y
+BR2_PACKAGE_BLUEZ5_UTILS=y
+BR2_PACKAGE_BLUEZ5_UTILS_OBEX=y
+BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_BLUEZ5_UTILS_MONITOR=y
+BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
+BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
+BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL=y
+# BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_NETWORK is not set
+BR2_PACKAGE_CAN_UTILS=y
+BR2_PACKAGE_DROPBEAR=y
+# BR2_PACKAGE_DROPBEAR_SMALL is not set
+BR2_PACKAGE_ETHTOOL=y
+BR2_PACKAGE_GESFTPSERVER=y
+BR2_PACKAGE_IPERF3=y
+BR2_PACKAGE_IPROUTE2=y
+BR2_PACKAGE_IW=y
+BR2_PACKAGE_MII_DIAG=y
+BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN=y
+BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT=y
+BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG=y
+BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
+BR2_PACKAGE_WPA_SUPPLICANT_WPA3=y
+BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
+BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
+BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y
+BR2_PACKAGE_UTIL_LINUX_BINARIES=y
+BR2_PACKAGE_UTIL_LINUX_FSCK=y
+BR2_PACKAGE_UTIL_LINUX_RFKILL=y
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="180M"
+BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit,^metadata_csum,uninit_bg"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/nxp-imx/imx-atf"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="99195a23d3aef485fb8f10939583b1bdef18881c"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx93"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
+BR2_TARGET_UBOOT_CUSTOM_GIT=y
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://gitlab.com/armadeus/u-boot.git"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="c08177c756507d51f2e9b9b783221353b4a8df46"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="opos93dev"
+BR2_TARGET_UBOOT_SPL=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_IMX_MKIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
diff --git a/buildroot/target/device/armadeus/Makefile.in b/buildroot/target/device/armadeus/Makefile.in
index 940a33458..2aa176892 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), "imx93")
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
@@ -49,6 +50,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 != imx8mn
endif # BR2_CPU_NAME != imx8mm
endif # BR2_CPU_NAME != imx6ul
diff --git a/buildroot/target/device/armadeus/opos93/opos93-linux-legacy-6.1.fragment b/buildroot/target/device/armadeus/opos93/opos93-linux-legacy-6.1.fragment
new file mode 100644
index 000000000..d00a6eb8e
--- /dev/null
+++ b/buildroot/target/device/armadeus/opos93/opos93-linux-legacy-6.1.fragment
@@ -0,0 +1,2 @@
+CONFIG_DRM_PANEL_ILITEK_ILI9881C=y
+CONFIG_PWM_IMX_TPM=y
diff --git a/buildroot/target/device/armadeus/rootfs/post_build.sh b/buildroot/target/device/armadeus/rootfs/post_build.sh
index 7c100ab7d..cac0dc52d 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" ]; then
+if [ "$3" != "imx6ul" ] && [ "$3" != "imx8mm" ] && [ "$3" != "imx8mn" ] && [ "$3" != "imx93" ]; 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" == "imx93" ]; then
+ echo "OPOS93" > $1/etc/machine
else
echo "APF"${3//[!0-9]/} > $1/etc/machine
fi
@@ -58,7 +60,7 @@ if [ "$3" != "imx6" ]; then
rm -rf $1/etc/init.d/S30wifi
fi
-if [ "$3" == "imx6ul" ] || [ "$3" == "imx8mm" ] || [ "$3" == "imx8mn" ]; then
+if [ "$3" == "imx6ul" ] || [ "$3" == "imx8mm" ] || [ "$3" == "imx8mn" ] || [ "$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 2dc0c496d..6ec51a864 100755
--- a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
@@ -47,6 +47,9 @@ if [ "$2" != "" ]; then
# OPOS8M{Mini,Nano}
symlink_image $1 u-boot.itb $2-u-boot.itb
+
+ # OPOS93
+ symlink_image $1 imx9-boot-sd.bin $2-u-boot.bin
else
# Old BR compat
BOARD_NAME=`grep 'BR2_BOARD_NAME=' $BUILDROOT_CONFIG | cut -d = -f 2 | sed s/\"//g`
@@ -55,8 +58,8 @@ else
fi
fi
-# 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
+# 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
# 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
|