+// SPDX-License-Identifier: GPL-2.0+
/*
* An inteface for configuring a hardware via u-boot environment.
*
* Copyright 2011 Freescale Semiconductor, Inc.
*
* Author: Anton Vorontsov <avorontsov@ru.mvista.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef HWCONFIG_TEST
#include <config.h>
#include <common.h>
+#include <env.h>
#include <exports.h>
#include <hwconfig.h>
+#include <log.h>
+#include <asm/global_data.h>
#include <linux/types.h>
#include <linux/string.h>
#else
/* if we are passed a buffer use it, otherwise try the environment */
if (!env_hwconfig) {
- if (!(gd->flags & GD_FLG_ENV_READY)) {
+ if (!(gd->flags & GD_FLG_ENV_READY) && gd->env_valid != ENV_VALID) {
printf("WARNING: Calling __hwconfig without a buffer "
"and before environment is ready\n");
return NULL;
}
- env_hwconfig = getenv("hwconfig");
+#if CONFIG_IS_ENABLED(ENV_SUPPORT)
+ env_hwconfig = env_get("hwconfig");
+#endif
}
if (env_hwconfig) {
*
* This call is similar to hwconfig_f(), except that it takes additional
* argument @subopt. In this example:
- * "dr_usb:mode=peripheral"
+ * "dr_usb:mode=peripheral"
* "dr_usb" is an option, "mode" is a sub-option, and "peripheral" is its
* argument.
*/
const char *ret;
size_t len;
- setenv("hwconfig", "key1:subkey1=value1,subkey2=value2;key2:value3;;;;"
+ env_set("hwconfig", "key1:subkey1=value1,subkey2=value2;key2:value3;;;;"
"key3;:,:=;key4", 1);
ret = hwconfig_arg("key1", &len);
assert(hwconfig_arg("key4", &len) == NULL);
assert(hwconfig_arg("bogus", &len) == NULL);
- unsetenv("hwconfig");
+ unenv_set("hwconfig");
assert(hwconfig(NULL) == 0);
assert(hwconfig("") == 0);