From 4d9734c8a26437838a5c1085fb3859734036e150 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 26 Sep 2016 09:50:08 +0200 Subject: 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_); 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 --- arch/nios2/boards/generic/Makefile | 1 + arch/nios2/boards/generic/defaultenv-generic/config | 20 ++++++++++++++++++++ arch/nios2/boards/generic/env/config | 20 -------------------- arch/nios2/boards/generic/generic.c | 4 ++++ arch/nios2/configs/generic_defconfig | 1 - 5 files changed, 25 insertions(+), 21 deletions(-) create mode 100644 arch/nios2/boards/generic/defaultenv-generic/config delete mode 100644 arch/nios2/boards/generic/env/config (limited to 'arch/nios2') diff --git a/arch/nios2/boards/generic/Makefile b/arch/nios2/boards/generic/Makefile index d8a3d7f2cc..f26283832a 100644 --- a/arch/nios2/boards/generic/Makefile +++ b/arch/nios2/boards/generic/Makefile @@ -1 +1,2 @@ obj-y += generic.o +bbenv-$(CONFIG_DEFAULT_ENVIRONMENT_GENERIC) += defaultenv-generic diff --git a/arch/nios2/boards/generic/defaultenv-generic/config b/arch/nios2/boards/generic/defaultenv-generic/config new file mode 100644 index 0000000000..16adc49f1c --- /dev/null +++ b/arch/nios2/boards/generic/defaultenv-generic/config @@ -0,0 +1,20 @@ +#!/bin/sh + +# can be either 'net' or 'flash' +kernel=flash +root=flash + +kernel_loc=nor + +# use 'dhcp' todo dhcp in barebox and in kernel +ip=none + +autoboot_timeout=3 + +nor_parts="256k(barebox),128k(env),4M(kernel),-(rootfs)" + +bootargs="console=ttyS0,9600" + +# set a fancy prompt (if support is compiled in) +PS1="\e[1;33mbarebox@\e[1;32mgeneric:\w\e[0m " + diff --git a/arch/nios2/boards/generic/env/config b/arch/nios2/boards/generic/env/config deleted file mode 100644 index 16adc49f1c..0000000000 --- a/arch/nios2/boards/generic/env/config +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# can be either 'net' or 'flash' -kernel=flash -root=flash - -kernel_loc=nor - -# use 'dhcp' todo dhcp in barebox and in kernel -ip=none - -autoboot_timeout=3 - -nor_parts="256k(barebox),128k(env),4M(kernel),-(rootfs)" - -bootargs="console=ttyS0,9600" - -# set a fancy prompt (if support is compiled in) -PS1="\e[1;33mbarebox@\e[1;32mgeneric:\w\e[0m " - diff --git a/arch/nios2/boards/generic/generic.c b/arch/nios2/boards/generic/generic.c index 61b60b6fd9..0c2c67c567 100644 --- a/arch/nios2/boards/generic/generic.c +++ b/arch/nios2/boards/generic/generic.c @@ -4,6 +4,7 @@ #include #include #include +#include static int phy_address = 1; @@ -52,6 +53,9 @@ static int generic_devices_init(void) protect_file("/dev/env0", 1); + if (IS_ENABLED(CONFIG_DEFAULT_ENVIRONMENT_GENERIC)) + defaultenv_append_directory(defaultenv_generic); + return 0; } diff --git a/arch/nios2/configs/generic_defconfig b/arch/nios2/configs/generic_defconfig index 39f41dd25d..91d364f8eb 100644 --- a/arch/nios2/configs/generic_defconfig +++ b/arch/nios2/configs/generic_defconfig @@ -6,7 +6,6 @@ CONFIG_CMDLINE_EDITING=y CONFIG_AUTO_COMPLETE=y CONFIG_PARTITION=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y -CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/nios2/boards/generic/env" CONFIG_CMD_EDIT=y CONFIG_CMD_SLEEP=y CONFIG_CMD_SAVEENV=y -- cgit v1.2.3