-
-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
odroidm1: u-boot: enable
setexpr; patch 2025.01 for fileenv; enab…
…le squashfs support - as Armbian u-boot is possibly deployed to SPI (replacing Petitboot), try to make as compatible as possible; eg enable squashfs support - in this case, `setexpr` and `fileenv` are used by HAOS - found `fileenv` here spikerguy/khadas-uboot@049e1a1 Signed-off-by: Ricardo Pardini <[email protected]>
- Loading branch information
Showing
2 changed files
with
106 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
99 changes: 99 additions & 0 deletions
99
patch/u-boot/v2025.01/cmd-fileenv-read-string-from-file-into-env.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Ricardo Pardini <[email protected]> | ||
| Date: Fri, 31 Jan 2025 15:52:03 +0100 | ||
| Subject: cmd: fileenv: read string from file into env | ||
|
|
||
| - rpardini: adapted from vendor/legacy patch from 2018 | ||
|
|
||
| Signed-off-by: Pascal Vizeli <[email protected]> | ||
| Signed-off-by: Stefan Agner <[email protected]> | ||
| Signed-off-by: Ricardo Pardini <[email protected]> | ||
| --- | ||
| cmd/Kconfig | 5 + | ||
| cmd/Makefile | 1 + | ||
| cmd/fileenv.c | 46 ++++++++++ | ||
| 3 files changed, 52 insertions(+) | ||
|
|
||
| diff --git a/cmd/Kconfig b/cmd/Kconfig | ||
| index 111111111111..222222222222 100644 | ||
| --- a/cmd/Kconfig | ||
| +++ b/cmd/Kconfig | ||
| @@ -1792,6 +1792,11 @@ config CMD_XXD | ||
| help | ||
| Print file as hexdump to standard output | ||
|
|
||
| +config CMD_FILEENV | ||
| + bool "fileenv" | ||
| + help | ||
| + Read a file into memory and store it to env. | ||
| + | ||
| endmenu | ||
|
|
||
| if NET || NET_LWIP | ||
| diff --git a/cmd/Makefile b/cmd/Makefile | ||
| index 111111111111..222222222222 100644 | ||
| --- a/cmd/Makefile | ||
| +++ b/cmd/Makefile | ||
| @@ -170,6 +170,7 @@ obj-$(CONFIG_CMD_SHA1SUM) += sha1sum.o | ||
| obj-$(CONFIG_CMD_SEAMA) += seama.o | ||
| obj-$(CONFIG_CMD_SETEXPR) += setexpr.o | ||
| obj-$(CONFIG_CMD_SETEXPR_FMT) += printf.o | ||
| +obj-$(CONFIG_CMD_FILEENV) += fileenv.o | ||
| obj-$(CONFIG_CMD_SPI) += spi.o | ||
| obj-$(CONFIG_CMD_STRINGS) += strings.o | ||
| obj-$(CONFIG_CMD_SMBIOS) += smbios.o | ||
| diff --git a/cmd/fileenv.c b/cmd/fileenv.c | ||
| new file mode 100644 | ||
| index 000000000000..111111111111 | ||
| --- /dev/null | ||
| +++ b/cmd/fileenv.c | ||
| @@ -0,0 +1,46 @@ | ||
| +#include <config.h> | ||
| +#include <command.h> | ||
| +#include <fs.h> | ||
| +#include <linux/ctype.h> | ||
| +#include <vsprintf.h> | ||
| + | ||
| +static char *fs_argv[5]; | ||
| + | ||
| +int do_fileenv(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) | ||
| +{ | ||
| + if (argc < 6) | ||
| + return CMD_RET_USAGE; | ||
| + | ||
| + fs_argv[0] = "fatload"; | ||
| + fs_argv[1] = argv[1]; | ||
| + fs_argv[2] = argv[2]; | ||
| + fs_argv[3] = argv[3]; | ||
| + fs_argv[4] = argv[4]; | ||
| + | ||
| + if (do_fat_fsload(cmdtp, 0, 5, fs_argv) != 0) | ||
| + return 1; | ||
| + | ||
| + char *addr = (char *)simple_strtoul(argv[3], NULL, 16); | ||
| + size_t size = env_get_hex("filesize", 0); | ||
| + | ||
| + // Prepare string | ||
| + addr[size] = 0x00; | ||
| + char *s = addr; | ||
| + while(*s != 0x00) { | ||
| + if (isprint(*s)) { | ||
| + s++; | ||
| + } | ||
| + else { | ||
| + *s = 0x00; | ||
| + } | ||
| + } | ||
| + | ||
| + return env_set(argv[5], addr); | ||
| +} | ||
| + | ||
| +U_BOOT_CMD( | ||
| + fileenv, 6, 0, do_fileenv, | ||
| + "Read file and store it into env.", | ||
| + "<interface> <dev:part> <addr> <filename> <envname>\n" | ||
| + " - Read file from fat32 and store it as env." | ||
| +); | ||
| -- | ||
| Armbian | ||
|
|