* [Buildroot] [PATCH 1/3] configs/pine64: bump U-Boot version to 2024.07
@ 2024-09-01 16:42 Mattia Narducci
2024-09-01 16:44 ` [Buildroot] [PATCH 2/3] configs/pine64: bump TF-A version to 2.10.5 Mattia Narducci
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Mattia Narducci @ 2024-09-01 16:42 UTC (permalink / raw)
To: buildroot; +Cc: Jagan Teki
Update U-Boot to fix the following error when building with
python-setuptools >= 69, that is, since 6b62384e3d
("package/python-setuptools: bump to version 69.0.3"):
packaging.version.InvalidVersion: Invalid version: 'u-boot-2019.01'
make[5]: *** [scripts/dtc/pylibfdt/Makefile:27: scripts/dtc/pylibfdt/_libfdt.so] Error 1
make[4]: *** [scripts/Makefile.build:434: scripts/dtc/pylibfdt] Error 2
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [scripts/Makefile.build:434: scripts/dtc] Error 2
make[2]: *** [Makefile:508: scripts] Error 2
make[1]: *** [package/pkg-generic.mk:289: output/build/uboot-2019.01/.stamp_built] Error 2
make: *** [Makefile:83: _all] Error 2
Use SPL and U-Boot FIT image combined into u-boot-sunxi-with-spl.bin.
Do not use the optional System Control Processor (SCP) firmware pointing
the SCP env variable to /dev/null.
Signed-off-by: Mattia Narducci <mattianarducci1@gmail.com>
---
board/pine64/pine64/genimage.cfg | 12 +++---------
configs/pine64_defconfig | 8 ++++----
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/board/pine64/pine64/genimage.cfg b/board/pine64/pine64/genimage.cfg
index 06b4ed1056..3555869036 100644
--- a/board/pine64/pine64/genimage.cfg
+++ b/board/pine64/pine64/genimage.cfg
@@ -14,17 +14,11 @@ image sdcard.img {
hdimage {
}
- partition spl {
- in-partition-table = "no"
- image = "sunxi-spl.bin"
- offset = 8K
- }
-
partition u-boot {
in-partition-table = "no"
- image = "u-boot.itb"
- offset = 40K
- size = 1M # 1MB - 40KB
+ image = "u-boot-sunxi-with-spl.bin"
+ offset = 8K
+ size = 1016K # 1MB - 8KB
}
partition boot {
diff --git a/configs/pine64_defconfig b/configs/pine64_defconfig
index c454114d2a..a6ddf6e57b 100644
--- a/configs/pine64_defconfig
+++ b/configs/pine64_defconfig
@@ -16,15 +16,15 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.07"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pine64_plus"
BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
+BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
-BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
-BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb"
BR2_TARGET_UBOOT_SPL=y
-BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"
+BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin"
+BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null"
BR2_PACKAGE_HOST_UBOOT_TOOLS=y
BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/pine64/pine64/boot.cmd"
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Buildroot] [PATCH 2/3] configs/pine64: bump TF-A version to 2.10.5
2024-09-01 16:42 [Buildroot] [PATCH 1/3] configs/pine64: bump U-Boot version to 2024.07 Mattia Narducci
@ 2024-09-01 16:44 ` Mattia Narducci
2024-09-01 16:46 ` [Buildroot] [PATCH 3/3] configs/pine64: bump Linux to version 6.6.48 Mattia Narducci
2024-09-03 19:53 ` [Buildroot] [PATCH 1/3] configs/pine64: bump U-Boot version to 2024.07 Thomas Petazzoni via buildroot
2 siblings, 0 replies; 5+ messages in thread
From: Mattia Narducci @ 2024-09-01 16:44 UTC (permalink / raw)
To: buildroot; +Cc: Jagan Teki
Signed-off-by: Mattia Narducci <mattianarducci1@gmail.com>
---
configs/pine64_defconfig | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/configs/pine64_defconfig b/configs/pine64_defconfig
index a6ddf6e57b..fb3a468f2d 100644
--- a/configs/pine64_defconfig
+++ b/configs/pine64_defconfig
@@ -8,9 +8,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y
# Firmware
BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="lts-v2.10.5"
BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
# Bootloader
BR2_TARGET_UBOOT=y
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 3/3] configs/pine64: bump Linux to version 6.6.48
2024-09-01 16:42 [Buildroot] [PATCH 1/3] configs/pine64: bump U-Boot version to 2024.07 Mattia Narducci
2024-09-01 16:44 ` [Buildroot] [PATCH 2/3] configs/pine64: bump TF-A version to 2.10.5 Mattia Narducci
@ 2024-09-01 16:46 ` Mattia Narducci
2024-09-03 19:53 ` [Buildroot] [PATCH 1/3] configs/pine64: bump U-Boot version to 2024.07 Thomas Petazzoni via buildroot
2 siblings, 0 replies; 5+ messages in thread
From: Mattia Narducci @ 2024-09-01 16:46 UTC (permalink / raw)
To: buildroot; +Cc: Jagan Teki
Bump Linux to the latest LTS version 6.6.48 and increase rootfs size to
fit kernel modules.
Signed-off-by: Mattia Narducci <mattianarducci1@gmail.com>
---
configs/pine64_defconfig | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/configs/pine64_defconfig b/configs/pine64_defconfig
index fb3a468f2d..1a3d1ab6fe 100644
--- a/configs/pine64_defconfig
+++ b/configs/pine64_defconfig
@@ -2,8 +2,8 @@ BR2_aarch64=y
BR2_cortex_a53=y
BR2_ARM_FPU_VFPV4=y
-# Linux headers same as kernel, a 5.0 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y
+# Linux headers same as kernel, a 6.6 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
# Firmware
BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
@@ -31,7 +31,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/pine64/pine64/boot.cmd"
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.48"
BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-pine64"
@@ -41,6 +41,7 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
BR2_TARGET_GENERIC_ISSUE="Welcome to PINE64"
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
BR2_PACKAGE_HOST_DOSFSTOOLS=y
BR2_PACKAGE_HOST_GENIMAGE=y
BR2_PACKAGE_HOST_MTOOLS=y
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/3] configs/pine64: bump U-Boot version to 2024.07
2024-09-01 16:42 [Buildroot] [PATCH 1/3] configs/pine64: bump U-Boot version to 2024.07 Mattia Narducci
2024-09-01 16:44 ` [Buildroot] [PATCH 2/3] configs/pine64: bump TF-A version to 2.10.5 Mattia Narducci
2024-09-01 16:46 ` [Buildroot] [PATCH 3/3] configs/pine64: bump Linux to version 6.6.48 Mattia Narducci
@ 2024-09-03 19:53 ` Thomas Petazzoni via buildroot
2024-09-04 19:54 ` Mattia Narducci
2 siblings, 1 reply; 5+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-09-03 19:53 UTC (permalink / raw)
To: Mattia Narducci; +Cc: Jagan Teki, buildroot
On Sun, 01 Sep 2024 18:42:58 +0200
Mattia Narducci <mattianarducci1@gmail.com> wrote:
> Update U-Boot to fix the following error when building with
> python-setuptools >= 69, that is, since 6b62384e3d
> ("package/python-setuptools: bump to version 69.0.3"):
>
> packaging.version.InvalidVersion: Invalid version: 'u-boot-2019.01'
> make[5]: *** [scripts/dtc/pylibfdt/Makefile:27: scripts/dtc/pylibfdt/_libfdt.so] Error 1
> make[4]: *** [scripts/Makefile.build:434: scripts/dtc/pylibfdt] Error 2
> make[4]: *** Waiting for unfinished jobs....
> make[3]: *** [scripts/Makefile.build:434: scripts/dtc] Error 2
> make[2]: *** [Makefile:508: scripts] Error 2
> make[1]: *** [package/pkg-generic.mk:289: output/build/uboot-2019.01/.stamp_built] Error 2
> make: *** [Makefile:83: _all] Error 2
>
> Use SPL and U-Boot FIT image combined into u-boot-sunxi-with-spl.bin.
>
> Do not use the optional System Control Processor (SCP) firmware pointing
> the SCP env variable to /dev/null.
>
> Signed-off-by: Mattia Narducci <mattianarducci1@gmail.com>
> ---
> board/pine64/pine64/genimage.cfg | 12 +++---------
> configs/pine64_defconfig | 8 ++++----
> 2 files changed, 7 insertions(+), 13 deletions(-)
Series applied to next. However, if possible I'd like you to test/send
a follow-up patch.
> partition u-boot {
> in-partition-table = "no"
> - image = "u-boot.itb"
> - offset = 40K
> - size = 1M # 1MB - 40KB
> + image = "u-boot-sunxi-with-spl.bin"
> + offset = 8K
> + size = 1016K # 1MB - 8KB
Here this "size" field is a bit silly. We don't really care that the
size is 1016KB. What we care is that the offset is 8 KB, and that the
next partition is aligned on a good boundary.
So could you test something like:
https://patchwork.ozlabs.org/project/buildroot/patch/tencent_92439641515553684D208B3331676FB36C05@qq.com/
instead?
Thanks!
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] 5+ messages in thread
end of thread, other threads:[~2024-09-04 19:54 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-01 16:42 [Buildroot] [PATCH 1/3] configs/pine64: bump U-Boot version to 2024.07 Mattia Narducci
2024-09-01 16:44 ` [Buildroot] [PATCH 2/3] configs/pine64: bump TF-A version to 2.10.5 Mattia Narducci
2024-09-01 16:46 ` [Buildroot] [PATCH 3/3] configs/pine64: bump Linux to version 6.6.48 Mattia Narducci
2024-09-03 19:53 ` [Buildroot] [PATCH 1/3] configs/pine64: bump U-Boot version to 2024.07 Thomas Petazzoni via buildroot
2024-09-04 19:54 ` Mattia Narducci
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox