diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-07 11:04:38 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-07 11:04:38 +0200 |
| commit | f4a140e55739c8437b1b139d915b957b416840d8 (patch) | |
| tree | 92e2500706278e95f892219231dcc5c6854f1e70 /target/config | |
| parent | 3c2b8c14ba47341b7af24dc4d5cae3d32c72302e (diff) | |
| parent | 5c408039aa7f26d60691b585286a6a3ba90a0bb1 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/config')
| -rw-r--r-- | target/config/Config.in | 22 | ||||
| -rw-r--r-- | target/config/Config.in.tools | 13 |
2 files changed, 27 insertions, 8 deletions
diff --git a/target/config/Config.in b/target/config/Config.in index 501039ed1..78d15a97e 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -202,7 +202,7 @@ config ADK_TARGET_KERNEL_MINICONFIG default "qemu-sh" if ADK_TARGET_SYSTEM_QEMU_SH4EB default "qemu-sparc" if ADK_TARGET_SYSTEM_QEMU_SPARC default "qemu-sparc64" if ADK_TARGET_SYSTEM_QEMU_SPARC64 - default "qemu-i686" if ADK_TARGET_SYSTEM_QEMU_I686 + default "qemu-x86" if ADK_TARGET_SYSTEM_QEMU_I686 || ADK_TARGET_SYSTEM_QEMU_I486 default "qemu-x86_64" if ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86_64_32 || ADK_TARGET_SYSTEM_QEMU_X86_64_X32 default "aranym-m68k" if ADK_TARGET_SYSTEM_ARANYM_M68K default "ibm-x40" if ADK_TARGET_SYSTEM_IBM_X40 @@ -210,11 +210,28 @@ config ADK_TARGET_KERNEL_MINICONFIG default "raspberry-pi" if ADK_TARGET_SYSTEM_RASPBERRY_PI default "sharp-zaurus" if ADK_TARGET_SYSTEM_SHARP_ZAURUS default "lemote-yeelong" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG + default "generic-pc" if ADK_TARGET_SYSTEM_GENERIC_PC config ADK_QEMU_ARGS string default "-nographic" if ADK_TARGET_QEMU_WITHOUT_GRAPHIC +menu "Qemu configuration" +depends on ADK_HARDWARE_QEMU + +choice +prompt "Use a Bootloader" +depends on ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_LINUX_X86 + +config ADK_TARGET_QEMU_WITHOUT_BOOTLOADER + boolean "do not use bootloader" + +config ADK_TARGET_QEMU_WITH_BOOTLOADER + boolean "use bootloader" + select ADK_PACKAGE_GRUB if ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_LINUX_X86 + +endchoice + choice prompt "Qemu MICROBLAZE Emulation" depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE || ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL @@ -265,7 +282,7 @@ config ADK_TARGET_QEMU_WITH_BLOCK boolean "enabled" select ADK_KERNEL_SCSI_SYM53C8XX_2 if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB select ADK_KERNEL_MTD_M25P80 if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 || ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 - select ADK_KERNEL_ATA_PIIX if ADK_LINUX_MIPS || ADK_TARGET_SYSTEM_QEMU_I686 || ADK_TARGET_SYSTEM_QEMU_X86_64 + select ADK_KERNEL_ATA_PIIX if ADK_LINUX_MIPS || ADK_LINUX_X86 || ADK_TARGET_SYSTEM_QEMU_X86_64 select ADK_KERNEL_PATA_MACIO if ADK_TARGET_SYSTEM_QEMU_PPC select ADK_KERNEL_SCSI_IBMVSCSI if ADK_TARGET_SYSTEM_QEMU_PPC64 select ADK_KERNEL_SCSI_SUNESP if ADK_TARGET_SYSTEM_QEMU_SPARC @@ -320,6 +337,7 @@ config ADK_TARGET_QEMU_WITH_VIRTIO endchoice +endmenu choice prompt "Use ARM thumb mode" diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index f95a4508b..b3e900bb3 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -105,15 +105,16 @@ config ADK_HOST_BUILD_QEMU boolean default n -config ADK_HOST_NEED_SYSLINUX +# optional, must be used from OpenADK +config ADK_HOST_NEED_MKIMAGE boolean default n -config ADK_HOST_BUILD_SYSLINUX +config ADK_HOST_BUILD_MKIMAGE boolean + default y if ADK_HOST_NEED_MKIMAGE default n -# optional, must be used from OpenADK config ADK_HOST_NEED_MTD_UTILS boolean default n @@ -132,13 +133,13 @@ config ADK_HOST_BUILD_SQUASHFS default y if ADK_HOST_NEED_SQUASHFS default n -config ADK_HOST_NEED_MKIMAGE +config ADK_HOST_NEED_SYSLINUX boolean default n -config ADK_HOST_BUILD_MKIMAGE +config ADK_HOST_BUILD_SYSLINUX boolean - default y if ADK_HOST_NEED_MKIMAGE + default y if ADK_HOST_NEED_SYSLINUX default n config ADK_HOST_BUILD_PCRE |