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/at91rm9200ek | |
| 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/at91rm9200ek')
| -rw-r--r-- | arch/arm/boards/at91rm9200ek/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/boards/at91rm9200ek/defaultenv-at91rm9200ek/bin/init_board (renamed from arch/arm/boards/at91rm9200ek/env/bin/init_board) | 0 | ||||
| -rw-r--r-- | arch/arm/boards/at91rm9200ek/defaultenv-at91rm9200ek/config (renamed from arch/arm/boards/at91rm9200ek/env/config) | 0 | ||||
| -rw-r--r-- | arch/arm/boards/at91rm9200ek/init.c | 4 |
4 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boards/at91rm9200ek/Makefile b/arch/arm/boards/at91rm9200ek/Makefile index eb072c0161..dec1c50455 100644 --- a/arch/arm/boards/at91rm9200ek/Makefile +++ b/arch/arm/boards/at91rm9200ek/Makefile @@ -1 +1,2 @@ obj-y += init.o +bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-at91rm9200ek diff --git a/arch/arm/boards/at91rm9200ek/env/bin/init_board b/arch/arm/boards/at91rm9200ek/defaultenv-at91rm9200ek/bin/init_board index 0d40eb41a5..0d40eb41a5 100644 --- a/arch/arm/boards/at91rm9200ek/env/bin/init_board +++ b/arch/arm/boards/at91rm9200ek/defaultenv-at91rm9200ek/bin/init_board diff --git a/arch/arm/boards/at91rm9200ek/env/config b/arch/arm/boards/at91rm9200ek/defaultenv-at91rm9200ek/config index 76c180bcac..76c180bcac 100644 --- a/arch/arm/boards/at91rm9200ek/env/config +++ b/arch/arm/boards/at91rm9200ek/defaultenv-at91rm9200ek/config diff --git a/arch/arm/boards/at91rm9200ek/init.c b/arch/arm/boards/at91rm9200ek/init.c index 43c8b1b055..7626786e07 100644 --- a/arch/arm/boards/at91rm9200ek/init.c +++ b/arch/arm/boards/at91rm9200ek/init.c @@ -25,6 +25,7 @@ #include <gpio.h> #include <fcntl.h> #include <io.h> +#include <envfs.h> #include <linux/sizes.h> #include <mach/hardware.h> #include <mach/at91_pmc.h> @@ -177,6 +178,9 @@ static int at91rm9200ek_devices_init(void) armlinux_set_architecture(MACH_TYPE_AT91RM9200EK); + if (IS_ENABLED(CONFIG_DEFAULT_ENVIRONMENT_GENERIC)) + defaultenv_append_directory(defaultenv_at91rm9200ek); + return 0; } device_initcall(at91rm9200ek_devices_init); |