diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-12-13 22:22:11 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-12-14 00:02:55 +0100 |
| commit | f83e9bba36235d63f4ec56b281a5efa1480bf142 (patch) | |
| tree | d251a8acf287f17e0295d0909101c2e0f9b51d8e /target/config | |
| parent | 160f19d65cd8be08fb54e6ea1eba1ca0f7db1f2f (diff) | |
simplify qemu x86/x86_64 support, enable block
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
Diffstat (limited to 'target/config')
| -rw-r--r-- | target/config/Config.in.qemuopts | 8 | ||||
| -rw-r--r-- | target/config/Config.in.target | 7 |
2 files changed, 4 insertions, 11 deletions
diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts index b75facf75..1b704defe 100644 --- a/target/config/Config.in.qemuopts +++ b/target/config/Config.in.qemuopts @@ -42,12 +42,7 @@ depends on ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB \ || 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 -config ADK_TARGET_QEMU_WITHOUT_BLOCK - bool "disabled" config ADK_TARGET_QEMU_WITH_BLOCK bool "enabled" @@ -68,6 +63,9 @@ config ADK_TARGET_QEMU_WITH_BLOCK select ADK_KERNEL_PATA_PXA if ADK_TARGET_QEMU_ARM_SPITZ \ || ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER +config ADK_TARGET_QEMU_WITHOUT_BLOCK + bool "disabled" + endchoice choice diff --git a/target/config/Config.in.target b/target/config/Config.in.target index 4d1888c35..920d709cc 100644 --- a/target/config/Config.in.target +++ b/target/config/Config.in.target @@ -61,7 +61,6 @@ config ADK_TARGET_ROOTFS_SQUASHFS select ADK_KERNEL_SQUASHFS select ADK_HOST_NEED_SQUASHFS select ADK_HOST_NEED_QEMU if ADK_TARGET_QEMU - select ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_QEMU depends on ADK_TARGET_WITH_MTD \ || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 \ || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 @@ -72,7 +71,6 @@ config ADK_TARGET_ROOTFS_JFFS2 bool "Compressed read-write root filesystem (jffs2)" select ADK_KERNEL_JFFS2_FS select ADK_HOST_NEED_MTD_UTILS - select ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_QEMU depends on ADK_TARGET_WITH_MTD \ || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 \ || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 @@ -130,7 +128,6 @@ config ADK_TARGET_ROOTFS_ISO select ADK_KERNEL_BLK_DEV_SR select ADK_HOST_NEED_CDRTOOLS select ADK_HOST_NEED_SYSLINUX - select ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_QEMU depends on ADK_TARGET_ARCH_X86 help Use this option to create a bootable ISO image. @@ -141,14 +138,12 @@ config ADK_TARGET_ROOTFS_INITRAMFSARCHIVE && !ADK_TARGET_SIM select ADK_KERNEL_BLK_DEV_INITRD help - Use this option if your planning to create a initramfs, - useful for adk-test-framework. + Use this option if your planning to create a initramfs. 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 if ADK_TARGET_QEMU depends on !ADK_TARGET_SIM help Use this option if your root filesystem is ext2/ext3/ext4/xfs. |