diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-12-08 14:54:09 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-12-08 14:54:09 +0100 |
commit | 3eade89c7573f8893fe045290e374d4502092e13 (patch) | |
tree | defd4218ff82053d44f54595af4e882ea7eb988a /include | |
parent | c2b5a7015b7323af4b7c8cf19a06b954f4f09949 (diff) | |
parent | 7962e7a0b423a5dfba251622f64d3891f69a55c0 (diff) | |
download | barebox-3eade89c7573f8893fe045290e374d4502092e13.tar.gz barebox-3eade89c7573f8893fe045290e374d4502092e13.tar.xz |
Merge branch 'for-next/persistent-vars'
Conflicts:
arch/arm/boards/efika-mx-smartbook/defaultenv-efikasb/config
Diffstat (limited to 'include')
-rw-r--r-- | include/globalvar.h | 13 | ||||
-rw-r--r-- | include/libfile.h | 2 |
2 files changed, 15 insertions, 0 deletions
diff --git a/include/globalvar.h b/include/globalvar.h index 456e8cd1f8..8b2caf1f8b 100644 --- a/include/globalvar.h +++ b/include/globalvar.h @@ -72,6 +72,13 @@ static inline int globalvar_add_simple_ip(const char *name, return 0; } + +int nvvar_load(void); +void nvvar_print(void); +int nvvar_add(const char *name, const char *value); +int nvvar_remove(const char *name); +void globalvar_print(void); + #else static inline int globalvar_add_simple(const char *name, const char *value) { @@ -116,6 +123,12 @@ static inline char *globalvar_get_match(const char *match, const char *separator } static inline void globalvar_set_match(const char *match, const char *val) {} + +static inline int nvvar_load(void) +{ + return 0; +} + #endif #endif /* __GLOBALVAR_H */ diff --git a/include/libfile.h b/include/libfile.h index 6c48ce0b68..d5b914a47a 100644 --- a/include/libfile.h +++ b/include/libfile.h @@ -15,6 +15,8 @@ int write_file(const char *filename, void *buf, size_t size); int copy_file(const char *src, const char *dst, int verbose); +int copy_recursive(const char *src, const char *dst); + int compare_file(const char *f1, const char *f2); #endif /* __LIBFILE_H */ |