* [Buildroot] [PATCH 1/3] boot/uboot: remove BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE
@ 2024-04-10 21:44 Romain Naour
2024-04-10 21:44 ` [Buildroot] [PATCH 2/3] boot/{uboot, ti-k3-r5-loader}: remove uneeded python-jsonschema dependency Romain Naour
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Romain Naour @ 2024-04-10 21:44 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour
As suggested by Arnout during the review [1], we can assume that U-Boot
needs ti-k3-boot-firmware when it is selected (likely by
ti-k3-r5-loader).
We can remove BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE without
legacy handling since this option is not part of any Buildroot
release.
[1] http://lists.busybox.net/pipermail/buildroot/2024-April/689263.html
Cc: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
Config.in.legacy | 3 +--
boot/uboot/Config.in | 11 -----------
boot/uboot/uboot.mk | 6 +++++-
configs/ti_am62x_sk_defconfig | 1 -
configs/ti_am64x_sk_defconfig | 1 -
5 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index 76af1da348..f67187e92d 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -154,9 +154,8 @@ config BR2_TARGET_TI_K3_IMAGE_GEN
U-Boot binman tool (requires U-boot >= 2023.10).
config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM
- bool "u-boot TI K3 DM option has been renamed."
+ bool "u-boot TI K3 DM option has been removed."
select BR2_LEGACY
- select BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE
help
The TI K3 Device Manager is already included in
ti-k3-boot-firmware.
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 8d2228dc7d..8133b780bb 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -240,17 +240,6 @@ config BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE
U-Boot, and that the TEE variable pointing to OPTEE's
tee.elf, is passed during the Buildroot build.
-config BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE
- bool "U-Boot needs ti-k3-boot-firmware"
- depends on BR2_TARGET_TI_K3_BOOT_FIRMWARE
- help
- TI K3 devices needs at least ti-sysfw (System Firmware) when
- built with u-boot's binman tool.
-
- Some TI K3 devices using a split firmware boot flow (AM62,
- j721e) also need the Device Manager (DM) firmware to be
- available for the U-Boot build.
-
config BR2_TARGET_UBOOT_NEEDS_OPENSBI
bool "U-Boot needs OpenSBI"
depends on BR2_TARGET_OPENSBI
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index a894654698..c3baa75e49 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -194,7 +194,11 @@ UBOOT_DEPENDENCIES += optee-os
UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf
endif
-ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE),y)
+# TI K3 devices needs at least ti-sysfw (System Firmware) provided
+# by ti-k3-boot-firmware when built with u-boot's binman tool.
+# Some TI K3 devices using a split firmware boot flow (AM62,
+# j721e) also need the Device Manager (DM) firmware.
+ifeq ($(BR2_TARGET_TI_K3_BOOT_FIRMWARE),y)
UBOOT_DEPENDENCIES += ti-k3-boot-firmware
endif
diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig
index 5c7b97b3b0..a0b4c21216 100644
--- a/configs/ti_am62x_sk_defconfig
+++ b/configs/ti_am62x_sk_defconfig
@@ -37,7 +37,6 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53"
BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
-BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE=y
BR2_TARGET_UBOOT_USE_BINMAN=y
# BR2_TARGET_UBOOT_FORMAT_BIN is not set
BR2_TARGET_UBOOT_FORMAT_IMG=y
diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig
index 28e97f94e2..8dbe0fae33 100644
--- a/configs/ti_am64x_sk_defconfig
+++ b/configs/ti_am64x_sk_defconfig
@@ -37,7 +37,6 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am64x_evm_a53"
BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
-BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE=y
BR2_TARGET_UBOOT_USE_BINMAN=y
# BR2_TARGET_UBOOT_FORMAT_BIN is not set
BR2_TARGET_UBOOT_FORMAT_IMG=y
--
2.44.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/3] boot/{uboot, ti-k3-r5-loader}: remove uneeded python-jsonschema dependency
2024-04-10 21:44 [Buildroot] [PATCH 1/3] boot/uboot: remove BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE Romain Naour
@ 2024-04-10 21:44 ` Romain Naour
2024-05-06 10:51 ` Peter Korsgaard
2024-04-10 21:44 ` [Buildroot] [PATCH 3/3] board/ti/am6{2, 4}x: add missing uboot.hash file Romain Naour
2024-05-06 10:51 ` [Buildroot] [PATCH 1/3] boot/uboot: remove BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE Peter Korsgaard
2 siblings, 1 reply; 6+ messages in thread
From: Romain Naour @ 2024-04-10 21:44 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, James Hilliard
Commits 8a4c3c91e7 ("boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option")
and 1aec483412 ("boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option")
added the python-jsonschema (target variant) dependency to the binman
option while only host-python-jsonschema is required.
http://lists.busybox.net/pipermail/buildroot/2024-April/689291.html
Reported-by: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
boot/ti-k3-r5-loader/Config.in | 1 -
boot/uboot/Config.in | 1 -
2 files changed, 2 deletions(-)
diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in
index 6d1adbeac3..9a47d2bfcd 100644
--- a/boot/ti-k3-r5-loader/Config.in
+++ b/boot/ti-k3-r5-loader/Config.in
@@ -1,7 +1,6 @@
config BR2_TARGET_TI_K3_R5_LOADER
bool "ti-k3-r5-loader"
depends on BR2_aarch64
- depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema
select BR2_TARGET_TI_K3_BOOT_FIRMWARE # binman
help
Separate U-Boot SPL build for R5 core on TI's K3 processors.
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 8133b780bb..ba95964139 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -273,7 +273,6 @@ config BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN
config BR2_TARGET_UBOOT_USE_BINMAN
bool "U-Boot use binman"
- depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema
select BR2_TARGET_UBOOT_NEEDS_PYTHON3
select BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS
select BR2_TARGET_UBOOT_NEEDS_PYLIBFDT
--
2.44.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 3/3] board/ti/am6{2, 4}x: add missing uboot.hash file
2024-04-10 21:44 [Buildroot] [PATCH 1/3] boot/uboot: remove BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE Romain Naour
2024-04-10 21:44 ` [Buildroot] [PATCH 2/3] boot/{uboot, ti-k3-r5-loader}: remove uneeded python-jsonschema dependency Romain Naour
@ 2024-04-10 21:44 ` Romain Naour
2024-05-06 10:51 ` Peter Korsgaard
2024-05-06 10:51 ` [Buildroot] [PATCH 1/3] boot/uboot: remove BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE Peter Korsgaard
2 siblings, 1 reply; 6+ messages in thread
From: Romain Naour @ 2024-04-10 21:44 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour
Arnout noticed during the review that uboot.hash was missing from
BR2_GLOBAL_PATCH_DIR.
"The hash for 2024.01 is currently in boot/uboot/uboot.hash, but as soon as we
update the U-Boot version, it will no longer be. So to be future safe, we should
add a local override of the uboot hash file as well (which is simply identical
to uboot.hash)."
This is required since BR2_DOWNLOAD_FORCE_CHECK_HASHES is now enabled.
[1] http://lists.busybox.net/pipermail/buildroot/2024-April/689283.html
Reported-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
board/ti/am62x-sk/patches/uboot/uboot.hash | 2 ++
board/ti/am64x-sk/patches/uboot/uboot.hash | 2 ++
2 files changed, 4 insertions(+)
create mode 100644 board/ti/am62x-sk/patches/uboot/uboot.hash
create mode 100644 board/ti/am64x-sk/patches/uboot/uboot.hash
diff --git a/board/ti/am62x-sk/patches/uboot/uboot.hash b/board/ti/am62x-sk/patches/uboot/uboot.hash
new file mode 100644
index 0000000000..0e171c56f5
--- /dev/null
+++ b/board/ti/am62x-sk/patches/uboot/uboot.hash
@@ -0,0 +1,2 @@
+# Locally computed:
+sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2
diff --git a/board/ti/am64x-sk/patches/uboot/uboot.hash b/board/ti/am64x-sk/patches/uboot/uboot.hash
new file mode 100644
index 0000000000..0e171c56f5
--- /dev/null
+++ b/board/ti/am64x-sk/patches/uboot/uboot.hash
@@ -0,0 +1,2 @@
+# Locally computed:
+sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2
--
2.44.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH 1/3] boot/uboot: remove BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE
2024-04-10 21:44 [Buildroot] [PATCH 1/3] boot/uboot: remove BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE Romain Naour
2024-04-10 21:44 ` [Buildroot] [PATCH 2/3] boot/{uboot, ti-k3-r5-loader}: remove uneeded python-jsonschema dependency Romain Naour
2024-04-10 21:44 ` [Buildroot] [PATCH 3/3] board/ti/am6{2, 4}x: add missing uboot.hash file Romain Naour
@ 2024-05-06 10:51 ` Peter Korsgaard
2 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2024-05-06 10:51 UTC (permalink / raw)
To: Romain Naour; +Cc: buildroot
>>>>> "Romain" == Romain Naour <romain.naour@smile.fr> writes:
> As suggested by Arnout during the review [1], we can assume that U-Boot
> needs ti-k3-boot-firmware when it is selected (likely by
> ti-k3-r5-loader).
> We can remove BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE without
> legacy handling since this option is not part of any Buildroot
> release.
> [1] http://lists.busybox.net/pipermail/buildroot/2024-April/689263.html
> Cc: Arnout Vandecappelle <arnout@mind.be>
> Signed-off-by: Romain Naour <romain.naour@smile.fr>
Committed, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH 2/3] boot/{uboot, ti-k3-r5-loader}: remove uneeded python-jsonschema dependency
2024-04-10 21:44 ` [Buildroot] [PATCH 2/3] boot/{uboot, ti-k3-r5-loader}: remove uneeded python-jsonschema dependency Romain Naour
@ 2024-05-06 10:51 ` Peter Korsgaard
0 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2024-05-06 10:51 UTC (permalink / raw)
To: Romain Naour; +Cc: James Hilliard, buildroot
>>>>> "Romain" == Romain Naour <romain.naour@smile.fr> writes:
> Commits 8a4c3c91e7 ("boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option")
> and 1aec483412 ("boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option")
> added the python-jsonschema (target variant) dependency to the binman
> option while only host-python-jsonschema is required.
> http://lists.busybox.net/pipermail/buildroot/2024-April/689291.html
> Reported-by: James Hilliard <james.hilliard1@gmail.com>
> Signed-off-by: Romain Naour <romain.naour@smile.fr>
Committed, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH 3/3] board/ti/am6{2, 4}x: add missing uboot.hash file
2024-04-10 21:44 ` [Buildroot] [PATCH 3/3] board/ti/am6{2, 4}x: add missing uboot.hash file Romain Naour
@ 2024-05-06 10:51 ` Peter Korsgaard
0 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2024-05-06 10:51 UTC (permalink / raw)
To: Romain Naour; +Cc: buildroot
>>>>> "Romain" == Romain Naour <romain.naour@smile.fr> writes:
> Arnout noticed during the review that uboot.hash was missing from
> BR2_GLOBAL_PATCH_DIR.
> "The hash for 2024.01 is currently in boot/uboot/uboot.hash, but as soon as we
> update the U-Boot version, it will no longer be. So to be future safe, we should
> add a local override of the uboot hash file as well (which is simply identical
> to uboot.hash)."
> This is required since BR2_DOWNLOAD_FORCE_CHECK_HASHES is now enabled.
> [1] http://lists.busybox.net/pipermail/buildroot/2024-April/689283.html
> Reported-by: Arnout Vandecappelle <arnout@mind.be>
> Signed-off-by: Romain Naour <romain.naour@smile.fr>
Committed, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-05-06 10:51 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-10 21:44 [Buildroot] [PATCH 1/3] boot/uboot: remove BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE Romain Naour
2024-04-10 21:44 ` [Buildroot] [PATCH 2/3] boot/{uboot, ti-k3-r5-loader}: remove uneeded python-jsonschema dependency Romain Naour
2024-05-06 10:51 ` Peter Korsgaard
2024-04-10 21:44 ` [Buildroot] [PATCH 3/3] board/ti/am6{2, 4}x: add missing uboot.hash file Romain Naour
2024-05-06 10:51 ` Peter Korsgaard
2024-05-06 10:51 ` [Buildroot] [PATCH 1/3] boot/uboot: remove BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE Peter Korsgaard
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.