From 153ab95f62e0b6be467507f40fcd24db7c5f833e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 17 Nov 2016 20:23:08 +0100 Subject: or1k: unbreak foo= shell functionality, mksh can be used now --- package/mksh/Makefile | 1 - target/config/Config.in.runtime | 4 +--- target/or1k/kernel/or1k-sim | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/package/mksh/Makefile b/package/mksh/Makefile index 98ce04ef9..c618ebd9e 100644 --- a/package/mksh/Makefile +++ b/package/mksh/Makefile @@ -14,7 +14,6 @@ PKG_URL:= http://www.mirbsd.org/mksh.htm PKG_SITES:= $(MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/) PKG_DFLT_MKSH:= y if !ADK_APPLIANCE_TOOLCHAIN -PKG_ARCH_DEPENDS:= !or1k PKG_SUBPKGS:= MKSH MKSH_TEST PKGSD_MKSH_TEST:= install testsuite 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 -- cgit v1.2.3