summaryrefslogtreecommitdiff
path: root/target/config
diff options
context:
space:
mode:
Diffstat (limited to 'target/config')
-rw-r--r--target/config/Config.in21
1 files changed, 19 insertions, 2 deletions
diff --git a/target/config/Config.in b/target/config/Config.in
index e2e9f8748..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
@@ -216,6 +216,22 @@ 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
@@ -266,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 || ADK_TARGET_SYSTEM_QEMU_I486
+ 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
@@ -321,6 +337,7 @@ config ADK_TARGET_QEMU_WITH_VIRTIO
endchoice
+endmenu
choice
prompt "Use ARM thumb mode"