From 50cbdaba66ac0fc1bd8d915a2452c54a120f06f6 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Mon, 24 Nov 2025 16:44:06 -0600 Subject: doc: pytest: fix hook script environment variable names Fix the names of environment variables set for hook scripts. These have a U_BOOT_ prefix, not UBOOT_. Signed-off-by: David Lechner --- doc/develop/pytest/usage.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'doc/develop') diff --git a/doc/develop/pytest/usage.rst b/doc/develop/pytest/usage.rst index 7335a39b963..7c42a31528f 100644 --- a/doc/develop/pytest/usage.rst +++ b/doc/develop/pytest/usage.rst @@ -315,14 +315,14 @@ Environment variables The following environment variables are set when running hook scripts: -- ``UBOOT_BOARD_TYPE`` the board type being tested. -- ``UBOOT_BOARD_IDENTITY`` the board identity being tested, or ``na`` if none +- ``U_BOOT_BOARD_TYPE`` the board type being tested. +- ``U_BOOT_BOARD_IDENTITY`` the board identity being tested, or ``na`` if none was specified. -- ``UBOOT_SOURCE_DIR`` the U-Boot source directory. -- ``UBOOT_TEST_PY_DIR`` the full path to ``test/py/`` in the source directory. -- ``UBOOT_BUILD_DIR`` the U-Boot build directory. -- ``UBOOT_RESULT_DIR`` the test result directory. -- ``UBOOT_PERSISTENT_DATA_DIR`` the test persistent data directory. +- ``U_BOOT_SOURCE_DIR`` the U-Boot source directory. +- ``U_BOOT_TEST_PY_DIR`` the full path to ``test/py/`` in the source directory. +- ``U_BOOT_BUILD_DIR`` the U-Boot build directory. +- ``U_BOOT_RESULT_DIR`` the test result directory. +- ``U_BOOT_PERSISTENT_DATA_DIR`` the test persistent data directory. u-boot-test-console ''''''''''''''''''' -- cgit v1.2.3 From 18e2a059ff3f04e21cf2f17af59d2c812cebc517 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Mon, 24 Nov 2025 16:44:07 -0600 Subject: doc: pytest: add missing hook script env vars Add the _EXTRA variants of U_BOOT_BUILD_DIR and U_BOOT_RESULT_DIR to the list of environment variables set for hook scripts. These were added in commit 8f2a9fa7d6e7 ("test: Support testing with two board-builds") but were not documented. Signed-off-by: David Lechner --- doc/develop/pytest/usage.rst | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc/develop') diff --git a/doc/develop/pytest/usage.rst b/doc/develop/pytest/usage.rst index 7c42a31528f..df3821da20d 100644 --- a/doc/develop/pytest/usage.rst +++ b/doc/develop/pytest/usage.rst @@ -316,11 +316,13 @@ Environment variables The following environment variables are set when running hook scripts: - ``U_BOOT_BOARD_TYPE`` the board type being tested. +- ``U_BOOT_BOARD_TYPE_EXTRA`` the 2nd board type being tested, if applicable. - ``U_BOOT_BOARD_IDENTITY`` the board identity being tested, or ``na`` if none was specified. - ``U_BOOT_SOURCE_DIR`` the U-Boot source directory. - ``U_BOOT_TEST_PY_DIR`` the full path to ``test/py/`` in the source directory. - ``U_BOOT_BUILD_DIR`` the U-Boot build directory. +- ``U_BOOT_BUILD_DIR_EXTRA`` the 2nd U-Boot build directory, if applicable. - ``U_BOOT_RESULT_DIR`` the test result directory. - ``U_BOOT_PERSISTENT_DATA_DIR`` the test persistent data directory. -- cgit v1.2.3 From 0e0a198a68be71148f5ec27ef86796174f91436f Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 8 Dec 2025 12:54:47 -0600 Subject: Prepare v2026.01-rc4 Signed-off-by: Tom Rini --- doc/develop/release_cycle.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/develop') diff --git a/doc/develop/release_cycle.rst b/doc/develop/release_cycle.rst index 56cbfcb4b65..be6b09b250e 100644 --- a/doc/develop/release_cycle.rst +++ b/doc/develop/release_cycle.rst @@ -77,7 +77,7 @@ For the next scheduled release, release candidates were made on: * U-Boot |next_ver|-rc3 was released on Mon 24 November 2025. -.. * U-Boot |next_ver|-rc4 was released on Mon 08 December 2025. +* U-Boot |next_ver|-rc4 was released on Mon 08 December 2025. .. * U-Boot |next_ver|-rc5 was released on Tue 22 December 2025. -- cgit v1.2.3