diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-03-27 11:20:22 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-03-31 13:57:12 +0200 |
commit | b204a1d8b6f3c91b11d4b5a85fc3877a69d52b9f (patch) | |
tree | eef2983c748fabb60934c018004c1d9162e3c6e0 | |
parent | c55e8e1a19fa37c1bc49a1a6ba666135bdc45d8a (diff) | |
download | dt-utils-b204a1d8b6f3c91b11d4b5a85fc3877a69d52b9f.tar.gz dt-utils-b204a1d8b6f3c91b11d4b5a85fc3877a69d52b9f.tar.xz |
Revert "barebox-state: Add force switch"
This reverts commit 89135e5522720bc75615a6ec22bb8bcb7b4994e2.
-rw-r--r-- | src/barebox-state.c | 9 | ||||
-rw-r--r-- | src/barebox-state/backend.c | 10 | ||||
-rw-r--r-- | src/barebox-state/backend_format_raw.c | 10 | ||||
-rw-r--r-- | src/barebox-state/state.c | 5 | ||||
-rw-r--r-- | src/barebox-state/state.h | 5 | ||||
-rw-r--r-- | src/state.h | 3 |
6 files changed, 13 insertions, 29 deletions
diff --git a/src/barebox-state.c b/src/barebox-state.c index c9b000c..25f3bc3 100644 --- a/src/barebox-state.c +++ b/src/barebox-state.c @@ -37,8 +37,6 @@ #include <dt/dt.h> #include <state.h> -static int force; - struct state_variable; static int __state_uint8_set(struct state_variable *var, const char *val); @@ -362,7 +360,7 @@ struct state *state_get(const char *name, bool readonly) return ERR_PTR(ret); } - state = state_new_from_node(node, devpath, offset, size, readonly, force); + state = state_new_from_node(node, devpath, offset, size, readonly); if (IS_ERR(state)) { pr_err("unable to initialize state: %s\n", strerror(PTR_ERR(state))); @@ -382,7 +380,6 @@ static struct option long_options[] = { {"name", required_argument, 0, 'n' }, {"dump", no_argument, 0, 'd' }, {"dump-shell", no_argument, 0, OPT_DUMP_SHELL }, - {"force", no_argument, 0, 'f' }, {"verbose", no_argument, 0, 'v' }, {"help", no_argument, 0, 'h' }, }; @@ -397,7 +394,6 @@ static void usage(char *name) "-n, --name <name> specify the state to use (default=\"state\"). Multiple states are allowed.\n" "-d, --dump dump the state\n" "--dump-shell dump the state suitable for shell sourcing\n" -"-f, --force ignore errors (like missing hmac algo)\n" "-v, --verbose increase verbosity\n" "-q, --quiet decrease verbosity\n" "--help this help\n", @@ -480,9 +476,6 @@ int main(int argc, char *argv[]) ++nr_states; break; } - case 'f': - force = 1; - break; case ':': case '?': default: diff --git a/src/barebox-state/backend.c b/src/barebox-state/backend.c index 5b96951..2f2e6df 100644 --- a/src/barebox-state/backend.c +++ b/src/barebox-state/backend.c @@ -101,14 +101,13 @@ out: static int state_format_init(struct state_backend *backend, struct device_d *dev, const char *backend_format, - struct device_node *node, const char *state_name, - int force) + struct device_node *node, const char *state_name) { int ret; if (!strcmp(backend_format, "raw")) { ret = backend_format_raw_create(&backend->format, node, - state_name, dev, force); + state_name, dev); } else if (!strcmp(backend_format, "dtb")) { ret = backend_format_dtb_create(&backend->format, dev); } else { @@ -146,18 +145,17 @@ static void state_format_free(struct state_backend_format *format) * For blockdevices it makes sense to align them on blocksize. * @param storagetype Type of the storage backend. This may be NULL where we * autoselect some backwardscompatible backend options - * @param force If true, ignore errors like missing hmac * @return 0 on success, -errno otherwise */ int state_backend_init(struct state_backend *backend, struct device_d *dev, struct device_node *node, const char *backend_format, const char *storage_path, const char *state_name, const char *of_path, off_t offset, size_t max_size, - uint32_t stridesize, const char *storagetype, int force) + uint32_t stridesize, const char *storagetype) { int ret; - ret = state_format_init(backend, dev, backend_format, node, state_name, force); + ret = state_format_init(backend, dev, backend_format, node, state_name); if (ret) return ret; diff --git a/src/barebox-state/backend_format_raw.c b/src/barebox-state/backend_format_raw.c index cc225b2..6f0d930 100644 --- a/src/barebox-state/backend_format_raw.c +++ b/src/barebox-state/backend_format_raw.c @@ -285,7 +285,7 @@ static int backend_format_raw_init_digest(struct state_backend_format_raw *raw, int backend_format_raw_create(struct state_backend_format **format, struct device_node *node, const char *secret_name, - struct device_d *dev, int force) + struct device_d *dev) { struct state_backend_format_raw *raw; int ret; @@ -301,12 +301,8 @@ int backend_format_raw_create(struct state_backend_format **format, } else if (ret) { dev_err(raw->dev, "Failed initializing digest for raw format, %d\n", ret); - if (force) { - dev_warn(raw->dev, "Continuing anyway (forced)\n"); - } else { - free(raw); - return ret; - } + free(raw); + return ret; } raw->format.pack = backend_format_raw_pack; diff --git a/src/barebox-state/state.c b/src/barebox-state/state.c index a141da4..28cfb83 100644 --- a/src/barebox-state/state.c +++ b/src/barebox-state/state.c @@ -425,8 +425,7 @@ void state_release(struct state *state) * there are no repairs done. */ struct state *state_new_from_node(struct device_node *node, char *path, - off_t offset, size_t max_size, bool readonly, - int force) + off_t offset, size_t max_size, bool readonly) { struct state *state; int ret = 0; @@ -491,7 +490,7 @@ struct state *state_new_from_node(struct device_node *node, char *path, ret = state_backend_init(&state->backend, &state->dev, node, backend_type, path, alias, of_path, offset, - max_size, stridesize, storage_type, force); + max_size, stridesize, storage_type); if (ret) goto out_release_state; diff --git a/src/barebox-state/state.h b/src/barebox-state/state.h index 6939cf4..48a6785 100644 --- a/src/barebox-state/state.h +++ b/src/barebox-state/state.h @@ -197,7 +197,7 @@ struct device_node *state_to_node(struct state *state, enum state_convert conv); int backend_format_raw_create(struct state_backend_format **format, struct device_node *node, const char *secret_name, - struct device_d *dev, int force); + struct device_d *dev); int backend_format_dtb_create(struct state_backend_format **format, struct device_d *dev); int state_storage_init(struct state_backend_storage *storage, @@ -223,8 +223,7 @@ int state_backend_init(struct state_backend *backend, struct device_d *dev, struct device_node *node, const char *backend_format, const char *storage_path, const char *state_name, const char *of_path, off_t offset, size_t max_size, - uint32_t stridesize, const char *storagetype, - int force); + uint32_t stridesize, const char *storagetype); void state_backend_set_readonly(struct state_backend *backend); void state_backend_free(struct state_backend *backend); void state_storage_free(struct state_backend_storage *storage); diff --git a/src/state.h b/src/state.h index 44e56b4..bc9a574 100644 --- a/src/state.h +++ b/src/state.h @@ -11,8 +11,7 @@ int state_backend_raw_file(struct state *state, const char *of_path, const char *path, off_t offset, size_t size); struct state *state_new_from_node(struct device_node *node, char *path, - off_t offset, size_t max_size, bool readonly, - int force); + off_t offset, size_t max_size, bool readonly); void state_release(struct state *state); struct state *state_by_name(const char *name); |