Browse Source

or1k: unbreak foo= shell functionality, mksh can be used now

Waldemar Brodkorb 8 years ago
parent
commit
153ab95f62
3 changed files with 2 additions and 4 deletions
  1. 0 1
      package/mksh/Makefile
  2. 1 3
      target/config/Config.in.runtime
  3. 1 0
      target/or1k/kernel/or1k-sim

+ 0 - 1
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_SITES:=		$(MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/)
 
 
 PKG_DFLT_MKSH:=		y if !ADK_APPLIANCE_TOOLCHAIN
 PKG_DFLT_MKSH:=		y if !ADK_APPLIANCE_TOOLCHAIN
-PKG_ARCH_DEPENDS:=	!or1k
 
 
 PKG_SUBPKGS:=		MKSH MKSH_TEST
 PKG_SUBPKGS:=		MKSH MKSH_TEST
 PKGSD_MKSH_TEST:=	install testsuite
 PKGSD_MKSH_TEST:=	install testsuite

+ 1 - 3
target/config/Config.in.runtime

@@ -367,7 +367,6 @@ config ADK_RUNTIME_KBD_LAYOUT
 choice
 choice
 prompt "initial login shell for the root user"
 prompt "initial login shell for the root user"
 default ADK_ROOTSH_HUSH if ADK_TARGET_WITHOUT_MMU
 default ADK_ROOTSH_HUSH if ADK_TARGET_WITHOUT_MMU
-default ADK_ROOTSH_ASH if ADK_TARGET_ARCH_OR1K
 default ADK_ROOTSH_MKSH
 default ADK_ROOTSH_MKSH
 
 
 config ADK_ROOTSH_MKSH
 config ADK_ROOTSH_MKSH
@@ -423,12 +422,11 @@ endchoice
 choice
 choice
 prompt "system /bin/sh (POSIX script shell)"
 prompt "system /bin/sh (POSIX script shell)"
 default ADK_BINSH_HUSH if ADK_TARGET_WITHOUT_MMU
 default ADK_BINSH_HUSH if ADK_TARGET_WITHOUT_MMU
-default ADK_BINSH_ASH if ADK_TARGET_ARCH_OR1K
 default ADK_BINSH_MKSH
 default ADK_BINSH_MKSH
 
 
 config ADK_BINSH_MKSH
 config ADK_BINSH_MKSH
 	bool "mksh (MirBSD Korn Shell)"
 	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
 	help
 	  Use mksh (a Korn Shell variant) as system shell, which is
 	  Use mksh (a Korn Shell variant) as system shell, which is
 	  both small and powerful, so quite suited for this task.
 	  both small and powerful, so quite suited for this task.

+ 1 - 0
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_FL1=y
 CONFIG_OPENRISC_HAVE_INST_MUL=y
 CONFIG_OPENRISC_HAVE_INST_MUL=y
 CONFIG_OPENRISC_HAVE_INST_DIV=y
 CONFIG_OPENRISC_HAVE_INST_DIV=y
+CONFIG_OPENRISC_NO_SPR_SR_DSX=y