From patchwork Thu Aug 1 19:50:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Olivain X-Patchwork-Id: 1968003 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WZfjG3v1Zz1ybX for ; Fri, 2 Aug 2024 05:51:13 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 34E25810E4; Thu, 1 Aug 2024 19:51:11 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id enR_sgZJfnFq; Thu, 1 Aug 2024 19:51:10 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org D53C280F6D Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id D53C280F6D; Thu, 1 Aug 2024 19:51:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 548191BF401 for ; Thu, 1 Aug 2024 19:51:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 41F56403E7 for ; Thu, 1 Aug 2024 19:51:08 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id z86HYFydDlFO for ; Thu, 1 Aug 2024 19:51:05 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=212.27.42.1; helo=smtp1-g21.free.fr; envelope-from=ju.o@free.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 2331C40288 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 2331C40288 Received: from smtp1-g21.free.fr (smtp1-g21.free.fr [212.27.42.1]) by smtp2.osuosl.org (Postfix) with ESMTPS id 2331C40288 for ; Thu, 1 Aug 2024 19:51:04 +0000 (UTC) Received: from home.juju.sh (unknown [IPv6:2a01:e0a:485:b220:8213:2270:4a8d:a1d5]) (Authenticated sender: ju.o@free.fr) by smtp1-g21.free.fr (Postfix) with ESMTPSA id 1B3CEB0053D; Thu, 1 Aug 2024 21:51:01 +0200 (CEST) From: Julien Olivain To: buildroot@buildroot.org Date: Thu, 1 Aug 2024 21:50:48 +0200 Message-ID: <20240801195048.59136-1-ju.o@free.fr> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=free.fr; s=smtp-20201208; t=1722541863; bh=9J0n8YiseDSD6XU56V71w7t0DolegcVc4EW8A0hIx8M=; h=From:To:Cc:Subject:Date:From; b=V9S8FJzdN75WZOC/eLWjRwtz/5bhYMwiGEnqsqSeXooekB8Ps2JkEin0Hv5NpFP44 BoflKpbjUCuvFNb3sjLD2OvmqAOyh4jUkMTiLcFthzWMOQMftRyqN4u4pvTNftwUTO ytXUgQ70UzfQE+59PALQcLGt5tIzYACbc0r15RtRhYh3FAfp4Zgk7cEQTRI4swy4u5 BkOBBPkEjT2Dhp4q/f1Oh7UBvk3IK6kJ+Mn1xq5vnJdzAAF43vUnTnRbUuy/RAj+q3 2QNFzSXg5BhaC2DMlQOKuUzA7BbmVwUdh6+4VKyVLb9aPdr8ZCtKhrP/n1YYs8uHyn P3eUmtoPZK7Gg== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=none dis=none) header.from=free.fr X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=free.fr header.i=@free.fr header.a=rsa-sha256 header.s=smtp-20201208 header.b=V9S8FJzd Subject: [Buildroot] [PATCH 1/1] configs/freescale_imx8qxpmek: bump BSP components to lf-6.6.23-2.0.0 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Julien Olivain , Fabio Estevam Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Bump ATF, U-Boot and Linux kernel to the NXP BSP lf-6.6.23-2.0.0 versions. Also, since commit dc0f721 "package/gcc: switch to 13.x as default", this freescale_imx8qxpmek_defconfig is failing to build the Kernel with output: drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:5769:1: error: conflicting types for '_QuerySignal' due to enum/integer mismatch; have 'gceSTATUS(struct _gckOS *, void *)' {aka 'enum _gceSTATUS(struct _gckOS *, void *)'} [-Werror=enum-int-mismatch] 5769 | _QuerySignal( | ^~~~~~~~~~~~ This commit fixes the issue by updating the Kernel. The BR2_GLOBAL_PATCH_DIR is also changed from "board/freescale/common/patches" to "board/freescale/imx8qxpmek/patches". This for two reasons: 1. the common patch directory is removed, because the patches for arm-trusted-firmware are no longer needed. Patch 0001 is included in this new version, and patch 0002 no longer needed due a code rewrite in this new version. The common patch files are kept, because they are used in other freescale_ defconfigs. 2. the imx8qxpmek patch directory is introduced, to include the needed hash files, because this commit enables BR2_DOWNLOAD_FORCE_CHECK_HASHES=y. Those hash files are introduced in a board specific directory to allow updating this defconfig independently of the other i.MX defconfigs: there is 16 freescale_imx*_defconfigs, with more or less dependencies (firmwares, gpu drivers, ...). The ".checkpackageignore" entry for this defconfig is also removed. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7422089475 Signed-off-by: Julien Olivain --- .checkpackageignore | 1 - .../arm-trusted-firmware/arm-trusted-firmware.hash | 2 ++ .../patches/linux-headers/linux-headers.hash | 1 + board/freescale/imx8qxpmek/patches/linux/linux.hash | 2 ++ board/freescale/imx8qxpmek/patches/uboot/uboot.hash | 2 ++ configs/freescale_imx8qxpmek_defconfig | 11 ++++++----- 6 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 board/freescale/imx8qxpmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash create mode 120000 board/freescale/imx8qxpmek/patches/linux-headers/linux-headers.hash create mode 100644 board/freescale/imx8qxpmek/patches/linux/linux.hash create mode 100644 board/freescale/imx8qxpmek/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index 028b63b4d3..92aa0802ac 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -158,7 +158,6 @@ configs/freescale_imx8mnevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8mpevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8mqevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8qmmek_defconfig lib_defconfig.ForceCheckHash -configs/freescale_imx8qxpmek_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx93evk_defconfig lib_defconfig.ForceCheckHash configs/freescale_p1025twr_defconfig lib_defconfig.ForceCheckHash configs/freescale_t1040d4rdb_defconfig lib_defconfig.ForceCheckHash diff --git a/board/freescale/imx8qxpmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx8qxpmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..0266b45d6a --- /dev/null +++ b/board/freescale/imx8qxpmek/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 37f0dee8b3b52d6c7f8a46c3bdd4138b528f9cc607015400e7cad0c206df41d7 imx-atf-lf-6.6.23-2.0.0.tar.gz diff --git a/board/freescale/imx8qxpmek/patches/linux-headers/linux-headers.hash b/board/freescale/imx8qxpmek/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/freescale/imx8qxpmek/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/freescale/imx8qxpmek/patches/linux/linux.hash b/board/freescale/imx8qxpmek/patches/linux/linux.hash new file mode 100644 index 0000000000..3c4223976b --- /dev/null +++ b/board/freescale/imx8qxpmek/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/board/freescale/imx8qxpmek/patches/uboot/uboot.hash b/board/freescale/imx8qxpmek/patches/uboot/uboot.hash new file mode 100644 index 0000000000..4e0d729ca0 --- /dev/null +++ b/board/freescale/imx8qxpmek/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz diff --git a/configs/freescale_imx8qxpmek_defconfig b/configs/freescale_imx8qxpmek_defconfig index 47a2104d5b..d2fae2c9e7 100644 --- a/configs/freescale_imx8qxpmek_defconfig +++ b/configs/freescale_imx8qxpmek_defconfig @@ -1,14 +1,15 @@ BR2_aarch64=y BR2_cortex_a35=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y -BR2_GLOBAL_PATCH_DIR="board/freescale/common/patches" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx8qxpmek/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttyLP0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8qxp-mek.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.6.23-2.0.0)/linux-imx-lf-6.6.23-2.0.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v8" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8qxp-mek" @@ -23,13 +24,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-5.10.y-1.0.0)/imx-atf-lf-5.10.y-1.0.0.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,imx-atf,lf-6.6.23-2.0.0)/imx-atf-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8qx" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-6.6.23-2.0.0)/uboot-imx-lf-6.6.23-2.0.0.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qxp_mek" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_PACKAGE_HOST_DOSFSTOOLS=y