From 301b9dca02cd85f37d9a7fdcc140c3da95fc80d3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 14 Nov 2016 20:21:39 +0100 Subject: or1k: disable mksh (deadlock), default to ash and newer kernel --- target/or1k/kernel/qemu-or1k | 1 - target/or1k/systems/or1k-sim | 2 +- target/or1k/systems/qemu-or1k | 3 +++ 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'target/or1k') diff --git a/target/or1k/kernel/qemu-or1k b/target/or1k/kernel/qemu-or1k index 2a624b5a2..b8d0f3546 100644 --- a/target/or1k/kernel/qemu-or1k +++ b/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 diff --git a/target/or1k/systems/or1k-sim b/target/or1k/systems/or1k-sim index 21dd5876a..46b636c14 100644 --- a/target/or1k/systems/or1k-sim +++ b/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. diff --git a/target/or1k/systems/qemu-or1k b/target/or1k/systems/qemu-or1k index 2fd2ed672..dc138c97d 100644 --- a/target/or1k/systems/qemu-or1k +++ b/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. -- cgit v1.2.3