diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-01 09:18:56 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-01 09:18:56 +0100 |
commit | 256a81b3b12fceef1676d6114d9ff0568b645bca (patch) | |
tree | 80776c7bb719a3f29a64305ff6ff5f9c2445a186 /target/sh/sys-available | |
parent | 8441e81773371fa37c9d7774436f357e97f4db99 (diff) | |
parent | d7af52ccd4cab1fcffaec5706a8a6eba96502b89 (diff) |
merge conflict
Diffstat (limited to 'target/sh/sys-available')
-rw-r--r-- | target/sh/sys-available/qemu-sh4 | 1 | ||||
-rw-r--r-- | target/sh/sys-available/qemu-sh4eb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/target/sh/sys-available/qemu-sh4 b/target/sh/sys-available/qemu-sh4 index 54f13fb65..a872b20dc 100644 --- a/target/sh/sys-available/qemu-sh4 +++ b/target/sh/sys-available/qemu-sh4 @@ -8,6 +8,7 @@ config ADK_TARGET_SYSTEM_QEMU_SH4 select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_INPUT select ADK_TARGET_WITH_USB + select ADK_TARGET_KERNEL_ZIMAGE help Support for Qemu Emulator (superh). diff --git a/target/sh/sys-available/qemu-sh4eb b/target/sh/sys-available/qemu-sh4eb index 70365d7d4..aeffc92b6 100644 --- a/target/sh/sys-available/qemu-sh4eb +++ b/target/sh/sys-available/qemu-sh4eb @@ -9,6 +9,7 @@ config ADK_TARGET_SYSTEM_QEMU_SH4EB select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_INPUT select ADK_TARGET_WITH_USB + select ADK_TARGET_KERNEL_ZIMAGE help Support for Qemu Emulator (superh). |