diff options
| -rw-r--r-- | arch/arm/boards/beaglebone/board.c | 2 | ||||
| -rw-r--r-- | arch/arm/boards/panda/board.c | 2 | ||||
| -rw-r--r-- | commands/loadenv.c | 2 | ||||
| -rw-r--r-- | commands/saveenv.c | 2 | ||||
| -rw-r--r-- | common/startup.c | 2 | ||||
| -rw-r--r-- | include/envfs.h | 8 | ||||
| -rw-r--r-- | include/environment.h | 7 |
7 files changed, 12 insertions, 13 deletions
diff --git a/arch/arm/boards/beaglebone/board.c b/arch/arm/boards/beaglebone/board.c index f9ac7a469f..86de3b0f17 100644 --- a/arch/arm/boards/beaglebone/board.c +++ b/arch/arm/boards/beaglebone/board.c @@ -27,7 +27,7 @@ #include <driver.h> #include <fs.h> #include <linux/stat.h> -#include <environment.h> +#include <envfs.h> #include <sizes.h> #include <io.h> #include <ns16550.h> diff --git a/arch/arm/boards/panda/board.c b/arch/arm/boards/panda/board.c index c5d8fe6409..f1fbd5e944 100644 --- a/arch/arm/boards/panda/board.c +++ b/arch/arm/boards/panda/board.c @@ -19,7 +19,7 @@ #include <sizes.h> #include <asm/mmu.h> #include <mach/gpio.h> -#include <environment.h> +#include <envfs.h> #include <mach/xload.h> #include <i2c/i2c.h> #include <gpio.h> diff --git a/commands/loadenv.c b/commands/loadenv.c index 48284d7a03..14b964340b 100644 --- a/commands/loadenv.c +++ b/commands/loadenv.c @@ -23,7 +23,7 @@ #include <common.h> #include <getopt.h> #include <command.h> -#include <environment.h> +#include <envfs.h> #include <fs.h> static int do_loadenv(int argc, char *argv[]) diff --git a/commands/saveenv.c b/commands/saveenv.c index dd0de7f75b..7f371a88dd 100644 --- a/commands/saveenv.c +++ b/commands/saveenv.c @@ -25,7 +25,7 @@ #include <errno.h> #include <fs.h> #include <fcntl.h> -#include <environment.h> +#include <envfs.h> static int do_saveenv(int argc, char *argv[]) { diff --git a/common/startup.c b/common/startup.c index 6309f53e9e..c36bf7c763 100644 --- a/common/startup.c +++ b/common/startup.c @@ -32,7 +32,7 @@ #include <debug_ll.h> #include <fs.h> #include <linux/stat.h> -#include <environment.h> +#include <envfs.h> #include <asm/sections.h> extern initcall_t __barebox_initcalls_start[], __barebox_early_initcalls_end[], diff --git a/include/envfs.h b/include/envfs.h index 3d14fcb9ee..2db55ed6a4 100644 --- a/include/envfs.h +++ b/include/envfs.h @@ -89,5 +89,11 @@ struct envfs_super { #error "__BYTE_ORDER must be __LITTLE_ENDIAN or __BIG_ENDIAN" #endif -#endif /* _ENVFS_H */ +#define ENV_FLAG_NO_OVERWRITE (1 << 0) +int envfs_load(char *filename, char *dirname, unsigned flags); +int envfs_save(char *filename, char *dirname); + +/* defaults to /dev/env0 */ +extern char *default_environment_path; +#endif /* _ENVFS_H */ diff --git a/include/environment.h b/include/environment.h index 65f254bda2..6500ebb554 100644 --- a/include/environment.h +++ b/include/environment.h @@ -72,17 +72,10 @@ static inline int export(const char *var) int env_pop_context(void); int env_push_context(void); -/* defaults to /dev/env0 */ -extern char *default_environment_path; - int export(const char *); #endif /* __BAREBOX__ */ -#define ENV_FLAG_NO_OVERWRITE (1 << 0) -int envfs_load(char *filename, char *dirname, unsigned flags); -int envfs_save(char *filename, char *dirname); - #endif /* _ENVIRONMENT_H_ */ /** |