Projetos/rpi-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configs/freescale_imx6{dl, q, sx}*: bump BSP components to lf-6.6.23-2.0.0

Browse Source 
Note: configs/freescale_imx6{dl,q,sx}* corresponds to the five:
freescale_imx6dlsabreauto_defconfig
freescale_imx6dlsabresd_defconfig
freescale_imx6qsabreauto_defconfig
freescale_imx6qsabresd_defconfig
freescale_imx6sxsabresd_defconfig

Those i.MX6 Sabre defconfigs have a lot in common. This is why they are
all updated at once in this single commit.

This commit bumps U-Boot and Linux kernel to the NXP BSP
lf-6.6.23-2.0.0 versions. The imx6sabre uboot patch is also rebased on
the new version, and the "Upstream:" tag is added to flag this patch
as Buildroot-specific. The ".checkpackageignore" entry for this patch
is also removed.

While bumping those BSP components, this commit also adds the custom
hashes by enabling BR2_DOWNLOAD_FORCE_CHECK_HASHES=y in those
defconfigs. Hash files are added in the _PATCH_DIR. The
".checkpackageignore" entries for those defconfigs are also removed.

Also, since commit dc0f721 "package/gcc: switch to 13.x as default",
those freescale_imx6{dl,q,sx}* are failing to build the Kernel
with output:

    drivers/ata/libahci.c: In function 'ahci_led_store':
    ././include/linux/compiler_types.h:315:45: error: call to '__compiletime_assert_340' declared with attribute error: BUILD_BUG_ON failed: sizeof(_s) > sizeof(long)
      315 |         _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
          |                                             ^

This commit fixes the issue by bumping components which includes the
needed gcc-13 fixes.

The Kernel DTS names are also updated by adding the new "nxp/imx/"
prefix, to follow the upstream reorganization in [1], first included
in v6.5.

Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/7422089449
https://gitlab.com/buildroot.org/buildroot/-/jobs/7422089451
https://gitlab.com/buildroot.org/buildroot/-/jobs/7422089452
https://gitlab.com/buildroot.org/buildroot/-/jobs/7422089455
https://gitlab.com/buildroot.org/buildroot/-/jobs/7422089456

[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=724ba6751532055db75992fc6ae21c3e322e94a7

Signed-off-by: Julien Olivain <ju.o@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Julien Olivain
2024-07-28 14:18:11 +02:00
committed by Thomas Petazzoni
parent 009d31b438
commit cefa611c8f
10 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.checkpackageignore
View File

@@ -30,7 +30,6 @@ board/ci20/patches/uboot/0001-mips-Remove-default-endiannes.patch lib_patch.Upst
board/cubietech/cubieboard2/post-image.sh Shellcheck
board/freescale/common/imx/imx8-bootloader-prepare.sh Shellcheck
board/freescale/common/mxs/post-image.sh Shellcheck
board/freescale/imx6sabre/patches/uboot/0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch lib_patch.Upstream
board/friendlyarm/nanopi-r2s/post-build.sh Shellcheck
board/hardkernel/odroidc2/post-image.sh Shellcheck
board/hardkernel/odroidc2/rootfs_overlay/etc/init.d/S09modload Shellcheck lib_sysv.Variables
@@ -153,11 +152,6 @@ configs/engicam_imx6qdl_icore_rqs_defconfig lib_defconfig.ForceCheckHash
configs/engicam_imx6ul_geam_defconfig lib_defconfig.ForceCheckHash
configs/engicam_imx6ul_isiot_defconfig lib_defconfig.ForceCheckHash
configs/freescale_imx28evk_defconfig lib_defconfig.ForceCheckHash
configs/freescale_imx6dlsabreauto_defconfig lib_defconfig.ForceCheckHash
configs/freescale_imx6dlsabresd_defconfig lib_defconfig.ForceCheckHash
configs/freescale_imx6qsabreauto_defconfig lib_defconfig.ForceCheckHash
configs/freescale_imx6qsabresd_defconfig lib_defconfig.ForceCheckHash
configs/freescale_imx6sxsabresd_defconfig lib_defconfig.ForceCheckHash
configs/freescale_imx6ullevk_defconfig lib_defconfig.ForceCheckHash
configs/freescale_imx7dsabresd_defconfig lib_defconfig.ForceCheckHash
configs/freescale_imx8dxlevk_defconfig lib_defconfig.ForceCheckHash

1
board/freescale/imx6sabre/patches/linux-headers/linux-headers.hash Symbolic link
View File

@@ -0,0 +1 @@
../linux/linux.hash

2
board/freescale/imx6sabre/patches/linux/linux.hash Normal file
View File

@@ -0,0 +1,2 @@
# Locally calculated
sha256 c70adedadce88f8685cb26d9703b930292c1349138e2c55ed9b4cd6e277de3bd linux-imx-lf-6.6.23-2.0.0.tar.gz

13
board/freescale/imx6sabre/patches/uboot/0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch
View File

@@ -1,4 +1,4 @@
From e9a88fddc149fc52cdc5a8997f9fd3a29416c643 Mon Sep 17 00:00:00 2001
From 221b57404b29190e0b37f03b81dd3ee6a0fc9ce0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= <vincent.stehle@freescale.com>
Date: Tue, 12 Aug 2014 10:17:31 +0200
Subject: [PATCH] mx6qsabre_common: boot Linux to /init in mfgtools mode
@@ -15,17 +15,20 @@ buildroot system entirely through USB.
Signed-off-by: Vincent Stehlé <vincent.stehle@freescale.com>
Signed-off-by: Julien Olivain <julien.olivain@oss.nxp.com>
[Julien: rebased patch on lf-6.6.23-2.0.0]
Signed-off-by: Julien Olivain <ju.o@free.fr>
Upstream: Not applicable, Buildroot specific.
---
include/configs/imx_env.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/configs/imx_env.h b/include/configs/imx_env.h
index c03748d93f..aa1a8bf488 100644
index 1b34478fc3f..9106d59ff9f 100644
--- a/include/configs/imx_env.h
+++ b/include/configs/imx_env.h
@@ -29,7 +29,7 @@
@@ -54,7 +54,7 @@
#define CONFIG_MFG_ENV_SETTINGS_DEFAULT \
#define CFG_MFG_ENV_SETTINGS_DEFAULT \
"mfgtool_args=setenv bootargs console=${console},${baudrate} " \
- "rdinit=/linuxrc " \
+ "rdinit=/init " \
@@ -33,5 +36,5 @@ index c03748d93f..aa1a8bf488 100644
"\0" \
"kboot="MFG_BOOT_CMD"\0"\
--
2.26.2
2.45.2

2
board/freescale/imx6sabre/patches/uboot/uboot.hash Normal file
View File

@@ -0,0 +1,2 @@
# Locally calculated
sha256 179b6531ef1d4ce681d139741ac7b4144220c90b7223297df28b61e98e8d37fc uboot-imx-lf-6.6.23-2.0.0.tar.gz

11
configs/freescale_imx6dlsabreauto_defconfig
View File

@@ -7,9 +7,10 @@ BR2_ARM_FPU_VFPV3=y
# patches
BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches"
BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
# Linux headers same as kernel, a 5.10 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
# Linux headers same as kernel, a 6.6 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
# system
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
@@ -17,10 +18,10 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
# kernel
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_v7"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabreauto"
BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6dl-sabreauto"
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
# filesystem
@@ -38,5 +39,5 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabreauto"
BR2_TARGET_UBOOT_FORMAT_IMX=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_NEEDS_DTC=y

11
configs/freescale_imx6dlsabresd_defconfig
View File

@@ -7,9 +7,10 @@ BR2_ARM_FPU_VFPV3=y
# patches
BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches"
BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
# Linux headers same as kernel, a 5.10 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
# Linux headers same as kernel, a 6.6 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
# system
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
@@ -17,10 +18,10 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
# kernel
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_v7"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabresd"
BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6dl-sabresd"
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
# filesystem
@@ -37,5 +38,5 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabresd"
BR2_TARGET_UBOOT_FORMAT_IMX=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_NEEDS_DTC=y

11
configs/freescale_imx6qsabreauto_defconfig
View File

@@ -7,9 +7,10 @@ BR2_ARM_FPU_VFPV3=y
# patches
BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches"
BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
# Linux headers same as kernel, a 5.10 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
# Linux headers same as kernel, a 6.6 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
# system
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
@@ -17,10 +18,10 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
# kernel
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_v7"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabreauto"
BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6q-sabreauto"
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
# filesystem
@@ -38,5 +39,5 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="mx6qsabreauto"
BR2_TARGET_UBOOT_FORMAT_IMX=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_NEEDS_DTC=y

11
configs/freescale_imx6qsabresd_defconfig
View File

@@ -7,9 +7,10 @@ BR2_ARM_FPU_VFPV3=y
# patches
BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches"
BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
# Linux headers same as kernel, a 5.10 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
# Linux headers same as kernel, a 6.6 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
# system
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
@@ -17,10 +18,10 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
# kernel
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_v7"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd"
BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6q-sabresd"
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
# filesystem
@@ -38,5 +39,5 @@ BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="mx6qsabresd"
BR2_TARGET_UBOOT_FORMAT_IMX=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_NEEDS_DTC=y

11
configs/freescale_imx6sxsabresd_defconfig
View File

@@ -7,9 +7,10 @@ BR2_ARM_FPU_VFPV3=y
# patches
BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches"
BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
# Linux headers same as kernel, a 5.10 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
# Linux headers same as kernel, a 6.6 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
# system
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
@@ -17,10 +18,10 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
# kernel
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_v7"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-sdb"
BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx6sx-sdb"
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
# filesystem
@@ -36,6 +37,6 @@ BR2_PACKAGE_HOST_MTOOLS=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="mx6sxsabresd"
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_FORMAT_IMX=y
BR2_TARGET_UBOOT_NEEDS_DTC=y