diff options
Diffstat (limited to 'arch/nios2')
-rw-r--r-- | arch/nios2/boards/generic/Makefile | 1 | ||||
-rw-r--r-- | arch/nios2/boards/generic/defaultenv-generic/config (renamed from arch/nios2/boards/generic/env/config) | 0 | ||||
-rw-r--r-- | arch/nios2/boards/generic/generic.c | 4 | ||||
-rw-r--r-- | arch/nios2/configs/generic_defconfig | 1 |
4 files changed, 5 insertions, 1 deletions
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/env/config b/arch/nios2/boards/generic/defaultenv-generic/config index 16adc49f1c..16adc49f1c 100644 --- a/arch/nios2/boards/generic/env/config +++ b/arch/nios2/boards/generic/defaultenv-generic/config 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 <partition.h> #include <fs.h> #include <memory.h> +#include <envfs.h> 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 |