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/config | |
| parent | 8441e81773371fa37c9d7774436f357e97f4db99 (diff) | |
| parent | d7af52ccd4cab1fcffaec5706a8a6eba96502b89 (diff) | |
merge conflict
Diffstat (limited to 'target/config')
| -rw-r--r-- | target/config/Config.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/target/config/Config.in b/target/config/Config.in index 68e2eefb0..e22880b1e 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -49,6 +49,7 @@ config ADK_TARGET_FLOAT default "soft" if ADK_soft_float config ADK_TARGET_ARM_MODE + depends on ADK_LINUX_ARM string default "arm" if ADK_mode_arm default "thumb" if ADK_mode_thumb @@ -695,6 +696,7 @@ config ADK_TARGET_LIB_MUSL ADK_LINUX_MICROBLAZE || \ ADK_LINUX_MIPS || \ ADK_LINUX_PPC || \ + ADK_LINUX_SH || \ ADK_LINUX_X86 || \ ADK_LINUX_X86_64 help |