From: Tom Rini <trini@konsulko.com>
Date: Fri, 12 Sep 2025 22:34:58 +0000 (-0600)
Subject: Revert "sandbox: replace deprecated getenv() with env_get()"
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f0c1704f56dba70da93f30131564af777c29c1bd;p=thirdparty%2Fu-boot.git

Revert "sandbox: replace deprecated getenv() with env_get()"

While testing changes, I missed that Gitlab had failed CI with pytest
failures due to this change.

This reverts commit 4c822970d366415e717730606734e815993a70bb.

Cc: Osama Abdelkader <osama.abdelkader@gmail.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---

diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c
index adb6b586946..f5c9a8aecf2 100644
--- a/arch/sandbox/cpu/os.c
+++ b/arch/sandbox/cpu/os.c
@@ -35,7 +35,6 @@
 #include <asm/state.h>
 #include <os.h>
 #include <rtc_def.h>
-#include <env.h>
 
 /* Environment variable for time offset */
 #define ENV_TIME_OFFSET "UBOOT_SB_TIME_OFFSET"
@@ -284,7 +283,7 @@ int os_unmap(void *buf, int size)
 
 int os_persistent_file(char *buf, int maxsize, const char *fname)
 {
-	const char *dirname = env_get("U_BOOT_PERSISTENT_DATA_DIR");
+	const char *dirname = getenv("U_BOOT_PERSISTENT_DATA_DIR");
 	char *ptr;
 	int len;
 
@@ -1015,7 +1014,7 @@ long os_get_time_offset(void)
 {
 	const char *offset;
 
-	offset = env_get(ENV_TIME_OFFSET);
+	offset = getenv(ENV_TIME_OFFSET);
 	if (offset)
 		return strtol(offset, NULL, 0);
 	return 0;
@@ -1133,7 +1132,7 @@ static void *fuzzer_thread(void * ptr)
 	const char *fuzz_test;
 
 	/* Find which test to run from an environment variable. */
-	fuzz_test = env_get("UBOOT_SB_FUZZ_TEST");
+	fuzz_test = getenv("UBOOT_SB_FUZZ_TEST");
 	if (!fuzz_test)
 		os_abort();