summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
Diffstat (limited to 'target')
-rw-r--r--target/config/Config.in.runtime4
-rw-r--r--target/or1k/kernel/or1k-sim1
2 files changed, 2 insertions, 3 deletions
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index cbf6ad0a1..a22a692a2 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -367,7 +367,6 @@ config ADK_RUNTIME_KBD_LAYOUT
choice
prompt "initial login shell for the root user"
default ADK_ROOTSH_HUSH if ADK_TARGET_WITHOUT_MMU
-default ADK_ROOTSH_ASH if ADK_TARGET_ARCH_OR1K
default ADK_ROOTSH_MKSH
config ADK_ROOTSH_MKSH
@@ -423,12 +422,11 @@ endchoice
choice
prompt "system /bin/sh (POSIX script shell)"
default ADK_BINSH_HUSH if ADK_TARGET_WITHOUT_MMU
-default ADK_BINSH_ASH if ADK_TARGET_ARCH_OR1K
default ADK_BINSH_MKSH
config ADK_BINSH_MKSH
bool "mksh (MirBSD Korn Shell)"
- select ADK_PACKAGE_MKSH if !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_ARCH_OR1K
+ select ADK_PACKAGE_MKSH if !ADK_APPLIANCE_TOOLCHAIN
help
Use mksh (a Korn Shell variant) as system shell, which is
both small and powerful, so quite suited for this task.
diff --git a/target/or1k/kernel/or1k-sim b/target/or1k/kernel/or1k-sim
index fdd7940d6..ee4d9d55c 100644
--- a/target/or1k/kernel/or1k-sim
+++ b/target/or1k/kernel/or1k-sim
@@ -5,3 +5,4 @@ CONFIG_OPENRISC_HAVE_INST_FF1=y
CONFIG_OPENRISC_HAVE_INST_FL1=y
CONFIG_OPENRISC_HAVE_INST_MUL=y
CONFIG_OPENRISC_HAVE_INST_DIV=y
+CONFIG_OPENRISC_NO_SPR_SR_DSX=y