Pull request efi-next-20251225 (for next branch)
Dear Tom,
The following changes since commit baf076aeb32dcdd2b022405088c3288ffc160fcf:
Merge branch 'staging' of
https://source.denx.de/u-boot/custodians/u-boot-tegra into next (2025-12-23 08:11:36 -0600)
are available in the Git repository at:
https://source.denx.de/u-boot/custodians/u-boot-efi.git
tags/efi-next-20251225
for you to fetch changes up to 4c105d2ae7b0f847668ff1ef6b410f63ab4290b7:
doc: board: starfive: update jh7110 common description (2025-12-24
09:41:57 +0100)
----------------------------------------------------------------
Pull request efi-next-20251225
Documentation:
* Update StarFive Jh7110 common description.
* Describe command line options of the bdinfo command.
* Describe configuration dependencies of the bdinfo command.
UEFI:
* Trigger capsule updates with automatically generated boot options.
* In the LoadImage unit test add a check that device-paths are correctly used.
* In the variables at runtime test remove an unnecessary __efi_runtime_data attribute.
Others:
* Let the bdinfo command output device-tree information even if LMB is no used.
* Add long help texts for all options of the bdinfo command.
----------------------------------------------------------------
E Shattow (1):
doc: board: starfive: update jh7110 common description
Heinrich Schuchardt (4):
efi_selftest: Enhance LoadImage test
efi_selftest: remove unnecessary __efi_runtime_data attribute
test: dm: clk_ccf: clean up assert statements cmd/bdinfo: LMB and device-tree are not related
Ilias Apalodimas (1):
efi_loader: Trigger capsule updates with automatically generated
boot options
Quentin Schulz (3):
cmd: bdinfo: provide long help with all options
doc: cmd: bdinfo: specify required dependency for some info
doc: cmd: bdinfo: document options
cmd/bdinfo.c | 25 +- doc/board/starfive/deepcomputing_fml13v01.rst | 32 -- doc/board/starfive/jh7110_common.rst | 640 +++++++++++++++++++--- doc/board/starfive/milk-v_mars.rst | 73 --- doc/board/starfive/pine64_star64.rst | 77 +-- doc/board/starfive/visionfive2.rst | 449 --------------- doc/usage/cmd/bdinfo.rst | 62 ++- lib/efi_loader/efi_capsule.c | 68 ++- lib/efi_selftest/efi_selftest_loadimage.c | 45 ++ lib/efi_selftest/efi_selftest_variables_runtime.c | 3 +- test/cmd/bdinfo.c | 19 +- test/dm/clk_ccf.c | 42 +- 12 files changed, 763 insertions(+), 772 deletions(-)
Quoted 9 lines · Heinrich Schuchardt
The following changes since commit
baf076aeb32dcdd2b022405088c3288ffc160fcf:Merge branch 'staging' of
https://source.denx.de/u-boot/custodians/u-boot-tegra into next (2025-12-23 08:11:36 -0600)are available in the Git repository at:
[...]
Merged into u-boot/next, thanks!
Signature · 1 line
Tom
Hi,
Quoted 8 lines · Tom Rini
Quoted 6 lines · Heinrich Schuchardt
The following changes since commit
baf076aeb32dcdd2b022405088c3288ffc160fcf:Merge branch 'staging' of
https://source.denx.de/u-boot/custodians/u-boot-tegra into next (2025-12-23 08:11:36 -0600)
Quoted 6 lines
Quoted 3 lines
are available in the Git repository at:
[...]
Merged into u-boot/next, thanks!
Tom:
NAK 4c105d2ae7b "Update StarFive Jh7110 common description" that has been incorrectly applied and the result contains factual errors I did not author which are now (wrongly) attributed to me:
Review
Quoted 1 line
(quoted diff) +0
-0
b/doc/board/starfive/jh7110_common.rst
Quoted 5 lines
index
9beab941cc1..77102fcc189100644doc/board/starfive/jh7110_common.rst +0
-0@@ -232,16 +232,11 @@ pull-down. RGPIO1 RGPIO0 StarFive loader function @ 0x2A00_0000
doc/board/starfive/jh7110_common.rst pull-down. · line 240
Quoted 10 lines
doc/board/starfive/jh7110_common.rst +2
-3====== ====== ====================================== 0 0 1-bit QSPI Flash offset 0x0 -0 1 SDIO3.0 -1 0 eMMC5.0 or eMMC5.1 +0 1 SDIO3.0 *(deprecated)* +1 0 eMMC5.0 or eMMC5.1 *(deprecated)* 1 1 UART Serial XMODEM loader ====== ====== ====================================== -Booting from SD-card or eMMC is only available on boards that have
separate
doc/board/starfive/jh7110_common.rst pull-down. · line 241
Quoted 1 line
doc/board/starfive/jh7110_common.rst +0
-1-switches for RGPIO0 and RGPIO1 (Milk-V Mars, StarFive VisionFive 2,
Pine64
doc/board/starfive/jh7110_common.rst pull-down. · line 240
Quoted 4 lines
doc/board/starfive/jh7110_common.rst +0
-3-Star64). Due to reported compatibility issues with some SD-cards it is -considered deprecated by StarFive. - According to `JH-7110 Boot User Guide BootROM`_ the StarFive loader
code reads
doc/board/starfive/jh7110_common.rst pull-down. · line 241
Quoted 1 line
doc/board/starfive/jh7110_common.rst +0
-0content to SRAM @ 0x0800_0000 from different media selected by
[RGPIO1,RGPIO0].
Please revert 4c105d2ae7b and re-apply from the publicly reviewed patch:
"[PATCH v4] doc: board: starfive: update jh7110 common description"
https://lore.kernel.org/u-boot/[email protected]/
-E
Quentin Schulz
Reviewed-by Heinrich SchuchardtHi Heinrich,
Quoted 50 lines · Heinrich Schuchardt
Dear Tom,
The following changes since commit
baf076aeb32dcdd2b022405088c3288ffc160fcf:Merge branch 'staging' of https://
eur02.safelinks.protection.outlook.com/? url=https%3A%2F%2Fsource.denx.de%2Fu-boot%2Fcustodians%2Fu-boot- tegra&data=05%7C02%7Cquentin.schulz%40cherry.de%7Cf87dd0f90d6b45f7ce7508de439e34da%7C5e0e1b5221b54e7b83bb514ec460677e%7C0%7C0%7C639022543931009936%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU1hcGkiOnRydWUsIlYiOiIwLjAuMDAwMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIsIldUIjoyfQ%3D%3D%7C0%7C%7C%7C&sdata=UrWok7nyXyLT97iLd1o%2FxUIuYtwkRz7DcO8D8ogdH7Y%3D&reserved=0 into next (2025-12-23 08:11:36 -0600)are available in the Git repository at:
https://eur02.safelinks.protection.outlook.com/?
url=https%3A%2F%2Fsource.denx.de%2Fu-boot%2Fcustodians%2Fu-boot- efi.git&data=05%7C02%7Cquentin.schulz%40cherry.de%7Cf87dd0f90d6b45f7ce7508de439e34da%7C5e0e1b5221b54e7b83bb514ec460677e%7C0%7C0%7C639022543931023452%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU1hcGkiOnRydWUsIlYiOiIwLjAuMDAwMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIsIldUIjoyfQ%3D%3D%7C0%7C%7C%7C&sdata=noF%2B4QWCdd9uds%2FLv5wxiCynT7PNTHKQFnDHXYn2%2BqQ%3D&reserved=0 tags/efi-next-20251225for you to fetch changes up to
4c105d2ae7b0f847668ff1ef6b410f63ab4290b7:doc: board: starfive: update jh7110 common description (2025-12-24
09:41:57 +0100)----------------------------------------------------------------
Pull request efi-next-20251225Documentation:
* Update StarFive Jh7110 common description.
* Describe command line options of the bdinfo command.
* Describe configuration dependencies of the bdinfo command.UEFI:
* Trigger capsule updates with automatically generated boot options.
* In the LoadImage unit test add a check that device-paths are correctly used.
* In the variables at runtime test remove an unnecessary__efi_runtime_dataattribute.Others:
* Let the bdinfo command output device-tree information even if LMB is no used.
* Add long help texts for all options of the bdinfo command.----------------------------------------------------------------
E Shattow (1):
doc: board: starfive: update jh7110 common descriptionHeinrich Schuchardt (4):
efi_selftest: Enhance LoadImage test
efi_selftest: remove unnecessary__efi_runtime_dataattribute
test: dm:clk_ccf: clean up assert statements cmd/bdinfo: LMB and device-tree are not related
Quoted 7 lines
Ilias Apalodimas (1):
efi_loader: Trigger capsule updates with automatically generated
boot optionsQuentin Schulz (3):
cmd: bdinfo: provide long help with all options
doc: cmd: bdinfo: specify required dependency for some info
In the future, can you please consider editing the commit log when you're doing modifications to patches when merging them?
Something like
? So that there's some info about what was changed from the patch that was sent to the ML and by whom?
(Maybe ask for permission before doing this as well, or maybe we should have documentation on what can be expected from maintainers to that regard? I know Buildroot does this a lot (and often silently), Yocto sometimes, but the kernel not too often, and it's the first time (that I know of) it happens to me in U-Boot :) )
I'm generally not a fan of my patches being silently modified before merging, though here it ended up fine so thanks for sparing me the rebase+v3 respin I was thinking about starting to do :)
Cheers,
Quentin
Quoted 84 lines · Quentin Schulz
Hi Heinrich,
Quoted 54 lines · Heinrich Schuchardt
Dear Tom,
The following changes since commit
baf076aeb32dcdd2b022405088c3288ffc160fcf:Merge branch 'staging' of https://
eur02.safelinks.protection.outlook.com/?
url=https%3A%2F%2Fsource.denx.de%2Fu-boot%2Fcustodians%2Fu-boot- tegra&data=05%7C02%7Cquentin.schulz%40cherry.de%7Cf87dd0f90d6b45f7ce7508de439e34da%7C5e0e1b5221b54e7b83bb514ec460677e%7C0%7C0%7C639022543931009936%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU1hcGkiOnRydWUsIlYiOiIwLjAuMDAwMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIsIldUIjoyfQ%3D%3D%7C0%7C%7C%7C&sdata=UrWok7nyXyLT97iLd1o%2FxUIuYtwkRz7DcO8D8ogdH7Y%3D&reserved=0 into next (2025-12-23 08:11:36 -0600)are available in the Git repository at:
https://eur02.safelinks.protection.outlook.com/?
url=https%3A%2F%2Fsource.denx.de%2Fu-boot%2Fcustodians%2Fu-boot- efi.git&data=05%7C02%7Cquentin.schulz%40cherry.de%7Cf87dd0f90d6b45f7ce7508de439e34da%7C5e0e1b5221b54e7b83bb514ec460677e%7C0%7C0%7C639022543931023452%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU1hcGkiOnRydWUsIlYiOiIwLjAuMDAwMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIsIldUIjoyfQ%3D%3D%7C0%7C%7C%7C&sdata=noF%2B4QWCdd9uds%2FLv5wxiCynT7PNTHKQFnDHXYn2%2BqQ%3D&reserved=0 tags/efi-next-20251225for you to fetch changes up to
4c105d2ae7b0f847668ff1ef6b410f63ab4290b7:doc: board: starfive: update jh7110 common description (2025-12-24
09:41:57 +0100)----------------------------------------------------------------
Pull request efi-next-20251225Documentation:
* Update StarFive Jh7110 common description.
* Describe command line options of the bdinfo command.
* Describe configuration dependencies of the bdinfo command.UEFI:
* Trigger capsule updates with automatically generated boot options.
* In the LoadImage unit test add a check that device-paths are correctly used.
* In the variables at runtime test remove an unnecessary__efi_runtime_dataattribute.Others:
* Let the bdinfo command output device-tree information even if LMB is no used.
* Add long help texts for all options of the bdinfo command.----------------------------------------------------------------
E Shattow (1):
doc: board: starfive: update jh7110 common descriptionHeinrich Schuchardt (4):
efi_selftest: Enhance LoadImage test
efi_selftest: remove unnecessary__efi_runtime_dataattribute
test: dm:clk_ccf: clean up assert statements cmd/bdinfo: LMB and device-tree are not relatedQuoted 7 lines
Ilias Apalodimas (1):
efi_loader: Trigger capsule updates with automatically generated
boot optionsQuentin Schulz (3):
cmd: bdinfo: provide long help with all options
doc: cmd: bdinfo: specify required dependency for some infoIn the future, can you please consider editing the commit log when you're doing modifications to patches when merging them?
Something like
Signed-off-by Quentin Schulz <[email protected]>[added symbol dependency to lmb_dump_all][removed CONFIG_LMB as symbol dependency of devicetree]Reviewed-by Heinrich Schuchardt <[email protected]>? So that there's some info about what was changed from the patch that was sent to the ML and by whom?
(Maybe ask for permission before doing this as well, or maybe we should have documentation on what can be expected from maintainers to that regard? I know Buildroot does this a lot (and often silently), Yocto sometimes, but the kernel not too often, and it's the first time (that I know of) it happens to me in U-Boot :) )
Quoted 3 lines
I'm generally not a fan of my patches being silently modified before merging, though here it ended up fine so thanks for sparing me the rebase+v3 respin I was thinking about starting to do :)
I have, over the years, sometimes added [trini: foo] and a SoB tag, and more recently made us of b4 making merge commits of a series trivial (which is great and this is yet another reminder to anyone reading that cover letters on series are important because they become the merge commit message) and dealing with both merge issues and trivially correct changes such as spelling or spacing fixes in the merge commit itself.
What this does speak to however is that we need to document the expectations here as it's clear implicit expectations have been violated, and that's on me in the end to make sure are clear and explicit. I'll write up something for doc/develop/process.rst in the next few days.
Signature · 1 line
Tom
Hi all, an update follows confirming the revert of commit 4c105d2ae7b0:
Quoted 96 lines · Tom Rini
Quoted 84 lines · Quentin Schulz
Hi Heinrich,
Quoted 54 lines · Heinrich Schuchardt
Dear Tom,
The following changes since commit
baf076aeb32dcdd2b022405088c3288ffc160fcf:Merge branch 'staging' of https://
eur02.safelinks.protection.outlook.com/?
url=https%3A%2F%2Fsource.denx.de%2Fu-boot%2Fcustodians%2Fu-boot- tegra&data=05%7C02%7Cquentin.schulz%40cherry.de%7Cf87dd0f90d6b45f7ce7508de439e34da%7C5e0e1b5221b54e7b83bb514ec460677e%7C0%7C0%7C639022543931009936%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU1hcGkiOnRydWUsIlYiOiIwLjAuMDAwMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIsIldUIjoyfQ%3D%3D%7C0%7C%7C%7C&sdata=UrWok7nyXyLT97iLd1o%2FxUIuYtwkRz7DcO8D8ogdH7Y%3D&reserved=0 into next (2025-12-23 08:11:36 -0600)are available in the Git repository at:
https://eur02.safelinks.protection.outlook.com/?
url=https%3A%2F%2Fsource.denx.de%2Fu-boot%2Fcustodians%2Fu-boot- efi.git&data=05%7C02%7Cquentin.schulz%40cherry.de%7Cf87dd0f90d6b45f7ce7508de439e34da%7C5e0e1b5221b54e7b83bb514ec460677e%7C0%7C0%7C639022543931023452%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU1hcGkiOnRydWUsIlYiOiIwLjAuMDAwMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIsIldUIjoyfQ%3D%3D%7C0%7C%7C%7C&sdata=noF%2B4QWCdd9uds%2FLv5wxiCynT7PNTHKQFnDHXYn2%2BqQ%3D&reserved=0 tags/efi-next-20251225for you to fetch changes up to
4c105d2ae7b0f847668ff1ef6b410f63ab4290b7:doc: board: starfive: update jh7110 common description (2025-12-24
09:41:57 +0100)----------------------------------------------------------------
Pull request efi-next-20251225Documentation:
* Update StarFive Jh7110 common description.
* Describe command line options of the bdinfo command.
* Describe configuration dependencies of the bdinfo command.UEFI:
* Trigger capsule updates with automatically generated boot options.
* In the LoadImage unit test add a check that device-paths are correctly used.
* In the variables at runtime test remove an unnecessary__efi_runtime_dataattribute.Others:
* Let the bdinfo command output device-tree information even if LMB is no used.
* Add long help texts for all options of the bdinfo command.----------------------------------------------------------------
E Shattow (1):
doc: board: starfive: update jh7110 common descriptionHeinrich Schuchardt (4):
efi_selftest: Enhance LoadImage test
efi_selftest: remove unnecessary__efi_runtime_dataattribute
test: dm:clk_ccf: clean up assert statements cmd/bdinfo: LMB and device-tree are not relatedQuoted 7 lines
Ilias Apalodimas (1):
efi_loader: Trigger capsule updates with automatically generated
boot optionsQuentin Schulz (3):
cmd: bdinfo: provide long help with all options
doc: cmd: bdinfo: specify required dependency for some infoIn the future, can you please consider editing the commit log when you're doing modifications to patches when merging them?
Something like
Signed-off-by Quentin Schulz <[email protected]>[added symbol dependency to lmb_dump_all][removed CONFIG_LMB as symbol dependency of devicetree]Reviewed-by Heinrich Schuchardt <[email protected]>? So that there's some info about what was changed from the patch that was sent to the ML and by whom?
(Maybe ask for permission before doing this as well, or maybe we should have documentation on what can be expected from maintainers to that regard? I know Buildroot does this a lot (and often silently), Yocto sometimes, but the kernel not too often, and it's the first time (that I know of) it happens to me in U-Boot :) )
Quoted 3 lines
I'm generally not a fan of my patches being silently modified before merging, though here it ended up fine so thanks for sparing me the rebase+v3 respin I was thinking about starting to do :)
I have, over the years, sometimes added [trini: foo] and a SoB tag, and more recently made us of b4 making merge commits of a series trivial (which is great and this is yet another reminder to anyone reading that cover letters on series are important because they become the merge commit message) and dealing with both merge issues and trivially correct changes such as spelling or spacing fixes in the merge commit itself.
Quoted 6 lines
What this does speak to however is that we need to document the expectations here as it's clear implicit expectations have been violated, and that's on me in the end to make sure are clear and explicit. I'll write up something for
doc/develop/process.rstin the next few days.
Patch commit 4c105d2ae7b0 "doc: board: starfive: update jh7110 common description" is reverted in commit d503633a3676. There's a discussion ongoing about improving process documentation "doc/develop/process.rst:
Expand on the Custodian workflow":
https://lore.kernel.org/u-boot/[email protected]/
With the assistance today of Tom for the revert I consider the mishandling resolved. Thanks, Tom!
For Heinrich, as to the content of my peer-reviewed patch if there is a serious objection to its original format such that it needs to cycle on the list another round or two prior to re-application then that is okay; Let us know if another round is needed. In any case I welcome that the patch be handled without delay as it was reviewed.
-E