aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot/uboot-mediatek/patches/007-env-readmem.patch
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2021-01-30 13:58:16 +0000
committerDaniel Golle <daniel@makrotopia.org>2021-02-28 01:23:48 +0000
commited5000431940c0c8ae2b5704faa0ceb68a299102 (patch)
tree6c5cbb6d1a09d5d69f588082f5aaa7fbf9feaf00 /package/boot/uboot-mediatek/patches/007-env-readmem.patch
parentc16958e19463a59303f90c49e458bfa68057d1d3 (diff)
downloadupstream-ed5000431940c0c8ae2b5704faa0ceb68a299102.tar.gz
upstream-ed5000431940c0c8ae2b5704faa0ceb68a299102.tar.bz2
upstream-ed5000431940c0c8ae2b5704faa0ceb68a299102.zip
uboot-mediatek: add support for Linksys E8450
Build U-Boot for the Linksys E8450 in order to have support for UBI. The loader has a default environment with scripts handling the reset button as well as fall-back to recovery firmware. If the loader comes up without a valid environment found in UBI, it will automatically make sure UBI is formatted and create a new environment and proceed to load recovery firmware (either from UBI or via TFTP if recovery is corrupted or unavailable). If the button is held down during power-on, the yellow status LED turns on and the bootloader environment is reset to factory defaults. If the button is released at this point, the recovery firmware (if existing) is loaded from UBI and booted. If the button is continously held down even beyond the point that the yellow LED turned on, the loader will try to load the recovery firmware via TFTP from server 192.168.1.254, write it to UBI and boot. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'package/boot/uboot-mediatek/patches/007-env-readmem.patch')
-rw-r--r--package/boot/uboot-mediatek/patches/007-env-readmem.patch116
1 files changed, 116 insertions, 0 deletions
diff --git a/package/boot/uboot-mediatek/patches/007-env-readmem.patch b/package/boot/uboot-mediatek/patches/007-env-readmem.patch
new file mode 100644
index 0000000000..a8c88a2757
--- /dev/null
+++ b/package/boot/uboot-mediatek/patches/007-env-readmem.patch
@@ -0,0 +1,116 @@
+--- a/cmd/Kconfig
++++ b/cmd/Kconfig
+@@ -571,6 +571,12 @@ config CMD_ENV_EXISTS
+ Check if a variable is defined in the environment for use in
+ shell scripting.
+
++config CMD_ENV_READMEM
++ bool "env readmem"
++ default y
++ help
++ Store memory content into environment variable.
++
+ config CMD_ENV_CALLBACK
+ bool "env callbacks - print callbacks and their associated variables"
+ help
+--- a/cmd/nvedit.c
++++ b/cmd/nvedit.c
+@@ -469,6 +469,60 @@ int do_env_ask(struct cmd_tbl *cmdtp, in
+ }
+ #endif
+
++#if defined(CONFIG_CMD_ENV_READMEM)
++int do_env_readmem(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
++{
++ char varstr[CONFIG_SYS_CBSIZE];
++ const void *buf;
++ char *local_args[4];
++ ulong addr, bytes = 6;
++ int hexdump = 0;
++
++ /*
++ * Check the syntax:
++ *
++ * readmem [-b] name address [size]
++ */
++ if (argc < 3)
++ return CMD_RET_USAGE;
++
++ local_args[0] = argv[0];
++
++ if (!strncmp(argv[1], "-b", 3))
++ hexdump = 1;
++
++ local_args[1] = argv[hexdump + 1];
++ local_args[2] = varstr;
++ local_args[3] = NULL;
++
++ addr = simple_strtoul(argv[hexdump + 2], NULL, 16);
++
++ if (!hexdump)
++ bytes = simple_strtoul(argv[hexdump + 3], NULL, 16);
++
++ if (bytes < 1)
++ return 1;
++
++ if ((hexdump * 3) * bytes >= CONFIG_SYS_CBSIZE)
++ return 1;
++
++ buf = map_sysmem(addr, bytes);
++ if (!buf)
++ return 1;
++
++ if (hexdump) {
++ sprintf(varstr, "%pM", buf);
++ } else {
++ memcpy(varstr, buf, bytes);
++ varstr[bytes] = '\0';
++ }
++ unmap_sysmem(buf);
++
++ /* Continue calling setenv code */
++ return _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)
+@@ -1373,6 +1427,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, "", ""),
++#if defined(CONFIG_CMD_ENV_READMEM)
++ U_BOOT_CMD_MKENT(readmem, CONFIG_SYS_MAXARGS, 3, do_env_readmem, "", ""),
++#endif
+ #if defined(CONFIG_CMD_RUN)
+ U_BOOT_CMD_MKENT(run, CONFIG_SYS_MAXARGS, 1, do_run, "", ""),
+ #endif
+@@ -1461,6 +1518,9 @@ static char env_help_text[] =
+ #if defined(CONFIG_CMD_NVEDIT_EFI)
+ "env print -e [-guid guid] [-n] [name ...] - print UEFI environment\n"
+ #endif
++#if defined(CONFIG_CMD_ENV_READMEM)
++ "env readmem [-b] name address size - read variable from memory\n"
++#endif
+ #if defined(CONFIG_CMD_RUN)
+ "env run var [...] - run commands in an environment variable\n"
+ #endif
+@@ -1570,6 +1630,17 @@ U_BOOT_CMD(
+ );
+ #endif
+
++#if defined(CONFIG_CMD_ENV_READMEM)
++U_BOOT_CMD_COMPLETE(
++ readmem, CONFIG_SYS_MAXARGS, 3, do_env_readmem,
++ "get environment variable from memory address",
++ "name [-b] address size\n"
++ " - store memory address to env variable\n"
++ " \"-b\": read binary ethaddr",
++ var_complete
++);
++#endif
++
+ #if defined(CONFIG_CMD_RUN)
+ U_BOOT_CMD_COMPLETE(
+ run, CONFIG_SYS_MAXARGS, 1, do_run,