diff options
| author | Tom Rini <[email protected]> | 2024-01-19 08:46:47 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-01-19 08:46:47 -0500 |
| commit | f4d54865061495bdb483f9ddc81183d1940f596c (patch) | |
| tree | 203ec612e1a7b41602e5616c5f480d89caf1ff95 /cmd | |
| parent | cb493752394adec8db1d6f5e9b8fb3c43e13f10a (diff) | |
| parent | 46371f269986976b3e969c0985820169b766ff76 (diff) | |
Merge branch '2024-01-18-assorted-fixes'
- A number of OS boot related cleanups, a number of TI platform
fixes/cleanups, SMBIOS fixes, tweak get_maintainers.pl to report me
for more places, fix the "clean the build" pytest and add a bootstage
pytest, fix PKCS11 URI being omitted in some valid cases, make an iommu
problem easier to debug on new platforms, nvme and pci improvements,
refactor image-host code a bit, fix a typo in env setting, add a missing
dependency for CMD_LICENSE, and correct how we call getchar() in some
places.
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/Kconfig | 1 | ||||
| -rw-r--r-- | cmd/bootflow.c | 2 | ||||
| -rw-r--r-- | cmd/load.c | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig index 46600e5007d..50625e7c16a 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -192,6 +192,7 @@ config CMD_HISTORY config CMD_LICENSE bool "license" select BUILD_BIN2C + depends on GZIP help Print GPL license text diff --git a/cmd/bootflow.c b/cmd/bootflow.c index cc6dfae1668..be5d7d8e743 100644 --- a/cmd/bootflow.c +++ b/cmd/bootflow.c @@ -543,8 +543,6 @@ static int do_bootflow_cmdline(struct cmd_tbl *cmdtp, int flag, int argc, op = argv[1]; arg = argv[2]; if (*op == 's') { - if (argc < 3) - return CMD_RET_USAGE; val = argv[3] ?: (const char *)BOOTFLOWCL_EMPTY; } diff --git a/cmd/load.c b/cmd/load.c index 2715cf5957e..540361b43f0 100644 --- a/cmd/load.c +++ b/cmd/load.c @@ -230,7 +230,7 @@ static ulong load_serial(long offset) static int read_record(char *buf, ulong len) { char *p; - char c; + int c; --len; /* always leave room for terminating '\0' byte */ @@ -827,7 +827,7 @@ static void handle_send_packet(int n) /* k_recv receives a OS Open image file over kermit line */ static int k_recv(void) { - char new_char; + int new_char; char k_state, k_state_saved; int sum; int done; |