diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-12-08 08:29:02 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-12-08 08:29:02 +0100 |
| commit | 2ae9bbba0742d79376eb26252b212913d9181bd8 (patch) | |
| tree | d4905ffccf62b563d9d67bbae66648421cd3745c /include | |
| parent | fab8198323d88ec061032b406b0dc4a874096d60 (diff) | |
| parent | 34cda8c23115b3ae3aeeeba7618d5d5654536494 (diff) | |
| download | barebox-2ae9bbba0742d79376eb26252b212913d9181bd8.tar.gz barebox-2ae9bbba0742d79376eb26252b212913d9181bd8.tar.xz | |
Merge branch 'for-next/state'
Diffstat (limited to 'include')
| -rw-r--r-- | include/crypto/keystore.h | 26 | ||||
| -rw-r--r-- | include/of.h | 1 | ||||
| -rw-r--r-- | include/state.h | 1 |
3 files changed, 27 insertions, 1 deletions
diff --git a/include/crypto/keystore.h b/include/crypto/keystore.h new file mode 100644 index 0000000000..29915854b8 --- /dev/null +++ b/include/crypto/keystore.h @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2015 Pengutronix, Marc Kleine-Budde <kernel@pengutronix.de> + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License version 2 as published by the + * Free Software Foundation. + */ + +#ifndef __CRYPTO_KEYSTORE_H +#define __CRYPTO_KEYSTORE_H + +#ifdef CONFIG_CRYPTO_KEYSTORE +int keystore_get_secret(const char *name, const u8 **secret, int *secret_len); +int keystore_set_secret(const char *name, const u8 *secret, int secret_len); +#else +static inline int keystore_get_secret(const char *name, const u8 **secret, int *secret_len) +{ + return -EINVAL; +} +static inline int keystore_set_secret(const char *name, const u8 *secret, int secret_len) +{ + return 0; +} +#endif + +#endif diff --git a/include/of.h b/include/of.h index e0ebc39b74..e60fe89825 100644 --- a/include/of.h +++ b/include/of.h @@ -246,6 +246,7 @@ void of_add_memory_bank(struct device_node *node, bool dump, int r, struct device_d *of_find_device_by_node_path(const char *path); #define OF_FIND_PATH_FLAGS_BB 1 /* return .bb device if available */ int of_find_path(struct device_node *node, const char *propname, char **outpath, unsigned flags); +int of_find_path_by_node(struct device_node *node, char **outpath, unsigned flags); int of_register_fixup(int (*fixup)(struct device_node *, void *), void *context); int of_unregister_fixup(int (*fixup)(struct device_node *, void *), void *context); struct device_node *of_find_node_by_alias(struct device_node *root, diff --git a/include/state.h b/include/state.h index 08c4e8654b..b3966fd99e 100644 --- a/include/state.h +++ b/include/state.h @@ -17,7 +17,6 @@ struct state *state_by_name(const char *name); struct state *state_by_node(const struct device_node *node); int state_get_name(const struct state *state, char const **name); -int state_load(struct state *state); int state_save(struct state *state); void state_info(void); |