From 3ef5975b795271a723b694160c8d50c62d518e8e Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Wed, 11 Dec 2024 23:09:40 +0300 Subject: [PATCH] configs/orangepi_zero: bump BSP versions Switch to the new Linux LTS release 6.12.3 and to the latest U-Boot 2024.10. Tune the patch for xr819 interrupts for the new kernel. Add hashes for Linux kernel/headers and U-Boot. Finally, add BR2_TARGET_UBOOT_NEEDS_GNUTLS option required by new U-Boot. Signed-off-by: Sergey Matyukevich [Julien: - add BR2_DOWNLOAD_FORCE_CHECK_HASHES=y - remove .checkpackageignore entry - change linux.hash comment to use upstream hashes ] Signed-off-by: Julien Olivain --- .checkpackageignore | 1 - .../patches/linux-headers/linux-headers.hash | 1 + ...-orange-pi-zero-interrupt-triggering-xr819.patch | 13 ++++++------- .../orangepi/orangepi-zero/patches/linux/linux.hash | 2 ++ .../orangepi/orangepi-zero/patches/uboot/uboot.hash | 2 ++ configs/orangepi_zero_defconfig | 8 +++++--- 6 files changed, 16 insertions(+), 11 deletions(-) create mode 120000 board/orangepi/orangepi-zero/patches/linux-headers/linux-headers.hash create mode 100644 board/orangepi/orangepi-zero/patches/linux/linux.hash create mode 100644 board/orangepi/orangepi-zero/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index f24859bf49..f8997bac55 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -206,7 +206,6 @@ configs/orangepi_one_plus_defconfig lib_defconfig.ForceCheckHash configs/orangepi_pc2_defconfig lib_defconfig.ForceCheckHash configs/orangepi_pc_plus_defconfig lib_defconfig.ForceCheckHash configs/orangepi_zero3_defconfig lib_defconfig.ForceCheckHash -configs/orangepi_zero_defconfig lib_defconfig.ForceCheckHash configs/orangepi_zero_plus2_defconfig lib_defconfig.ForceCheckHash configs/orangepi_zero_plus_defconfig lib_defconfig.ForceCheckHash configs/pc_x86_64_bios_defconfig lib_defconfig.ForceCheckHash diff --git a/board/orangepi/orangepi-zero/patches/linux-headers/linux-headers.hash b/board/orangepi/orangepi-zero/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/orangepi/orangepi-zero/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch b/board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch index 6a5aa0bb63..600fd0f5b3 100644 --- a/board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch +++ b/board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch @@ -1,8 +1,7 @@ -From 321faaf4b78d46a0c77782c1798856746f0619e9 Mon Sep 17 00:00:00 2001 +From 7a24ce9f5045ac6faf66a08bbb814f3a82c919b1 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Fri, 19 May 2017 23:39:48 +0300 -Subject: [PATCH] ARM: dts: orange-pi-zero: specify XR819 WiFi chip - interrupts +Subject: [PATCH] ARM: dts: orange-pi-zero: specify XR819 WiFi chip interrupts The orange-pi-zero board has Allwinner XR819 SDIO wifi chip. The board dts file provides a node enabling mmc1 controller. Together with an @@ -17,12 +16,12 @@ Signed-off-by: Sergey Matyukevich 1 file changed, 3 insertions(+) diff --git a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts -index b7ca916d871d..4e1a9050c6b4 100644 +index 2a45770f7b83..667038973bb7 100644 --- a/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts +++ b/arch/arm/boot/dts/allwinner/sun8i-h2-plus-orangepi-zero.dts -@@ -125,6 +125,9 @@ +@@ -152,6 +152,9 @@ &mmc1 { */ - xr819: sdio_wifi@1 { + xr819: wifi@1 { reg = <1>; + compatible = "xradio,xr819"; + interrupt-parent = <&pio>; @@ -31,5 +30,5 @@ index b7ca916d871d..4e1a9050c6b4 100644 }; -- -2.11.0 +2.47.1 diff --git a/board/orangepi/orangepi-zero/patches/linux/linux.hash b/board/orangepi/orangepi-zero/patches/linux/linux.hash new file mode 100644 index 0000000000..aea771e7bf --- /dev/null +++ b/board/orangepi/orangepi-zero/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 c89809cc777d50f1ea484a118630281a26383707a0e752c96fd834f6e765deae linux-6.12.3.tar.xz diff --git a/board/orangepi/orangepi-zero/patches/uboot/uboot.hash b/board/orangepi/orangepi-zero/patches/uboot/uboot.hash new file mode 100644 index 0000000000..904fa56c02 --- /dev/null +++ b/board/orangepi/orangepi-zero/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig index b48c28102e..6372564e72 100644 --- a/configs/orangepi_zero_defconfig +++ b/configs/orangepi_zero_defconfig @@ -1,8 +1,9 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero" BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero" BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y @@ -12,7 +13,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.3" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.3" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -34,11 +35,12 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_PACKAGE_HOST_GENIMAGE=y