| Message ID | 20240801174453.11300-1-ju.o@free.fr |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] configs/freescale_imx8mpevk: bump BSP components to lf-6.6.23-2.0.0 | expand |
On Thu, 1 Aug 2024 19:44:53 +0200 Julien Olivain <ju.o@free.fr> wrote: > 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_imx8mpevk_defconfig is failing to build the Kernel > with output: > > drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:5675: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] > 5675 | _QuerySignal(IN gckOS Os, IN gctSIGNAL Signal) > | ^~~~~~~~~~~~ > > This commit fixes the issue by updating the Kernel. > > This commit also adds the custom version package hashes. Therefore, > BR2_DOWNLOAD_FORCE_CHECK_HASHES=y is added in the defconfig, a > BR2_GLOBAL_PATCH_DIR is also added in the board specific directory and > the hash files are added. > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/7422089468 > > Signed-off-by: Julien Olivain <ju.o@free.fr> > --- > .checkpackageignore | 1 - > .../arm-trusted-firmware/arm-trusted-firmware.hash | 2 ++ > .../imx8mpevk/patches/linux-headers/linux-headers.hash | 1 + > board/freescale/imx8mpevk/patches/linux/linux.hash | 2 ++ > board/freescale/imx8mpevk/patches/uboot/uboot.hash | 2 ++ > configs/freescale_imx8mpevk_defconfig | 10 ++++++---- > 6 files changed, 13 insertions(+), 5 deletions(-) > create mode 100644 board/freescale/imx8mpevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash > create mode 120000 board/freescale/imx8mpevk/patches/linux-headers/linux-headers.hash > create mode 100644 board/freescale/imx8mpevk/patches/linux/linux.hash > create mode 100644 board/freescale/imx8mpevk/patches/uboot/uboot.hash Applied to master, thanks. Should you add yourself in the DEVELOPERS file for this board, and perhaps the other NXP boards? Thanks! Thomas
diff --git a/.checkpackageignore b/.checkpackageignore index 028b63b4d3..d2b625c17c 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -155,7 +155,6 @@ configs/freescale_imx6ullevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8dxlevk_defconfig lib_defconfig.ForceCheckHash configs/freescale_imx8mmevk_defconfig lib_defconfig.ForceCheckHash 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 diff --git a/board/freescale/imx8mpevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/freescale/imx8mpevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..0266b45d6a --- /dev/null +++ b/board/freescale/imx8mpevk/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/imx8mpevk/patches/linux-headers/linux-headers.hash b/board/freescale/imx8mpevk/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/freescale/imx8mpevk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/freescale/imx8mpevk/patches/linux/linux.hash b/board/freescale/imx8mpevk/patches/linux/linux.hash new file mode 100644 index 0000000000..3c4223976b --- /dev/null +++ b/board/freescale/imx8mpevk/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/imx8mpevk/patches/uboot/uboot.hash b/board/freescale/imx8mpevk/patches/uboot/uboot.hash new file mode 100644 index 0000000000..4e0d729ca0 --- /dev/null +++ b/board/freescale/imx8mpevk/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_imx8mpevk_defconfig b/configs/freescale_imx8mpevk_defconfig index 2aed048482..0ced252cd0 100644 --- a/configs/freescale_imx8mpevk_defconfig +++ b/configs/freescale_imx8mpevk_defconfig @@ -1,12 +1,14 @@ BR2_aarch64=y BR2_ARM_FPU_VFPV3=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/freescale/imx8mpevk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1" 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/imx8mp-evk.dtb" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-6.1.22-2.0.0)/linux-imx-lf-6.1.22-2.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/imx8mp-evk" @@ -19,13 +21,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-6.1.22-2.0.0)/imx-atf-lf-6.1.22-2.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="imx8mp" 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-6.1.22-2.0.0)/uboot-imx-lf-6.1.22-2.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="imx8mp_evk" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/freescale/imx8mpevk/uboot-fragment.config" BR2_TARGET_UBOOT_NEEDS_DTC=y
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_imx8mpevk_defconfig is failing to build the Kernel with output: drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c:5675: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] 5675 | _QuerySignal(IN gckOS Os, IN gctSIGNAL Signal) | ^~~~~~~~~~~~ This commit fixes the issue by updating the Kernel. This commit also adds the custom version package hashes. Therefore, BR2_DOWNLOAD_FORCE_CHECK_HASHES=y is added in the defconfig, a BR2_GLOBAL_PATCH_DIR is also added in the board specific directory and the hash files are added. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7422089468 Signed-off-by: Julien Olivain <ju.o@free.fr> --- .checkpackageignore | 1 - .../arm-trusted-firmware/arm-trusted-firmware.hash | 2 ++ .../imx8mpevk/patches/linux-headers/linux-headers.hash | 1 + board/freescale/imx8mpevk/patches/linux/linux.hash | 2 ++ board/freescale/imx8mpevk/patches/uboot/uboot.hash | 2 ++ configs/freescale_imx8mpevk_defconfig | 10 ++++++---- 6 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 board/freescale/imx8mpevk/patches/arm-trusted-firmware/arm-trusted-firmware.hash create mode 120000 board/freescale/imx8mpevk/patches/linux-headers/linux-headers.hash create mode 100644 board/freescale/imx8mpevk/patches/linux/linux.hash create mode 100644 board/freescale/imx8mpevk/patches/uboot/uboot.hash