summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2016-03-25 10:00:24 +0100
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2016-03-25 10:00:44 +0100
commit95a733b5b20151ab0a786fb85b784f445daf4651 (patch)
tree420394061d57a9a1a8260e3c60ce8bde4ee946a9
parenta24e4ad01b7700deb03e8fe687391aa2f1d3e1db (diff)
simplify qemu options, hide block choice
-rw-r--r--target/config/Config.in.qemuopts59
-rw-r--r--target/config/Config.in.rootfs1
2 files changed, 20 insertions, 40 deletions
diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts
index e8f5be0d8..85856e906 100644
--- a/target/config/Config.in.qemuopts
+++ b/target/config/Config.in.qemuopts
@@ -1,9 +1,6 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-menu "Qemu system configuration"
-depends on ADK_TARGET_QEMU && !ADK_TARGET_SYSTEM_QEMU_XTENSA
-
config ADK_QEMU_ARGS
string
default "" if ADK_TARGET_QEMU_WITH_GRAPHIC
@@ -15,44 +12,8 @@ config ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY
select ADK_TARGET_WITH_VGA
depends on ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ || ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER
-choice
-prompt "Bootloader"
-depends on ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86
-
-config ADK_TARGET_QEMU_WITHOUT_BOOTLOADER
- bool "do not use bootloader"
-
-config ADK_TARGET_QEMU_WITH_BOOTLOADER
- bool "use bootloader"
- select ADK_PACKAGE_GRUB if ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86
-
-endchoice
-
-choice
-prompt "Qemu Emulation with storage device"
-depends on ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB \
- || ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 \
- || ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER \
- || ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ \
- || ADK_TARGET_SYSTEM_QEMU_M68K_Q800 \
- || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \
- || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 \
- || ADK_TARGET_SYSTEM_QEMU_MIPS \
- || ADK_TARGET_SYSTEM_QEMU_MIPS64 \
- || ADK_TARGET_SYSTEM_QEMU_PPC_MACPPC \
- || ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO \
- || ADK_TARGET_SYSTEM_QEMU_PPC64 \
- || ADK_TARGET_SYSTEM_QEMU_SH \
- || ADK_TARGET_SYSTEM_QEMU_SPARC \
- || ADK_TARGET_SYSTEM_QEMU_SPARC64 \
- || ADK_TARGET_SYSTEM_QEMU_X86 \
- || ADK_TARGET_SYSTEM_QEMU_X86_64
-
-config ADK_TARGET_QEMU_WITHOUT_BLOCK
- bool "disabled"
-
config ADK_TARGET_QEMU_WITH_BLOCK
- bool "enabled"
+ bool
select ADK_TARGET_WITH_BLOCK
select ADK_KERNEL_SCSI_SYM53C8XX_2 if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB
select ADK_KERNEL_MTD_M25P80 if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \
@@ -72,8 +33,26 @@ config ADK_TARGET_QEMU_WITH_BLOCK
|| ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER
select ADK_KERNEL_MMC_ARMMMCI if ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9
+menu "Qemu system configuration"
+depends on ADK_TARGET_QEMU && (ADK_TARGET_SYSTEM_QEMU_X86_64 \
+ || ADK_TARGET_SYSTEM_QEMU_X86 \
+ || ADK_TARGET_SYSTEM_QEMU_AARCH64 \
+ || ADK_TARGET_SYSTEM_QEMU_SPARC64)
+
+choice
+prompt "Bootloader"
+depends on ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86
+
+config ADK_TARGET_QEMU_WITHOUT_BOOTLOADER
+ bool "do not use bootloader"
+
+config ADK_TARGET_QEMU_WITH_BOOTLOADER
+ bool "use bootloader"
+ select ADK_PACKAGE_GRUB if ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86
+
endchoice
+
choice
prompt "Qemu Emulation with graphical output"
depends on ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 \
diff --git a/target/config/Config.in.rootfs b/target/config/Config.in.rootfs
index c1410e446..4c26cad1b 100644
--- a/target/config/Config.in.rootfs
+++ b/target/config/Config.in.rootfs
@@ -141,6 +141,7 @@ config ADK_TARGET_ROOTFS_ARCHIVE
bool "Archive usable for different filesystems"
select ADK_HOST_NEED_GENEXT2FS if ADK_TARGET_QEMU || ADK_TARGET_VBOX
select ADK_KERNEL_EXT2_FS if ADK_TARGET_QEMU || ADK_TARGET_VBOX
+ select ADK_TARGET_QEMU_WITH_BLOCK
depends on !ADK_TARGET_SIM \
&& !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 \
&& !ADK_TARGET_SYSTEM_QEMU_METAG