From fdd6a7733fd9e7d27f51a00c26fc1ad168d11a43 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Thu, 7 Sep 2023 18:43:17 +0200 Subject: test: build dependency for event unit tests The test_event_base and test_event_probe unit tests use function event_register() which depends on CONFIG_EVENT_DYNAMIC=y. Fixes: 7d02645fe4c0 ("event: Add a simple test") Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- test/common/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/common/Makefile b/test/common/Makefile index a5ab10f6f69..12c65f8c951 100644 --- a/test/common/Makefile +++ b/test/common/Makefile @@ -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 -- cgit v1.3.1 From 17d98f84e0eb9fa5b0c498f5ff014852958574f2 Mon Sep 17 00:00:00 2001 From: Jaewon Jung Date: Fri, 8 Sep 2023 17:00:01 +0900 Subject: doc: delete unused values kernel command line Delete "boot=local", "noswap" unused values in kernel command line Signed-off-by: Jaewon Jung Reviewed-by: Simon Glass --- doc/board/google/chromebook_coral.rst | 4 ++-- doc/usage/cmd/bootflow.rst | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/board/google/chromebook_coral.rst b/doc/board/google/chromebook_coral.rst index 23e2db45564..1eda769c752 100644 --- a/doc/board/google/chromebook_coral.rst +++ b/doc/board/google/chromebook_coral.rst @@ -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 diff --git a/doc/usage/cmd/bootflow.rst b/doc/usage/cmd/bootflow.rst index a8af1f8f603..65e3777cdc4 100644 --- a/doc/usage/cmd/bootflow.rst +++ b/doc/usage/cmd/bootflow.rst @@ -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 -- cgit v1.3.1 From a3a057f83977531966284bde50de07a8bd7a6651 Mon Sep 17 00:00:00 2001 From: Massimo Pegorer Date: Sat, 9 Sep 2023 12:32:28 +0200 Subject: expo: Fix documentation reference Fix typo: doc/develop/expo.rst instead of doc/developer/expo.rst Signed-off-by: Massimo Pegorer Reviewed-by: Simon Glass Signed-off-by: Heinrich Schuchardt --- boot/expo_build.c | 6 +++--- include/expo.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/boot/expo_build.c b/boot/expo_build.c index 22f62eb54bc..702bf498908 100644 --- a/boot/expo_build.c +++ b/boot/expo_build.c @@ -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 diff --git a/include/expo.h b/include/expo.h index 0b1d944a169..e8f7d7d6ffb 100644 --- a/include/expo.h +++ b/include/expo.h @@ -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 -- cgit v1.3.1 From 8bd7d08407f986fe3c69f3e198f6f7152e12dea8 Mon Sep 17 00:00:00 2001 From: Massimo Pegorer Date: Sat, 9 Sep 2023 15:52:35 +0200 Subject: binman: doc: fix reference tag placement for Logging section Move BinmanLogging reference tag after section "Signing FIT container with private key in an image" and just before section "Logging". Fixes: 0f40e23fd22 ("binman: add documentation for binman sign option") Signed-off-by: Massimo Pegorer Reviewed-by: Heinrich Schuchardt --- tools/binman/binman.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/binman/binman.rst b/tools/binman/binman.rst index aeea33fddb9..8945b19446c 100644 --- a/tools/binman/binman.rst +++ b/tools/binman/binman.rst @@ -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 ------- -- cgit v1.3.1