summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
Diffstat (limited to 'target')
-rw-r--r--target/config/Config.in.qemuopts8
-rw-r--r--target/config/Config.in.target7
-rw-r--r--target/linux/config/Config.in.serial12
-rw-r--r--target/x86/kernel/qemu-x863
-rw-r--r--target/x86/kernel/qemu-x86_644
-rw-r--r--target/x86_64/kernel/qemu-x86_644
6 files changed, 15 insertions, 23 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.
diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial
index 2ab52a6ea..9e0ecb280 100644
--- a/target/linux/config/Config.in.serial
+++ b/target/linux/config/Config.in.serial
@@ -73,10 +73,12 @@ config ADK_KERNEL_SERIAL_8250
depends on ADK_TARGET_SYSTEM_XILINX_KINTEX7 \
|| ADK_TARGET_SYSTEM_PCENGINES_APU \
|| ADK_TARGET_SYSTEM_PCENGINES_ALIX \
- || ADK_TARGET_SYSTEM_QEMU_OR1K \
|| ADK_TARGET_SYSTEM_QEMU_MIPS \
- || ADK_TARGET_SYSTEM_OR1K_SIM \
+ || ADK_TARGET_SYSTEM_QEMU_OR1K \
|| ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO \
+ || ADK_TARGET_SYSTEM_QEMU_X86 \
+ || ADK_TARGET_SYSTEM_QEMU_X86_64 \
+ || ADK_TARGET_SYSTEM_OR1K_SIM \
|| ADK_TARGET_SYSTEM_IBM_X40 \
|| ADK_TARGET_SYSTEM_GENERIC_X86 \
|| ADK_TARGET_SYSTEM_GENERIC_X86_64 \
@@ -85,10 +87,12 @@ config ADK_KERNEL_SERIAL_8250
default y if ADK_TARGET_SYSTEM_XILINX_KINTEX7
default y if ADK_TARGET_SYSTEM_PCENGINES_APU
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX
- default y if ADK_TARGET_SYSTEM_QEMU_OR1K
default y if ADK_TARGET_SYSTEM_QEMU_MIPS
- default y if ADK_TARGET_SYSTEM_OR1K_SIM
+ default y if ADK_TARGET_SYSTEM_QEMU_OR1K
default y if ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO
+ default y if ADK_TARGET_SYSTEM_QEMU_X86
+ default y if ADK_TARGET_SYSTEM_QEMU_X86_64
+ default y if ADK_TARGET_SYSTEM_OR1K_SIM
default y if ADK_TARGET_SYSTEM_IBM_X40
default y if ADK_TARGET_SYSTEM_GENERIC_X86
default y if ADK_TARGET_SYSTEM_GENERIC_X86_64
diff --git a/target/x86/kernel/qemu-x86 b/target/x86/kernel/qemu-x86
index 849852a65..1049b23d8 100644
--- a/target/x86/kernel/qemu-x86
+++ b/target/x86/kernel/qemu-x86
@@ -1,4 +1,3 @@
CONFIG_X86=y
CONFIG_X86_32=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_CMDLINE_BOOL=y
diff --git a/target/x86/kernel/qemu-x86_64 b/target/x86/kernel/qemu-x86_64
index 60ffa8dfd..296850f4f 100644
--- a/target/x86/kernel/qemu-x86_64
+++ b/target/x86/kernel/qemu-x86_64
@@ -9,6 +9,4 @@ CONFIG_X86_IO_APIC=y
CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
CONFIG_AMD_NB=y
CONFIG_IA32_EMULATION=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_CMDLINE_BOOL=y
diff --git a/target/x86_64/kernel/qemu-x86_64 b/target/x86_64/kernel/qemu-x86_64
index 612bdbcb5..9e9c1197f 100644
--- a/target/x86_64/kernel/qemu-x86_64
+++ b/target/x86_64/kernel/qemu-x86_64
@@ -10,6 +10,4 @@ CONFIG_X86_IO_APIC=y
CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
CONFIG_AMD_NB=y
CONFIG_IA32_EMULATION=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_CMDLINE_BOOL=y