[PATCH 1/2] openrisc: switch to defaultenv-2 and change boardinfo

[Franck Jullien]

Signed-off-by: Franck Jullien <franck.jullien at gmail.com>

---
 arch/openrisc/Kconfig                   |    3 ++-
 arch/openrisc/configs/generic_defconfig |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index a3cb337..bcfd67f 100644
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@@ -1,6 +1,7 @@
 config OPENRISC
 	bool
 	select HAVE_CONFIGURABLE_MEMORY_LAYOUT
+	select HAVE_DEFAULT_ENVIRONMENT_NEW
 	default y
 
 # not used
@@ -9,7 +10,7 @@ config ARCH_TEXT_BASE
 	default 0x00000000
 
 config BOARDINFO
-	default "Openrisc simulator" if GENERIC
+	default "or1k" if GENERIC
 
 choice
 	prompt "Select your board"
diff --git a/arch/openrisc/configs/generic_defconfig b/arch/openrisc/configs/generic_defconfig
index 68e0371..7ae85b0 100644
--- a/arch/openrisc/configs/generic_defconfig
+++ b/arch/openrisc/configs/generic_defconfig
@@ -3,13 +3,13 @@ CONFIG_HUSH_FANCY_PROMPT=y
 CONFIG_CMDLINE_EDITING=y
 CONFIG_AUTO_COMPLETE=y
 CONFIG_PARTITION=y
-CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y
+CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
 CONFIG_CMD_EDIT=y
 CONFIG_CMD_SAVEENV=y
-CONFIG_CMD_LOADENV=y
 CONFIG_CMD_EXPORT=y
 CONFIG_CMD_PRINTENV=y
 CONFIG_CMD_TIME=y
+CONFIG_CMD_ECHO_E=y
 CONFIG_CMD_MEMINFO=y
 CONFIG_CMD_FLASH=y
 # CONFIG_CMD_BOOTM is not set
-- 
1.7.1