diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-09-26 09:50:08 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-10-10 08:30:26 +0200 |
commit | 4d9734c8a26437838a5c1085fb3859734036e150 (patch) | |
tree | f63cf21ae773c4d24d2baecc96c6994fa814d57d /arch/arm/boards/qemu-virt64 | |
parent | 7791ad2d59a16b76c6a0e48797e9b0ba481b67e0 (diff) | |
download | barebox-4d9734c8a26437838a5c1085fb3859734036e150.tar.gz barebox-4d9734c8a26437838a5c1085fb3859734036e150.tar.xz |
defaultenv: add defaultenv-1 in boards via defaultenv_append_directory()
Currently it's hardcoded for each board which defaultenv version is
used. This is unfortunate since some people like the other defaultenv
version better and may want to select it.
This patch removes the board specific environment path
CONFIG_DEFAULT_ENVIRONMENT_PATH and instead adds it via:
if (IS_ENABLED(CONFIG_DEFAULT_ENVIRONMENT_GENERIC))
defaultenv_append_directory(defaultenv_<board>);
This way we can make sure that the defaultenv-1 board specific bits are
only compiled in when defaultenv-1 is actually in use.
The next step is to make the defaultenv version selection a user visible
choice.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/qemu-virt64')
-rw-r--r-- | arch/arm/boards/qemu-virt64/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/boards/qemu-virt64/defaultenv-qemu-virt64/config (renamed from arch/arm/boards/qemu-virt64/env/config) | 0 | ||||
-rw-r--r-- | arch/arm/boards/qemu-virt64/init.c | 4 |
3 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boards/qemu-virt64/Makefile b/arch/arm/boards/qemu-virt64/Makefile index 2da0494d49..e354607548 100644 --- a/arch/arm/boards/qemu-virt64/Makefile +++ b/arch/arm/boards/qemu-virt64/Makefile @@ -1,2 +1,3 @@ obj-y += init.o lwl-y += lowlevel.o +bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-qemu-virt64 diff --git a/arch/arm/boards/qemu-virt64/env/config b/arch/arm/boards/qemu-virt64/defaultenv-qemu-virt64/config index 781dbfefa6..781dbfefa6 100644 --- a/arch/arm/boards/qemu-virt64/env/config +++ b/arch/arm/boards/qemu-virt64/defaultenv-qemu-virt64/config diff --git a/arch/arm/boards/qemu-virt64/init.c b/arch/arm/boards/qemu-virt64/init.c index 58dba0f68a..a85bd84db7 100644 --- a/arch/arm/boards/qemu-virt64/init.c +++ b/arch/arm/boards/qemu-virt64/init.c @@ -12,6 +12,7 @@ #include <environment.h> #include <linux/sizes.h> #include <io.h> +#include <envfs.h> #include <globalvar.h> #include <asm/mmu.h> @@ -30,6 +31,9 @@ static int virt_env_init(void) devfs_add_partition("nor0", 0x00000, 0x40000, DEVFS_PARTITION_FIXED, "self0"); devfs_add_partition("nor0", 0x40000, 0x20000, DEVFS_PARTITION_FIXED, "env0"); + if (IS_ENABLED(CONFIG_DEFAULT_ENVIRONMENT_GENERIC)) + defaultenv_append_directory(defaultenv_qemu_virt64); + return 0; } device_initcall(virt_env_init); |