summaryrefslogtreecommitdiffstats
path: root/package/boot/uboot-mediatek/patches/220-cmd-env-readmem.patch
diff options
context:
space:
mode:
Diffstat (limited to 'package/boot/uboot-mediatek/patches/220-cmd-env-readmem.patch')
-rw-r--r--package/boot/uboot-mediatek/patches/220-cmd-env-readmem.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/package/boot/uboot-mediatek/patches/220-cmd-env-readmem.patch b/package/boot/uboot-mediatek/patches/220-cmd-env-readmem.patch
index 7bf87ef7b5..58f7d316a6 100644
--- a/package/boot/uboot-mediatek/patches/220-cmd-env-readmem.patch
+++ b/package/boot/uboot-mediatek/patches/220-cmd-env-readmem.patch
@@ -1,6 +1,6 @@
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
-@@ -622,6 +622,12 @@ config CMD_ENV_EXISTS
+@@ -683,6 +683,12 @@ config CMD_ENV_EXISTS
Check if a variable is defined in the environment for use in
shell scripting.
@@ -15,7 +15,7 @@
help
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
-@@ -385,6 +385,60 @@ int do_env_ask(struct cmd_tbl *cmdtp, in
+@@ -273,6 +273,60 @@ int do_env_ask(struct cmd_tbl *cmdtp, in
}
#endif
@@ -69,14 +69,14 @@
+ unmap_sysmem(buf);
+
+ /* Continue calling setenv code */
-+ return _do_env_set(flag, 3, local_args, H_INTERACTIVE);
++ return env_do_env_set(flag, 3, local_args, H_INTERACTIVE);
+}
+#endif
+
#if defined(CONFIG_CMD_ENV_CALLBACK)
static int print_static_binding(const char *var_name, const char *callback_name,
void *priv)
-@@ -1201,6 +1255,9 @@ static struct cmd_tbl cmd_env_sub[] = {
+@@ -1089,6 +1143,9 @@ static struct cmd_tbl cmd_env_sub[] = {
U_BOOT_CMD_MKENT(load, 1, 0, do_env_load, "", ""),
#endif
U_BOOT_CMD_MKENT(print, CONFIG_SYS_MAXARGS, 1, do_env_print, "", ""),
@@ -86,7 +86,7 @@
#if defined(CONFIG_CMD_RUN)
U_BOOT_CMD_MKENT(run, CONFIG_SYS_MAXARGS, 1, do_run, "", ""),
#endif
-@@ -1284,6 +1341,9 @@ U_BOOT_LONGHELP(env,
+@@ -1172,6 +1229,9 @@ U_BOOT_LONGHELP(env,
#if defined(CONFIG_CMD_NVEDIT_EFI)
"env print -e [-guid guid] [-n] [name ...] - print UEFI environment\n"
#endif
@@ -96,7 +96,7 @@
#if defined(CONFIG_CMD_RUN)
"env run var [...] - run commands in an environment variable\n"
#endif
-@@ -1392,6 +1452,17 @@ U_BOOT_CMD(
+@@ -1280,6 +1340,17 @@ U_BOOT_CMD(
);
#endif