diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:39:17 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:39:17 +0200 |
| commit | 2735fdf97305e110eba8e776f8728a52ae886c05 (patch) | |
| tree | 0ce26ce1066bd7260625ca641b1e64c99015f47f /target/sh | |
| parent | 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/sh')
| -rw-r--r-- | target/sh/sys-available/qemu-sh4 | 7 | ||||
| -rw-r--r-- | target/sh/sys-available/qemu-sh4eb | 11 | ||||
| -rw-r--r-- | target/sh/sys-available/toolchain-sh4 | 7 | ||||
| -rw-r--r-- | target/sh/sys-available/toolchain-sh4eb | 11 |
4 files changed, 6 insertions, 30 deletions
diff --git a/target/sh/sys-available/qemu-sh4 b/target/sh/sys-available/qemu-sh4 index 5ebd224be..0e0dad617 100644 --- a/target/sh/sys-available/qemu-sh4 +++ b/target/sh/sys-available/qemu-sh4 @@ -1,11 +1,10 @@ config ADK_TARGET_SYSTEM_QEMU_SH4 - bool "Qemu Emulator (Little Endian)" + bool "Qemu Emulator" select ADK_sh - select ADK_little select ADK_qemu_sh4 select ADK_CPU_SH4 - select ADK_HARDWARE_QEMU + select ADK_TARGET_QEMU select ADK_TARGET_KERNEL_ZIMAGE help - Support for Qemu Emulator (superh). + Support for Qemu Emulator SUPERH architecture. diff --git a/target/sh/sys-available/qemu-sh4eb b/target/sh/sys-available/qemu-sh4eb deleted file mode 100644 index 621e27e8a..000000000 --- a/target/sh/sys-available/qemu-sh4eb +++ /dev/null @@ -1,11 +0,0 @@ -config ADK_TARGET_SYSTEM_QEMU_SH4EB - bool "Qemu Emulator (Big Endian)" - select ADK_sh - select ADK_big - select ADK_qemu_sh4eb - select ADK_CPU_SH4 - select ADK_HARDWARE_QEMU - select ADK_TARGET_KERNEL_ZIMAGE - help - Support for Qemu Emulator (superh). - diff --git a/target/sh/sys-available/toolchain-sh4 b/target/sh/sys-available/toolchain-sh4 index 91110cb0c..0675fe71c 100644 --- a/target/sh/sys-available/toolchain-sh4 +++ b/target/sh/sys-available/toolchain-sh4 @@ -1,11 +1,10 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SH4 - bool "Toolchain only (little endian)" + bool "Toolchain only" select ADK_sh - select ADK_little select ADK_toolchain_sh4 select ADK_CPU_SH4 - select ADK_TOOLCHAIN + select ADK_TARGET_TOOLCHAIN select ADK_TARGET_PACKAGE_TXZ help - Build a superh toolchain (sh4). + SUPERH toolchain. diff --git a/target/sh/sys-available/toolchain-sh4eb b/target/sh/sys-available/toolchain-sh4eb deleted file mode 100644 index 70b99cb8e..000000000 --- a/target/sh/sys-available/toolchain-sh4eb +++ /dev/null @@ -1,11 +0,0 @@ -config ADK_TARGET_SYSTEM_TOOLCHAIN_SH4EB - bool "Toolchain only (big endian)" - select ADK_sh - select ADK_big - select ADK_toolchain_sh4eb - select ADK_CPU_SH4 - select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TXZ - help - Build a superh toolchain (sh4 big endian). - |