[Buildroot] [PATCH v2 0/1] configs/roc_pc_rk3399: Bump Linux, U-Boot, TF-A

[Buildroot] [PATCH v2 0/1] configs/roc_pc_rk3399: Bump Linux, U-Boot, TF-A

[Roberto Medina]

v2 -> v1:
- Enable checking hashes and add relevant hash files.
- Move from Glibc to uClibc.

Roberto Medina (1):
  configs/roc_pc_rk3399: Bump Linux, U-Boot, TF-A

 .../arm-trusted-firmware/arm-trusted-firmware.hash    |  2 ++
 .../patches/linux-headers/linux-headers.hash          |  1 +
 board/firefly/roc-rk3399-pc/patches/linux/linux.hash  |  2 ++
 board/firefly/roc-rk3399-pc/patches/uboot/uboot.hash  |  2 ++
 configs/roc_pc_rk3399_defconfig                       | 11 +++++++----
 5 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 board/firefly/roc-rk3399-pc/patches/arm-trusted-firmware/arm-trusted-firmware.hash
 create mode 120000 board/firefly/roc-rk3399-pc/patches/linux-headers/linux-headers.hash
 create mode 100644 board/firefly/roc-rk3399-pc/patches/linux/linux.hash
 create mode 100644 board/firefly/roc-rk3399-pc/patches/uboot/uboot.hash

-- 
2.47.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2 1/1] configs/roc_pc_rk3399: Bump Linux, U-Boot, TF-A

[Roberto Medina]

- Bump Linux to 6.6.56 (LTS).
- Bump U-Boot to 2024.07, so it contains commit ebb0ad4eef0a ("arch: arm:
mach-rockchip: Kconfig: Enable BOOTSTD_FULL for RK3399 and RK3588").
- Bump TF-A to 2.11.
- Enable hash checking: BR2_DOWNLOAD_FORCE_CHECK_HASHES.
- Add relevant hashes in the patches folder for the board.
- Use uClibc for toolchain instead of Glibc.

Signed-off-by: Roberto Medina <robertoxmed@gmail.com>
---
 .../arm-trusted-firmware/arm-trusted-firmware.hash    |  2 ++
 .../patches/linux-headers/linux-headers.hash          |  1 +
 board/firefly/roc-rk3399-pc/patches/linux/linux.hash  |  2 ++
 board/firefly/roc-rk3399-pc/patches/uboot/uboot.hash  |  2 ++
 configs/roc_pc_rk3399_defconfig                       | 11 +++++++----
 5 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 board/firefly/roc-rk3399-pc/patches/arm-trusted-firmware/arm-trusted-firmware.hash
 create mode 120000 board/firefly/roc-rk3399-pc/patches/linux-headers/linux-headers.hash
 create mode 100644 board/firefly/roc-rk3399-pc/patches/linux/linux.hash
 create mode 100644 board/firefly/roc-rk3399-pc/patches/uboot/uboot.hash

diff --git a/board/firefly/roc-rk3399-pc/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/firefly/roc-rk3399-pc/patches/arm-trusted-firmware/arm-trusted-firmware.hash
new file mode 100644
index 0000000000..8b77e1f165
--- /dev/null
+++ b/board/firefly/roc-rk3399-pc/patches/arm-trusted-firmware/arm-trusted-firmware.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256  c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22  arm-trusted-firmware-v2.11-git4.tar.gz
diff --git a/board/firefly/roc-rk3399-pc/patches/linux-headers/linux-headers.hash b/board/firefly/roc-rk3399-pc/patches/linux-headers/linux-headers.hash
new file mode 120000
index 0000000000..5808d92afe
--- /dev/null
+++ b/board/firefly/roc-rk3399-pc/patches/linux-headers/linux-headers.hash
@@ -0,0 +1 @@
+../linux/linux.hash
\ No newline at end of file
diff --git a/board/firefly/roc-rk3399-pc/patches/linux/linux.hash b/board/firefly/roc-rk3399-pc/patches/linux/linux.hash
new file mode 100644
index 0000000000..98edd13a58
--- /dev/null
+++ b/board/firefly/roc-rk3399-pc/patches/linux/linux.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256  f74812f78e88992c416434cb107639e13a551dbaff36bb90d6346ab16ab71a95  linux-6.6.56.tar.xz
diff --git a/board/firefly/roc-rk3399-pc/patches/uboot/uboot.hash b/board/firefly/roc-rk3399-pc/patches/uboot/uboot.hash
new file mode 100644
index 0000000000..fe9b4f53dc
--- /dev/null
+++ b/board/firefly/roc-rk3399-pc/patches/uboot/uboot.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256  f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f  u-boot-2024.07.tar.bz2
diff --git a/configs/roc_pc_rk3399_defconfig b/configs/roc_pc_rk3399_defconfig
index 1323752683..920354ba81 100644
--- a/configs/roc_pc_rk3399_defconfig
+++ b/configs/roc_pc_rk3399_defconfig
@@ -1,6 +1,9 @@
 BR2_aarch64=y
 BR2_cortex_a72_a53=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
+BR2_TOOLCHAIN_BUILDROOT_UCLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
+BR2_GLOBAL_PATCH_DIR="board/firefly/roc-rk3399-pc/patches"
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
 BR2_TARGET_GENERIC_HOSTNAME="roc-rk3399-pc"
 BR2_TARGET_GENERIC_ISSUE="Welcome to ROC-RK3399-PC!"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/firefly/roc-rk3399-pc/post-build.sh"
@@ -8,7 +11,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/firefly/roc-rk3399-pc/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.61"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.56"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-roc-pc"
@@ -21,14 +24,14 @@ BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O 64bit"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.9"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.11"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES=""
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=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.07"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="roc-pc-rk3399"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
-- 
2.47.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 1/1] configs/roc_pc_rk3399: Bump Linux, U-Boot, TF-A

[Julien Olivain]

Hi Roberto,

Thanks for the update.

On 25/10/2024 11:32, Roberto Medina wrote:
> - Bump Linux to 6.6.56 (LTS).
> - Bump U-Boot to 2024.07, so it contains commit ebb0ad4eef0a ("arch: 
> arm:
> mach-rockchip: Kconfig: Enable BOOTSTD_FULL for RK3399 and RK3588").
> - Bump TF-A to 2.11.
> - Enable hash checking: BR2_DOWNLOAD_FORCE_CHECK_HASHES.
> - Add relevant hashes in the patches folder for the board.
> - Use uClibc for toolchain instead of Glibc.
> 
> Signed-off-by: Roberto Medina <robertoxmed@gmail.com>
> ---
>  .../arm-trusted-firmware/arm-trusted-firmware.hash    |  2 ++
>  .../patches/linux-headers/linux-headers.hash          |  1 +
>  board/firefly/roc-rk3399-pc/patches/linux/linux.hash  |  2 ++
>  board/firefly/roc-rk3399-pc/patches/uboot/uboot.hash  |  2 ++
>  configs/roc_pc_rk3399_defconfig                       | 11 +++++++----
>  5 files changed, 14 insertions(+), 4 deletions(-)
>  create mode 100644 
> board/firefly/roc-rk3399-pc/patches/arm-trusted-firmware/arm-trusted-firmware.hash
>  create mode 120000 
> board/firefly/roc-rk3399-pc/patches/linux-headers/linux-headers.hash
>  create mode 100644 
> board/firefly/roc-rk3399-pc/patches/linux/linux.hash
>  create mode 100644 
> board/firefly/roc-rk3399-pc/patches/uboot/uboot.hash
> 
> diff --git 
> a/board/firefly/roc-rk3399-pc/patches/arm-trusted-firmware/arm-trusted-firmware.hash 
> b/board/firefly/roc-rk3399-pc/patches/arm-trusted-firmware/arm-trusted-firmware.hash
> new file mode 100644
> index 0000000000..8b77e1f165
> --- /dev/null
> +++ 
> b/board/firefly/roc-rk3399-pc/patches/arm-trusted-firmware/arm-trusted-firmware.hash
> @@ -0,0 +1,2 @@
> +# Locally calculated
> +sha256  
> c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22  
> arm-trusted-firmware-v2.11-git4.tar.gz
> diff --git 
> a/board/firefly/roc-rk3399-pc/patches/linux-headers/linux-headers.hash 
> b/board/firefly/roc-rk3399-pc/patches/linux-headers/linux-headers.hash
> new file mode 120000
> index 0000000000..5808d92afe
> --- /dev/null
> +++ 
> b/board/firefly/roc-rk3399-pc/patches/linux-headers/linux-headers.hash
> @@ -0,0 +1 @@
> +../linux/linux.hash
> \ No newline at end of file
> diff --git a/board/firefly/roc-rk3399-pc/patches/linux/linux.hash 
> b/board/firefly/roc-rk3399-pc/patches/linux/linux.hash
> new file mode 100644
> index 0000000000..98edd13a58
> --- /dev/null
> +++ b/board/firefly/roc-rk3399-pc/patches/linux/linux.hash
> @@ -0,0 +1,2 @@
> +# Locally calculated
> +sha256  
> f74812f78e88992c416434cb107639e13a551dbaff36bb90d6346ab16ab71a95  
> linux-6.6.56.tar.xz
> diff --git a/board/firefly/roc-rk3399-pc/patches/uboot/uboot.hash 
> b/board/firefly/roc-rk3399-pc/patches/uboot/uboot.hash
> new file mode 100644
> index 0000000000..fe9b4f53dc
> --- /dev/null
> +++ b/board/firefly/roc-rk3399-pc/patches/uboot/uboot.hash
> @@ -0,0 +1,2 @@
> +# Locally calculated
> +sha256  
> f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f  
> u-boot-2024.07.tar.bz2
> diff --git a/configs/roc_pc_rk3399_defconfig 
> b/configs/roc_pc_rk3399_defconfig
> index 1323752683..920354ba81 100644
> --- a/configs/roc_pc_rk3399_defconfig
> +++ b/configs/roc_pc_rk3399_defconfig
> @@ -1,6 +1,9 @@
>  BR2_aarch64=y
>  BR2_cortex_a72_a53=y
> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
> +BR2_TOOLCHAIN_BUILDROOT_UCLIBC=y

Buildroot board defconfigs should have limited customization.

Is there a specific reason (other than having a smaller footprint) for
which you switched to UCLIBC?

If not, could you please send an updated version without it?

Apart from that, the rest of the patch looks fine.

> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
> +BR2_GLOBAL_PATCH_DIR="board/firefly/roc-rk3399-pc/patches"
> +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
>  BR2_TARGET_GENERIC_HOSTNAME="roc-rk3399-pc"
>  BR2_TARGET_GENERIC_ISSUE="Welcome to ROC-RK3399-PC!"
>  
> BR2_ROOTFS_POST_BUILD_SCRIPT="board/firefly/roc-rk3399-pc/post-build.sh"
> @@ -8,7 +11,7 @@ 
> BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
>  BR2_ROOTFS_POST_SCRIPT_ARGS="-c 
> board/firefly/roc-rk3399-pc/genimage.cfg"
>  BR2_LINUX_KERNEL=y
>  BR2_LINUX_KERNEL_CUSTOM_VERSION=y
> -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.61"
> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.56"
>  BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
>  BR2_LINUX_KERNEL_DTS_SUPPORT=y
>  BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-roc-pc"
> @@ -21,14 +24,14 @@ BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O 64bit"
>  BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
>  BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
>  
> BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git"
> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.9"
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v2.11"
>  BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399"
>  BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES=""
>  BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=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.07"
>  BR2_TARGET_UBOOT_BOARD_DEFCONFIG="roc-pc-rk3399"
>  BR2_TARGET_UBOOT_NEEDS_DTC=y
>  BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
> --
> 2.47.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

Best regards,

Julien.
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 1/1] configs/roc_pc_rk3399: Bump Linux, U-Boot, TF-A

[Thomas Petazzoni via buildroot]

Hello Roberto,

On Fri, 25 Oct 2024 10:32:48 +0100
Roberto Medina <robertoxmed@gmail.com> wrote:

> - Bump Linux to 6.6.56 (LTS).
> - Bump U-Boot to 2024.07, so it contains commit ebb0ad4eef0a ("arch: arm:
> mach-rockchip: Kconfig: Enable BOOTSTD_FULL for RK3399 and RK3588").
> - Bump TF-A to 2.11.
> - Enable hash checking: BR2_DOWNLOAD_FORCE_CHECK_HASHES.
> - Add relevant hashes in the patches folder for the board.
> - Use uClibc for toolchain instead of Glibc.

Thanks a lot for the new iteration, but why are you switching to
uclibc? We don't want our defconfigs to select particular toolchain
options: they should use the default provided by Buildroot.

Could you send a v3 without this change to uclibc, or provide an
explanation?

Thanks a lot!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2 1/1] configs/roc_pc_rk3399: Bump Linux, U-Boot, TF-A

[Roberto Medina]

Hello Thomas, Julien,

On 11/4/24 10:14 PM, Thomas Petazzoni wrote:
> Could you send a v3 without this change to uclibc, or provide an
> explanation?

Had some issues building the image on the container with Glibc for some 
reason. Probably a bad clean on my side when testing.

Submitted a v3 reverting this change. Thanks for the feedback.

Best regards,
Roberto


_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot