diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-06 17:05:09 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-06 17:05:09 +0200 |
| commit | 208807cc63754f699107bbad24687b3ae1d326fe (patch) | |
| tree | 749ada25a27d3659f1b24ae245fe6a416eeb7dae /target/config/Config.in | |
| parent | f0b814dddb1b74c91fd54af412ad356fc68be4a2 (diff) | |
| parent | b03ac31608c2ee5349a5d098980105957a4a6bca (diff) | |
fix conflict
Diffstat (limited to 'target/config/Config.in')
| -rw-r--r-- | target/config/Config.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/target/config/Config.in b/target/config/Config.in index 4ab0999be..d5cdcdb70 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -230,6 +230,9 @@ config ADK_CPU_I686 config ADK_CPU_GEODE boolean +config ADK_CPU_PPC + boolean + config ADK_CPU_PENTIUM_M boolean @@ -257,6 +260,7 @@ config ADK_TARGET_CPU_ARCH default "arm" if ADK_LINUX_ARM && ADK_little default "armeb" if ADK_LINUX_ARM && ADK_big default "sparc" if ADK_LINUX_SPARC + default "powerpc" if ADK_CPU_PPC config ADK_TARGET_ABI_CFLAGS string |