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/qil-a926x | |
| 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/qil-a926x')
| -rw-r--r-- | arch/arm/boards/qil-a926x/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/boards/qil-a926x/defaultenv-qil-a926x/bin/init_board (renamed from arch/arm/boards/qil-a926x/env/bin/init_board) | 0 | ||||
| -rw-r--r-- | arch/arm/boards/qil-a926x/defaultenv-qil-a926x/config (renamed from arch/arm/boards/qil-a926x/env/config) | 0 | ||||
| -rw-r--r-- | arch/arm/boards/qil-a926x/init.c | 4 |
4 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boards/qil-a926x/Makefile b/arch/arm/boards/qil-a926x/Makefile index eb072c0161..0c7bc3f043 100644 --- a/arch/arm/boards/qil-a926x/Makefile +++ b/arch/arm/boards/qil-a926x/Makefile @@ -1 +1,2 @@ obj-y += init.o +bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-qil-a926x diff --git a/arch/arm/boards/qil-a926x/env/bin/init_board b/arch/arm/boards/qil-a926x/defaultenv-qil-a926x/bin/init_board index 09ba7cc981..09ba7cc981 100644 --- a/arch/arm/boards/qil-a926x/env/bin/init_board +++ b/arch/arm/boards/qil-a926x/defaultenv-qil-a926x/bin/init_board diff --git a/arch/arm/boards/qil-a926x/env/config b/arch/arm/boards/qil-a926x/defaultenv-qil-a926x/config index 793a73f11e..793a73f11e 100644 --- a/arch/arm/boards/qil-a926x/env/config +++ b/arch/arm/boards/qil-a926x/defaultenv-qil-a926x/config diff --git a/arch/arm/boards/qil-a926x/init.c b/arch/arm/boards/qil-a926x/init.c index 872743775f..3ef9872797 100644 --- a/arch/arm/boards/qil-a926x/init.c +++ b/arch/arm/boards/qil-a926x/init.c @@ -15,6 +15,7 @@ #include <fs.h> #include <fcntl.h> #include <io.h> +#include <envfs.h> #include <mach/hardware.h> #include <nand.h> #include <linux/sizes.h> @@ -215,6 +216,9 @@ static int qil_a9260_devices_init(void) devfs_add_partition("nand0", SZ_512K, SZ_128K, DEVFS_PARTITION_FIXED, "env_raw1"); dev_add_bb_dev("env_raw1", "env1"); + if (IS_ENABLED(CONFIG_DEFAULT_ENVIRONMENT_GENERIC)) + defaultenv_append_directory(defaultenv_qil_a926x); + return 0; } device_initcall(qil_a9260_devices_init); |