summaryrefslogtreecommitdiffstats
path: root/arch/openrisc
diff options
context:
space:
mode:
authorFranck Jullien <franck.jullien@gmail.com>2012-10-16 21:54:55 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-10-21 10:56:58 +0200
commit424d74e4bc43a80835502572aebc501e201f34fe (patch)
tree1509dd3c190b080d82227dcc5a6d31710fdd5595 /arch/openrisc
parentf99ea5c9d8cfddf3a1d6b181d0dbb26e06a86d2b (diff)
downloadbarebox-424d74e4bc43a80835502572aebc501e201f34fe.tar.gz
barebox-424d74e4bc43a80835502572aebc501e201f34fe.tar.xz
openrisc: switch to defaultenv-2 and change boardinfo
Signed-off-by: Franck Jullien <franck.jullien@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/openrisc')
-rw-r--r--arch/openrisc/Kconfig3
-rw-r--r--arch/openrisc/configs/generic_defconfig4
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index a3cb33765d..bcfd67f261 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 68e037119f..7ae85b0344 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