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/freescale-mx25-3ds | |
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/freescale-mx25-3ds')
8 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boards/freescale-mx25-3ds/3stack.c b/arch/arm/boards/freescale-mx25-3ds/3stack.c index 36ad591cc0..3ab8c4ad52 100644 --- a/arch/arm/boards/freescale-mx25-3ds/3stack.c +++ b/arch/arm/boards/freescale-mx25-3ds/3stack.c @@ -27,6 +27,7 @@ #include <asm/sections.h> #include <asm/barebox-arm.h> #include <io.h> +#include <envfs.h> #include <partition.h> #include <generated/mach-types.h> #include <mach/imx-nand.h> @@ -156,6 +157,9 @@ static int imx25_3ds_devices_init(void) armlinux_set_architecture(MACH_TYPE_MX25_3DS); armlinux_set_serial(imx_uid()); + if (IS_ENABLED(CONFIG_DEFAULT_ENVIRONMENT_GENERIC)) + defaultenv_append_directory(defaultenv_freescale_mx25_3ds); + return 0; } diff --git a/arch/arm/boards/freescale-mx25-3ds/Makefile b/arch/arm/boards/freescale-mx25-3ds/Makefile index 52c416e3a5..20787efc94 100644 --- a/arch/arm/boards/freescale-mx25-3ds/Makefile +++ b/arch/arm/boards/freescale-mx25-3ds/Makefile @@ -18,3 +18,4 @@ lwl-y += lowlevel_init.o obj-y += 3stack.o +bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-freescale-mx25-3ds diff --git a/arch/arm/boards/freescale-mx25-3ds/env/bin/_update b/arch/arm/boards/freescale-mx25-3ds/defaultenv-freescale-mx25-3ds/bin/_update index 014bce3512..014bce3512 100644 --- a/arch/arm/boards/freescale-mx25-3ds/env/bin/_update +++ b/arch/arm/boards/freescale-mx25-3ds/defaultenv-freescale-mx25-3ds/bin/_update diff --git a/arch/arm/boards/freescale-mx25-3ds/env/bin/boot b/arch/arm/boards/freescale-mx25-3ds/defaultenv-freescale-mx25-3ds/bin/boot index 7bbff2d1f6..7bbff2d1f6 100644 --- a/arch/arm/boards/freescale-mx25-3ds/env/bin/boot +++ b/arch/arm/boards/freescale-mx25-3ds/defaultenv-freescale-mx25-3ds/bin/boot diff --git a/arch/arm/boards/freescale-mx25-3ds/env/bin/init b/arch/arm/boards/freescale-mx25-3ds/defaultenv-freescale-mx25-3ds/bin/init index 8eafa34dc8..8eafa34dc8 100644 --- a/arch/arm/boards/freescale-mx25-3ds/env/bin/init +++ b/arch/arm/boards/freescale-mx25-3ds/defaultenv-freescale-mx25-3ds/bin/init diff --git a/arch/arm/boards/freescale-mx25-3ds/env/bin/update_kernel b/arch/arm/boards/freescale-mx25-3ds/defaultenv-freescale-mx25-3ds/bin/update_kernel index 05c822d860..05c822d860 100644 --- a/arch/arm/boards/freescale-mx25-3ds/env/bin/update_kernel +++ b/arch/arm/boards/freescale-mx25-3ds/defaultenv-freescale-mx25-3ds/bin/update_kernel diff --git a/arch/arm/boards/freescale-mx25-3ds/env/bin/update_root b/arch/arm/boards/freescale-mx25-3ds/defaultenv-freescale-mx25-3ds/bin/update_root index eaf36ebcea..eaf36ebcea 100644 --- a/arch/arm/boards/freescale-mx25-3ds/env/bin/update_root +++ b/arch/arm/boards/freescale-mx25-3ds/defaultenv-freescale-mx25-3ds/bin/update_root diff --git a/arch/arm/boards/freescale-mx25-3ds/env/config b/arch/arm/boards/freescale-mx25-3ds/defaultenv-freescale-mx25-3ds/config index 8469935b20..8469935b20 100644 --- a/arch/arm/boards/freescale-mx25-3ds/env/config +++ b/arch/arm/boards/freescale-mx25-3ds/defaultenv-freescale-mx25-3ds/config |