* [Buildroot] [PATCH v2 1/2] configs/stm32f469_disco_{sd, xip}: bump Linux to 5.15.162
@ 2024-07-11 9:05 Dario Binacchi
2024-07-11 9:05 ` [Buildroot] [PATCH v2 2/2] configs/stm32f469_disco_{sd, xip}: add hashes Dario Binacchi
2024-07-11 19:02 ` [Buildroot] [PATCH v2 1/2] configs/stm32f469_disco_{sd, xip}: bump Linux to 5.15.162 Thomas Petazzoni via buildroot
0 siblings, 2 replies; 3+ messages in thread
From: Dario Binacchi @ 2024-07-11 9:05 UTC (permalink / raw)
To: buildroot
Cc: linux-amarula, Dario Binacchi, Christophe Priouzeau,
Thomas Petazzoni
The patch bumps the Linux kernel to version 5.15.162 for both
configurations and U-Boot to version 2024.04 for the SD one. Using the
same kernel will subsequently allow adding the hash files in a single
location.
Furthermore, now even the xip configuration uses the same headers as
the used Linux kernel.
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
Changes v1 -> v2:
- Drop 0001-serial-stm32-rework-RX-over-DMA.patch.
- Update to Linux version to 5.15.162, which now includes the patch
fixing the UART issue.
configs/stm32f469_disco_sd_defconfig | 7 ++++---
configs/stm32f469_disco_xip_defconfig | 5 +++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/configs/stm32f469_disco_sd_defconfig b/configs/stm32f469_disco_sd_defconfig
index 66840a774230..689a12941630 100644
--- a/configs/stm32f469_disco_sd_defconfig
+++ b/configs/stm32f469_disco_sd_defconfig
@@ -1,12 +1,13 @@
BR2_arm=y
BR2_cortex_m4=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
+BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32f469-disco/patches"
BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh board/stmicroelectronics/stm32f469-disco/post-build.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/stmicroelectronics/stm32f469-disco/genimage.cfg"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.12"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.162"
BR2_LINUX_KERNEL_DEFCONFIG="stm32"
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm/configs/dram_0x00000000.config board/stmicroelectronics/stm32f469-disco/linux-sd.fragment"
BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
@@ -21,7 +22,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="32M"
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32f469-discovery"
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
BR2_PACKAGE_HOST_DOSFSTOOLS=y
diff --git a/configs/stm32f469_disco_xip_defconfig b/configs/stm32f469_disco_xip_defconfig
index 6e6ead0fdebb..000265d83155 100644
--- a/configs/stm32f469_disco_xip_defconfig
+++ b/configs/stm32f469_disco_xip_defconfig
@@ -1,12 +1,13 @@
BR2_arm=y
BR2_cortex_m4=y
-BR2_KERNEL_HEADERS_5_15=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
# BR2_UCLIBC_INSTALL_UTILS is not set
BR2_ENABLE_LTO=y
+BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32f469-disco/patches"
BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.162"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f469-disco/linux-xip.config"
BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
--
2.43.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH v2 2/2] configs/stm32f469_disco_{sd, xip}: add hashes
2024-07-11 9:05 [Buildroot] [PATCH v2 1/2] configs/stm32f469_disco_{sd, xip}: bump Linux to 5.15.162 Dario Binacchi
@ 2024-07-11 9:05 ` Dario Binacchi
2024-07-11 19:02 ` [Buildroot] [PATCH v2 1/2] configs/stm32f469_disco_{sd, xip}: bump Linux to 5.15.162 Thomas Petazzoni via buildroot
1 sibling, 0 replies; 3+ messages in thread
From: Dario Binacchi @ 2024-07-11 9:05 UTC (permalink / raw)
To: buildroot
Cc: linux-amarula, Dario Binacchi, Christophe Priouzeau,
Thomas Petazzoni
The patch adds .hash files for Linux, Linux headers and U-Boot and then
enables BR2_DOWNLOAD_FORCE_CHECK_HASHES. With this, we can now drop the
defconfig from .checkpackageignore.
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
Changes v1 -> v2:
- Update Linux hash for version 5.15.162.
.checkpackageignore | 2 --
| 1 +
.../stmicroelectronics/stm32f469-disco/patches/linux/linux.hash | 2 ++
.../stmicroelectronics/stm32f469-disco/patches/uboot/uboot.hash | 2 ++
configs/stm32f469_disco_sd_defconfig | 1 +
configs/stm32f469_disco_xip_defconfig | 1 +
6 files changed, 7 insertions(+), 2 deletions(-)
create mode 120000 board/stmicroelectronics/stm32f469-disco/patches/linux-headers/linux-headers.hash
create mode 100644 board/stmicroelectronics/stm32f469-disco/patches/linux/linux.hash
create mode 100644 board/stmicroelectronics/stm32f469-disco/patches/uboot/uboot.hash
diff --git a/.checkpackageignore b/.checkpackageignore
index e539c0a15f78..9a4684042295 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -286,8 +286,6 @@ configs/solidrun_clearfog_defconfig lib_defconfig.ForceCheckHash
configs/solidrun_clearfog_gt_8k_defconfig lib_defconfig.ForceCheckHash
configs/solidrun_macchiatobin_defconfig lib_defconfig.ForceCheckHash
configs/spike_riscv64_defconfig lib_defconfig.ForceCheckHash
-configs/stm32f469_disco_sd_defconfig lib_defconfig.ForceCheckHash
-configs/stm32f469_disco_xip_defconfig lib_defconfig.ForceCheckHash
configs/stm32mp157a_dk1_defconfig lib_defconfig.ForceCheckHash
configs/stm32mp157c_dk2_defconfig lib_defconfig.ForceCheckHash
configs/stm32mp157c_odyssey_defconfig lib_defconfig.ForceCheckHash
--git a/board/stmicroelectronics/stm32f469-disco/patches/linux-headers/linux-headers.hash b/board/stmicroelectronics/stm32f469-disco/patches/linux-headers/linux-headers.hash
new file mode 120000
index 000000000000..5808d92afe89
--- /dev/null
+++ b/board/stmicroelectronics/stm32f469-disco/patches/linux-headers/linux-headers.hash
@@ -0,0 +1 @@
+../linux/linux.hash
\ No newline at end of file
diff --git a/board/stmicroelectronics/stm32f469-disco/patches/linux/linux.hash b/board/stmicroelectronics/stm32f469-disco/patches/linux/linux.hash
new file mode 100644
index 000000000000..d8e8263e9eff
--- /dev/null
+++ b/board/stmicroelectronics/stm32f469-disco/patches/linux/linux.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 91bfc0ea152ce7b102a0b79d35a7c92843874ebf085c99d2ba8b4d85e62b1a7c linux-5.15.162.tar.xz
diff --git a/board/stmicroelectronics/stm32f469-disco/patches/uboot/uboot.hash b/board/stmicroelectronics/stm32f469-disco/patches/uboot/uboot.hash
new file mode 100644
index 000000000000..97a2b4eaf95b
--- /dev/null
+++ b/board/stmicroelectronics/stm32f469-disco/patches/uboot/uboot.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a u-boot-2024.04.tar.bz2
diff --git a/configs/stm32f469_disco_sd_defconfig b/configs/stm32f469_disco_sd_defconfig
index 689a12941630..d440d6d2017f 100644
--- a/configs/stm32f469_disco_sd_defconfig
+++ b/configs/stm32f469_disco_sd_defconfig
@@ -2,6 +2,7 @@ BR2_arm=y
BR2_cortex_m4=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32f469-disco/patches"
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh board/stmicroelectronics/stm32f469-disco/post-build.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/stmicroelectronics/stm32f469-disco/genimage.cfg"
diff --git a/configs/stm32f469_disco_xip_defconfig b/configs/stm32f469_disco_xip_defconfig
index 000265d83155..5a9d3e8afc77 100644
--- a/configs/stm32f469_disco_xip_defconfig
+++ b/configs/stm32f469_disco_xip_defconfig
@@ -4,6 +4,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
# BR2_UCLIBC_INSTALL_UTILS is not set
BR2_ENABLE_LTO=y
BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32f469-disco/patches"
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
--
2.43.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH v2 1/2] configs/stm32f469_disco_{sd, xip}: bump Linux to 5.15.162
2024-07-11 9:05 [Buildroot] [PATCH v2 1/2] configs/stm32f469_disco_{sd, xip}: bump Linux to 5.15.162 Dario Binacchi
2024-07-11 9:05 ` [Buildroot] [PATCH v2 2/2] configs/stm32f469_disco_{sd, xip}: add hashes Dario Binacchi
@ 2024-07-11 19:02 ` Thomas Petazzoni via buildroot
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-07-11 19:02 UTC (permalink / raw)
To: Dario Binacchi; +Cc: Christophe Priouzeau, linux-amarula, buildroot
On Thu, 11 Jul 2024 11:05:25 +0200
Dario Binacchi <dario.binacchi@amarulasolutions.com> wrote:
> The patch bumps the Linux kernel to version 5.15.162 for both
> configurations and U-Boot to version 2024.04 for the SD one. Using the
> same kernel will subsequently allow adding the hash files in a single
> location.
>
> Furthermore, now even the xip configuration uses the same headers as
> the used Linux kernel.
>
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> ---
> Changes v1 -> v2:
> - Drop 0001-serial-stm32-rework-RX-over-DMA.patch.
> - Update to Linux version to 5.15.162, which now includes the patch
> fixing the UART issue.
Thanks, both applied!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-07-11 19:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-11 9:05 [Buildroot] [PATCH v2 1/2] configs/stm32f469_disco_{sd, xip}: bump Linux to 5.15.162 Dario Binacchi
2024-07-11 9:05 ` [Buildroot] [PATCH v2 2/2] configs/stm32f469_disco_{sd, xip}: add hashes Dario Binacchi
2024-07-11 19:02 ` [Buildroot] [PATCH v2 1/2] configs/stm32f469_disco_{sd, xip}: bump Linux to 5.15.162 Thomas Petazzoni via buildroot
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.