Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-03-16 23:07:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Pull request doc-2023-10-rc5-2

Browse source 
Documentation:
 
 * fix code comments referring to doc/develop/expo.rst
 * remove unused values from Chromebook kernel command line
 * correct reference tag placement in tools/binman/binman.rst
 
 Others:
 
 * test: fix build dependency for event unit tests
 -----BEGIN PGP SIGNATURE-----
 
 iQJWBAABCABAFiEEK7wKXt3/btL6/yA+hO4vgnE3U0sFAmUF1qMiHGhlaW5yaWNo
 LnNjaHVjaGFyZHRAY2Fub25pY2FsLmNvbQAKCRCE7i+CcTdTSxXmD/0dMJZQ9PPu
 Oko87Z7ToFFF3mQr6hkNU9UVSH2Qg5CUMKoVRAKeIRTX/cZPj6bHMDgrZOY2ZBHh
 Sz2KvACcisKoF/QD0ob7mp6zDazYqDAd/iDV1Dbo/1KZQ2+SqUO15qV/0tdp1HQw
 f2qNNtNeNA6f3LkKce0EV3ymwvli1/D16MuFac+S8NOz/bnCV1ISLiP5H6p9L0RJ
 mecJ96QIYQv6xr1XwY4Coq2jyZkkrXMXuhnivj7Q6Z7//Uy8uNNzUojtWW8YtdIB
 uU/ZE6PKpea8Zcjte/PTEwxSvQxqGEVUrifAom4+oFnPwzwoPmBYx9PB9q1Z3eOO
 KR+f/j+dyTvlgrYTfOzbW9uUgLMKlL2zHvQL3HDYrkPpMg4O3/4UoRyg9gQHlVXm
 P8uTKXukgXMNoCrlZdLpWfJuRu2F70TLu6YrDcQyBpJz6DMoVapmT42gTVUNCYR0
 KdxKQBywGNBa0xDwmxFfi9i9iCyaKkrAktWt+FuFSrLFwJzFf26YeBHUqXJZt/Xa
 iPl4zOXbS7jfUfyWZZAkU38jds/O5dsARKEVxzt/Lmc1QhQlqFS3d60zXcZ8uzLm
 v76QeYDnih2G5gVdz4mhrxXfnk2bKcCWdUBIPeROCSZmwU+Nnlih3diiRuQvMoo6
 6uulC6hixOEvhzdFezUJ6XPb+3dFXJdbZg==
 =oIBw
 -----END PGP SIGNATURE-----

Merge tag 'doc-2023-10-rc5-2' of https://source.denx.de/u-boot/custodians/u-boot-efi

Pull request doc-2023-10-rc5-2

Documentation:

* fix code comments referring to doc/develop/expo.rst
* remove unused values from Chromebook kernel command line
* correct reference tag placement in tools/binman/binman.rst

Others:

* test: fix build dependency for event unit tests
This commit is contained in:
Tom Rini 2023-09-17 09:24:42 -04:00
commit 064f29e48d
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
boot/expo_build.c
View file

@ -209,7 +209,7 @@ static void list_strings(struct build_info *info)
/**
* menu_build() - Build a menu and add it to a scene
*
* See doc/developer/expo.rst for a description of the format
* See doc/develop/expo.rst for a description of the format
*
* @info: Build information
* @node: Node containing the menu description
@ -282,7 +282,7 @@ static int menu_build(struct build_info *info, ofnode node, struct scene *scn)
/**
* menu_build() - Build an expo object and add it to a scene
*
* See doc/developer/expo.rst for a description of the format
* See doc/develop/expo.rst for a description of the format
*
* @info: Build information
* @node: Node containing the object description
@ -318,7 +318,7 @@ static int obj_build(struct build_info *info, ofnode node, struct scene *scn)
/**
* scene_build() - Build a scene and all its objects
*
* See doc/developer/expo.rst for a description of the format
* See doc/develop/expo.rst for a description of the format
*
* @info: Build information
* @node: Node containing the scene description

4
doc/board/google/chromebook_coral.rst
View file

@ -88,7 +88,7 @@ Here is the console output::
Net: No ethernet found.
SF: Detected w25q128fw with page size 256 Bytes, erase size 4 KiB, total 16 MiB
Hit any key to stop autoboot: 0
cmdline=console= loglevel=7 init=/sbin/init cros_secure oops=panic panic=-1 root=PARTUUID=${uuid}/PARTNROFF=1 rootwait rw dm_verity.error_behavior=3 dm_verity.max_bios=-1 dm_verity.dev_wait=0 dm="1 vroot none rw 1,0 3788800 verity payload=ROOT_DEV hashtree=HASH_DEV hashstart=3788800 alg=sha1 root_hexdigest=55052b629d3ac889f25a9583ea12cdcd3ea15ff8 salt=a2d4d9e574069f4fed5e3961b99054b7a4905414b60a25d89974a7334021165c" noinitrd vt.global_cursor_default=0 kern_guid=${uuid} add_efi_memmap boot=local noresume noswap i915.modeset=1 Kernel command line: "console= loglevel=7 init=/sbin/init cros_secure oops=panic panic=-1 root=PARTUUID=35c775e7-3735-d745-93e5-d9e0238f7ed0/PARTNROFF=1 rootwait rw dm_verity.error_behavior=3 dm_verity.max_bios=-1 dm_verity.dev_wait=0 dm="1 vroot none rw 1,0 3788800 verity payload=ROOT_DEV hashtree=HASH_DEV hashstart=3788800 alg=sha1 root_hexdigest=55052b629d3ac889f25a9583ea12cdcd3ea15ff8 salt=a2d4d9e574069f4fed5e3961b99054b7a4905414b60a25d89974a7334021165c" noinitrd vt.global_cursor_default=0 kern_guid=35c775e7-3735-d745-93e5-d9e0238f7ed0 add_efi_memmap boot=local noresume noswap i915.modeset=1 tpm_tis.force=1 tpm_tis.interrupts=0 nmi_watchdog=panic,lapic disablevmx=off "
cmdline=console= loglevel=7 init=/sbin/init cros_secure oops=panic panic=-1 root=PARTUUID=${uuid}/PARTNROFF=1 rootwait rw dm_verity.error_behavior=3 dm_verity.max_bios=-1 dm_verity.dev_wait=0 dm="1 vroot none rw 1,0 3788800 verity payload=ROOT_DEV hashtree=HASH_DEV hashstart=3788800 alg=sha1 root_hexdigest=55052b629d3ac889f25a9583ea12cdcd3ea15ff8 salt=a2d4d9e574069f4fed5e3961b99054b7a4905414b60a25d89974a7334021165c" noinitrd vt.global_cursor_default=0 kern_guid=${uuid} add_efi_memmap noresume i915.modeset=1 Kernel command line: "console= loglevel=7 init=/sbin/init cros_secure oops=panic panic=-1 root=PARTUUID=35c775e7-3735-d745-93e5-d9e0238f7ed0/PARTNROFF=1 rootwait rw dm_verity.error_behavior=3 dm_verity.max_bios=-1 dm_verity.dev_wait=0 dm="1 vroot none rw 1,0 3788800 verity payload=ROOT_DEV hashtree=HASH_DEV hashstart=3788800 alg=sha1 root_hexdigest=55052b629d3ac889f25a9583ea12cdcd3ea15ff8 salt=a2d4d9e574069f4fed5e3961b99054b7a4905414b60a25d89974a7334021165c" noinitrd vt.global_
Setup located at 00090000:
ACPI RSDP addr : 7991f000
@ -136,7 +136,7 @@ Here is the console output::
Ext loader ver : 0
Ext loader type : 0
Command line ptr : 99000
console= loglevel=7 init=/sbin/init cros_secure oops=panic panic=-1 root=PARTUUID=35c775e7-3735-d745-93e5-d9e0238f7ed0/PARTNROFF=1 rootwait rw dm_verity.error_behavior=3 dm_verity.max_bios=-1 dm_verity.dev_wait=0 dm="1 vroot none rw 1,0 3788800 verity payload=ROOT_DEV hashtree=HASH_DEV hashstart=3788800 alg=sha1 root_hexdigest=55052b629d3ac889f25a9583ea12cdcd3ea15ff8 salt=a2d4d9e574069f4fed5e3961b99054b7a4905414b60a25d89974a7334021165c" noinitrd vt.global_cursor_default=0 kern_guid=35c775e7-3735-d745-93e5-d9e0238f7ed0 add_efi_memmap boot=local noresume noswap i915.modeset=1 tpm_tis.force=1 tpm_tis.interrupts=0 nmi_watchdog=panic,lapic disablevmx=off
console= loglevel=7 init=/sbin/init cros_secure oops=panic panic=-1 root=PARTUUID=35c775e7-3735-d745-93e5-d9e0238f7ed0/PARTNROFF=1 rootwait rw dm_verity.error_behavior=3 dm_verity.max_bios=-1 dm_verity.dev_wait=0 dm="1 vroot none rw 1,0 3788800 verity payload=ROOT_DEV hashtree=HASH_DEV hashstart=3788800 alg=sha1 root_hexdigest=55052b629d3ac889f25a9583ea12cdcd3ea15ff8 salt=a2d4d9e574069f4fed5e3961b99054b7a4905414b60a25d89974a7334021165c" noinitrd vt.global_cursor_default=0 kern_guid=35c775e7-3735-d745-93e5-d9e0238f7ed0 add_efi_memmap noresume i915.modeset=1 tpm_tis.force=1 tpm_tis.interrupts=0 nmi_watchdog=panic,lapic disablevmx=off
Initrd addr max : 7fffffff
Kernel alignment : 200000
Relocatable kernel : 1

4
doc/usage/cmd/bootflow.rst
View file

@ -495,8 +495,8 @@ the cmdline is word-wrapped here and some parts of the command line are elided::
root_hexdigest=78cc462cd45aecbcd49ca476587b4dee59aa1b00ba5ece58e2c29ec9acd914ab
salt=8dec4dc80a75dd834a9b3175c674405e15b16a253fdfe05c79394ae5fd76f66a"
noinitrd vt.global_cursor_default=0
kern_guid=799c935b-ae62-d143-8493-816fa936eef7 add_efi_memmap boot=local
noresume noswap i915.modeset=1 ramoops.ecc=1 tpm_tis.force=0
kern_guid=799c935b-ae62-d143-8493-816fa936eef7 add_efi_memmap
noresume i915.modeset=1 ramoops.ecc=1 tpm_tis.force=0
intel_pmc_core.warn_on_s0ix_failures=1 i915.enable_guc=3 i915.enable_dc=4
xdomain=0 swiotlb=65536 intel_iommu=on i915.enable_psr=1
usb-storage.quirks=13fe:6500:u

2
include/expo.h
View file

@ -667,7 +667,7 @@ int expo_apply_theme(struct expo *exp, ofnode node);
*
* Build a complete expo from a description in the provided devicetree.
*
* See doc/developer/expo.rst for a description of the format
* See doc/develop/expo.rst for a description of the format
*
* @root: Root node for expo description
* @expp: Returns the new expo

2
test/common/Makefile
View file

@ -2,5 +2,5 @@
obj-y += cmd_ut_common.o
obj-$(CONFIG_AUTOBOOT) += test_autoboot.o
obj-$(CONFIG_CYCLIC) += cyclic.o
obj-$(CONFIG_EVENT) += event.o
obj-$(CONFIG_EVENT_DYNAMIC) += event.o
obj-y += cread.o

2
tools/binman/binman.rst
View file

@ -1482,7 +1482,6 @@ when it was created.
Repacking an image involves
.. _`BinmanLogging`:
Signing FIT container with private key in an image
--------------------------------------------------
@ -1501,6 +1500,7 @@ If you want to sign and replace FIT container in place::
which will sign FIT container with private key and replace it immediately
inside your image.
.. _`BinmanLogging`:
Logging
-------