or1k: disable mksh (deadlock), default to ash and newer kernel

package/mksh/Makefile

@@ -14,6 +14,7 @@ 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

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.

target/or1k/kernel/qemu-or1k

@@ -1,4 +1,3 @@
 CONFIG_OPENRISC=y
 CONFIG_OPENRISC_BUILTIN_DTB="or1ksim"
 CONFIG_OR1K_1200=y
-CONFIG_OPENRISC_HAVE_INST_LWA_SWA=y

target/or1k/systems/or1k-sim

@@ -5,7 +5,7 @@ config ADK_TARGET_SYSTEM_OR1K_SIM
 	select ADK_TARGET_WITH_NET
 	select ADK_TARGET_KERNEL_VERSION_GIT
 	select ADK_TARGET_KERNEL_REPO "https://github.com/openrisc/linux.git"
-	select ADK_TARGET_KERNEL_HASH "69ebcc44388021120b863c433ee68677098b9c37"
+	select ADK_TARGET_KERNEL_HASH "acba10ee627d6fd7001d3617dc735ec1caa654f6"
 	help
 	  Simulator for OR1K architecture.
 

target/or1k/systems/qemu-or1k

@@ -2,6 +2,9 @@ config ADK_TARGET_SYSTEM_QEMU_OR1K
 	bool "Qemu Emulator"
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_CPU_OR1K
+	select ADK_TARGET_KERNEL_VERSION_GIT
+	select ADK_TARGET_KERNEL_REPO "https://github.com/openrisc/linux.git"
+	select ADK_TARGET_KERNEL_HASH "acba10ee627d6fd7001d3617dc735ec1caa654f6"
 	help
 	  Qemu Emulator for OR1K architecture.