diff options
| author | Tom Rini <[email protected]> | 2020-12-02 11:35:02 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-12-02 11:35:02 -0500 |
| commit | a2c832471115d382d6dd60697be5bc74d2636eea (patch) | |
| tree | e423f7bee7cdc889184efbe2bbed407559182f8f /common | |
| parent | 0719bf42931033c3109ecc6357e8adb567cb637b (diff) | |
| parent | 7292a18256252e41970eceacd5ccd3ed79ea64f0 (diff) | |
Merge branch '2020-12-01-next-imports' into next
- More IPQ40xx improvements
- Add string support to setexpr (and tests)
- ProxyDHCP support
- Assorted cleanups
Diffstat (limited to 'common')
| -rw-r--r-- | common/cli_hush.c | 3 | ||||
| -rw-r--r-- | common/command.c | 4 | ||||
| -rw-r--r-- | common/spl/spl_fit.c | 10 |
3 files changed, 12 insertions, 5 deletions
diff --git a/common/cli_hush.c b/common/cli_hush.c index 66995c255b5..b7f0f0ff418 100644 --- a/common/cli_hush.c +++ b/common/cli_hush.c @@ -84,9 +84,6 @@ #include <cli.h> #include <cli_hush.h> #include <command.h> /* find_cmd */ -#ifndef CONFIG_SYS_PROMPT_HUSH_PS2 -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -#endif #endif #ifndef __U_BOOT__ #include <ctype.h> /* isalpha, isdigit */ diff --git a/common/command.c b/common/command.c index 2c491e20a74..068cb55b4cd 100644 --- a/common/command.c +++ b/common/command.c @@ -475,13 +475,13 @@ int cmd_get_data_size(char* arg, int default_size) case 'l': return 4; case 's': - return -2; + return CMD_DATA_SIZE_STR; case 'q': if (MEM_SUPPORT_64BIT_DATA) return 8; /* no break */ default: - return -1; + return CMD_DATA_SIZE_ERR; } } return default_size; diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index 6418062b93a..2fbee4f19f3 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -558,6 +558,16 @@ int spl_load_simple_fit(struct spl_image_info *spl_image, if (spl_load_simple_fit_skip_processing()) return 0; + if (IS_ENABLED(CONFIG_SPL_FIT_SIGNATURE)) { + int conf_offset = fit_find_config_node(fit); + + printf("## Checking hash(es) for config %s ... ", + fit_get_name(fit, conf_offset, NULL)); + if (fit_config_verify(fit, conf_offset)) + return -EPERM; + puts("OK\n"); + } + /* find the node holding the images information */ images = fdt_path_offset(fit, FIT_IMAGES_PATH); if (images < 0) { |