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/pm9g45 | |
| 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/pm9g45')
| -rw-r--r-- | arch/arm/boards/pm9g45/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/boards/pm9g45/defaultenv-pm9g45/config (renamed from arch/arm/boards/pm9g45/env/config) | 0 | ||||
| -rw-r--r-- | arch/arm/boards/pm9g45/init.c | 4 |
3 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boards/pm9g45/Makefile b/arch/arm/boards/pm9g45/Makefile index eb072c0161..d81b1881b3 100644 --- a/arch/arm/boards/pm9g45/Makefile +++ b/arch/arm/boards/pm9g45/Makefile @@ -1 +1,2 @@ obj-y += init.o +bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-pm9g45 diff --git a/arch/arm/boards/pm9g45/env/config b/arch/arm/boards/pm9g45/defaultenv-pm9g45/config index 18ac565d49..18ac565d49 100644 --- a/arch/arm/boards/pm9g45/env/config +++ b/arch/arm/boards/pm9g45/defaultenv-pm9g45/config diff --git a/arch/arm/boards/pm9g45/init.c b/arch/arm/boards/pm9g45/init.c index 524fe5395a..efa5dc025d 100644 --- a/arch/arm/boards/pm9g45/init.c +++ b/arch/arm/boards/pm9g45/init.c @@ -27,6 +27,7 @@ #include <fcntl.h> #include <gpio.h> #include <io.h> +#include <envfs.h> #include <mach/hardware.h> #include <nand.h> #include <linux/mtd/nand.h> @@ -164,6 +165,9 @@ static int pm9g45_devices_init(void) armlinux_set_architecture(MACH_TYPE_PM9G45); + if (IS_ENABLED(CONFIG_DEFAULT_ENVIRONMENT_GENERIC)) + defaultenv_append_directory(defaultenv_pm9g45); + return 0; } device_initcall(pm9g45_devices_init); |