diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/Kconfig | 6 | ||||
| -rw-r--r-- | common/globalvar.c | 12 | ||||
| -rw-r--r-- | common/state/backend_bucket_circular.c | 6 | ||||
| -rw-r--r-- | common/state/backend_format_dtb.c | 2 | ||||
| -rw-r--r-- | common/state/backend_format_raw.c | 10 | ||||
| -rw-r--r-- | common/state/backend_storage.c | 6 | ||||
| -rw-r--r-- | common/state/state.c | 1 |
7 files changed, 32 insertions, 11 deletions
diff --git a/common/Kconfig b/common/Kconfig index aac9f1aca3..62733e1dc4 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -644,6 +644,9 @@ config BOOTM_FORCE_SIGNED_IMAGES config BLSPEC depends on BLOCK depends on FLEXIBLE_BOOTARGS + depends on !SHELL_NONE + select BOOT + select BOOTM select OFTREE bool prompt "Support bootloader spec" @@ -936,6 +939,9 @@ config STATE_CRYPTO config BOOTCHOOSER bool "bootchooser infrastructure" + depends on !SHELL_NONE + select BOOT + select BOOTM select ENVIRONMENT_VARIABLES select OFTREE select PARAMETER diff --git a/common/globalvar.c b/common/globalvar.c index 32ca6a24db..1ecf5134af 100644 --- a/common/globalvar.c +++ b/common/globalvar.c @@ -99,6 +99,9 @@ void dev_param_init_from_nv(struct device_d *dev, const char *name) const char *val; int ret = 0; + if (!IS_ENABLED(CONFIG_NVVAR)) + return; + if (dev == &nv_device) return; if (dev == &global_device) @@ -395,6 +398,9 @@ static void globalvar_nv_sync(const char *name) { const char *val; + if (!IS_ENABLED(CONFIG_NVVAR)) + return; + val = dev_get_param(&nv_device, name); if (val) dev_set_param(&global_device, name, val); @@ -542,6 +548,8 @@ int nvvar_save(void) const char *env = default_environment_path_get(); int ret; #define TMPDIR "/.env.tmp" + if (!IS_ENABLED(CONFIG_NVVAR)) + return -ENOSYS; if (!nv_dirty || !env) return 0; @@ -602,7 +610,9 @@ static int nv_global_param_complete(struct device_d *dev, struct string_list *sl int nv_global_complete(struct string_list *sl, char *instr) { nv_global_param_complete(&global_device, sl, instr, 0); - nv_global_param_complete(&nv_device, sl, instr, 0); + + if (IS_ENABLED(CONFIG_NVVAR)) + nv_global_param_complete(&nv_device, sl, instr, 0); return 0; } diff --git a/common/state/backend_bucket_circular.c b/common/state/backend_bucket_circular.c index 5279ec9ce2..832f44e599 100644 --- a/common/state/backend_bucket_circular.c +++ b/common/state/backend_bucket_circular.c @@ -385,7 +385,7 @@ static int state_backend_bucket_circular_init( ret = state_mtd_peb_read(circ, buf, 0, circ->max_size); if (ret && ret != -EUCLEAN) - return ret; + goto out; for (sub_offset = circ->max_size - circ->writesize; sub_offset >= 0; sub_offset -= circ->writesize) { @@ -408,9 +408,11 @@ static int state_backend_bucket_circular_init( circ->write_area = sub_offset + circ->writesize; circ->last_written_length = written_length; + ret = 0; +out: free(buf); - return 0; + return ret; } static void state_backend_bucket_circular_free(struct diff --git a/common/state/backend_format_dtb.c b/common/state/backend_format_dtb.c index 55fa1fc597..e88cda499b 100644 --- a/common/state/backend_format_dtb.c +++ b/common/state/backend_format_dtb.c @@ -120,8 +120,6 @@ static int state_backend_format_dtb_pack(struct state_backend_format *format, of_delete_node(fdtb->root); fdtb->root = root; - free(fdt); - return 0; } diff --git a/common/state/backend_format_raw.c b/common/state/backend_format_raw.c index 232856a209..d76718cf82 100644 --- a/common/state/backend_format_raw.c +++ b/common/state/backend_format_raw.c @@ -211,6 +211,12 @@ static int backend_format_raw_pack(struct state_backend_format *format, unsigned int size_data; int ret; + if (backend_raw->algo) { + ret = backend_raw_digest_init(backend_raw); + if (ret) + return ret; + } + sv = list_last_entry(&state->variables, struct state_variable, list); size_data = sv->start + sv->size; size_full = size_data + sizeof(*header) + backend_raw->digest_length; @@ -233,10 +239,6 @@ static int backend_format_raw_pack(struct state_backend_format *format, sizeof(*header) - sizeof(uint32_t)); if (backend_raw->algo) { - ret = backend_raw_digest_init(backend_raw); - if (ret) - return ret; - /* hmac over header and data */ ret = digest_update(backend_raw->digest, buf, sizeof(*header) + size_data); if (ret) { diff --git a/common/state/backend_storage.c b/common/state/backend_storage.c index 9ed6ad79ac..8d24f7053d 100644 --- a/common/state/backend_storage.c +++ b/common/state/backend_storage.c @@ -110,12 +110,14 @@ static int bucket_refresh(struct state_backend_storage *storage, refresh: ret = bucket->write(bucket, buf, len); - if (ret) + if (ret) { dev_warn(storage->dev, "Failed to restore bucket %d@0x%08lx\n", bucket->num, bucket->offset); - else + } else { dev_info(storage->dev, "restored bucket %d@0x%08lx\n", bucket->num, bucket->offset); + bucket->needs_refresh = 0; + } return ret; } diff --git a/common/state/state.c b/common/state/state.c index 8369aedac6..6db77f2c18 100644 --- a/common/state/state.c +++ b/common/state/state.c @@ -577,6 +577,7 @@ struct state *state_new_from_node(struct device_node *node, char *path, partition_node = of_parse_phandle(node, "backend", 0); if (!partition_node) { dev_err(&state->dev, "Cannot resolve \"backend\" phandle\n"); + ret = -EINVAL; goto out_release_state; } |