diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-06 10:01:36 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-06 10:01:36 +0100 |
| commit | dc78a21a21568a389cf214ff29113f99286d644a (patch) | |
| tree | ef919a6eedf02a20128dd2b8a7f008353698a1cc /target | |
| parent | e96c649294fd763fa8631b866397a07b9434bbd3 (diff) | |
| parent | 191b566ae5e66d2180924a4151f67e635fd12ad5 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
| -rw-r--r-- | target/config/Config.in.runtime | 9 | ||||
| -rw-r--r-- | target/linux/config/Config.in.flash | 2 | ||||
| -rw-r--r-- | target/microblaze/sys-available/qemu-microblaze | 1 | ||||
| -rw-r--r-- | target/x86/sys-available/ibm-x40 | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 51b2dde0c..6e580f614 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -23,6 +23,7 @@ config ADK_RUNTIME_PASSWORD config ADK_RUNTIME_TMPFS_SIZE string "size of /tmp in memory (kB)" default "16384" if ADK_HARDWARE_QEMU + default "16384" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default "32768" if ADK_TARGET_SYSTEM_IBM_X40 default "32768" if ADK_TARGET_SYSTEM_RASPBERRY_PI default "2048" @@ -37,8 +38,8 @@ config ADK_RUNTIME_TIMEZONE choice prompt "Console output on embedded system" -default ADK_RUNTIME_CONSOLE_BOTH if ADK_TARGET_WITH_VGA && !ADK_TARGET_SYSTEM_RASPBERRY_PI && !ADK_TARGET_SYSTEM_QEMU_SH4 && !ADK_TARGET_SYSTEM_QEMU_SH4EB -default ADK_RUNTIME_CONSOLE_VGA if ADK_TARGET_SYSTEM_RASPBERRY_PI || ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB +default ADK_RUNTIME_CONSOLE_BOTH if ADK_TARGET_WITH_VGA && !ADK_TARGET_SYSTEM_RASPBERRY_PI && !ADK_TARGET_SYSTEM_QEMU_SH4 && !ADK_TARGET_SYSTEM_QEMU_SH4EB && !ADK_TARGET_SYSTEM_LEMOTE_YEELONG +default ADK_RUNTIME_CONSOLE_VGA if ADK_TARGET_SYSTEM_RASPBERRY_PI || ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB || ADK_TARGET_SYSTEM_LEMOTE_YEELONG default ADK_RUNTIME_CONSOLE_SERIAL config ADK_RUNTIME_CONSOLE_VGA @@ -145,10 +146,6 @@ config ADK_BINSH_ZSH endchoice - - - - config ADK_SIMPLE_NETWORK_CONFIG prompt "simple network configuration" boolean diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash index 26f00845a..773c518e8 100644 --- a/target/linux/config/Config.in.flash +++ b/target/linux/config/Config.in.flash @@ -138,4 +138,4 @@ config ADK_TARGET_MTD_SIZE int default "33554432" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE default "33554432" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL - default "" + default "0" diff --git a/target/microblaze/sys-available/qemu-microblaze b/target/microblaze/sys-available/qemu-microblaze index 294f793ff..8f35db842 100644 --- a/target/microblaze/sys-available/qemu-microblaze +++ b/target/microblaze/sys-available/qemu-microblaze @@ -7,6 +7,7 @@ config ADK_TARGET_SYSTEM_QEMU_MICROBLAZE select ADK_HARDWARE_QEMU select ADK_TARGET_KERNEL_LINUXBIN select ADK_USE_KERNEL_MINICONFIG + select ADK_TOOLCHAIN_GCC_SJLJ help Qemu support for microblaze big endian architecture. diff --git a/target/x86/sys-available/ibm-x40 b/target/x86/sys-available/ibm-x40 index 1327fb922..7dc75ebf4 100644 --- a/target/x86/sys-available/ibm-x40 +++ b/target/x86/sys-available/ibm-x40 @@ -1,6 +1,5 @@ config ADK_TARGET_SYSTEM_IBM_X40 bool "IBM X40 laptop" - depends on ADK_BROKEN select ADK_x86 select ADK_ibm_x40 select ADK_CPU_PENTIUM_M @@ -22,6 +21,7 @@ config ADK_TARGET_SYSTEM_IBM_X40 select ADK_TARGET_WITH_ACPI # with docking station select ADK_TARGET_WITH_PP + select ADK_TARGET_KERNEL_BZIMAGE help System profile for IBM X40 laptop. |