From fd5e1bfc81aa5ea3e3893fc61f8c50509a3487c7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 7 Mar 2015 14:35:17 -0600 Subject: reorder libc and toolchain options After a short discussion with Phil, I put Libc stuff into Toolchain menu, as it does not belong to Target configuration. Add a Advanced Option menu for specific toolchain related options. I think this change make building OpenADK for beginners simpler. A starter doesn't know anything about different libc, floating settings, ... --- target/config/Config.in.qemuopts | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'target/config/Config.in.qemuopts') diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts index b869202e2..40d129b12 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 configuration" -depends on ADK_TARGET_QEMU && !ADK_TARGET_SYSTEM_QEMU_M68K - config ADK_QEMU_ARGS string default "" if ADK_TARGET_QEMU_WITH_GRAPHIC @@ -30,7 +27,20 @@ endchoice choice prompt "Qemu Emulation with storage device" -depends on ADK_TARGET_QEMU && !ADK_TARGET_SYSTEM_QEMU_XTENSA && !ADK_TARGET_SYSTEM_QEMU_AARCH64 && !ADK_TARGET_SYSTEM_QEMU_M68K +depends on ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB \ + || ADK_TARGET_QEMU_ARM_MODEL_TERRIER \ + || ADK_TARGET_QEMU_ARM_MODEL_SPITZ \ + || ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 \ + || ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 \ + || ADK_TARGET_SYSTEM_QEMU_MIPS \ + || ADK_TARGET_SYSTEM_QEMU_MIPS64 \ + || ADK_TARGET_SYSTEM_QEMU_PPC \ + || 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 default ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_ROOTFS_ARCHIVE default ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_ROOTFS_SQUASHFS default ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_ROOTFS_JFFS2 @@ -113,4 +123,3 @@ config ADK_TARGET_QEMU_WITH_AUDIO bool "enabled" endchoice -endmenu -- cgit v1.2.3