From 301b9dca02cd85f37d9a7fdcc140c3da95fc80d3 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Mon, 14 Nov 2016 20:21:39 +0100
Subject: or1k: disable mksh (deadlock), default to ash and newer kernel

---
 target/config/Config.in.runtime | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'target/config')

diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 0acafbd16..cbf6ad0a1 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -367,11 +367,12 @@ 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
 	bool "mksh (MirBSD Korn Shell)"
-	select ADK_PACKAGE_MKSH if !ADK_APPLIANCE_TOOLCHAIN
+	select ADK_PACKAGE_MKSH if !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_ARCH_OR1K
 	help
 	  Use mksh (a Korn Shell variant) as standard login shell
 	  for the superuser.
@@ -422,11 +423,12 @@ 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
+	select ADK_PACKAGE_MKSH if !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_ARCH_OR1K
 	help
 	  Use mksh (a Korn Shell variant) as system shell, which is
 	  both small and powerful, so quite suited for this task.
-- 
cgit v1.2.3