4 files changed, 21 insertions, 4 deletions

diff --git a/target/bfin/kernel/sim-bfin b/target/bfin/kernel/sim-bfin
index a4a0b9b00..573aa4526 100644
--- a/target/bfin/kernel/sim-bfin
+++ b/target/bfin/kernel/sim-bfin
@@ -1,7 +1,3 @@
 CONFIG_BLACKFIN=y
 CONFIG_BF512=y
 CONFIG_ICACHE_FLUSH_L1=y
-CONFIG_SERIAL_BFIN=y
-CONFIG_SERIAL_BFIN_CONSOLE=y
-CONFIG_SERIAL_BFIN_UART0=y
-CONFIG_SERIAL_BFIN_UART1=y
diff --git a/target/config/Config.in.hardware b/target/config/Config.in.hardware
index 977c55e1c..34e79c240 100644
--- a/target/config/Config.in.hardware
+++ b/target/config/Config.in.hardware
@@ -101,6 +101,9 @@ config ADK_TARGET_WITH_WIFI
 config ADK_TARGET_WITH_DSL
 	bool
 
+config ADK_TARGET_WITH_VIRTIO
+	bool
+
 config ADK_TARGET_WITH_USB_BOOT
 	bool
 
diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial
index 1b9367a11..2ab52a6ea 100644
--- a/target/linux/config/Config.in.serial
+++ b/target/linux/config/Config.in.serial
@@ -46,6 +46,23 @@ config ADK_KERNEL_SERIAL_SUNSU_CONSOLE
 config ADK_KERNEL_DA_CONSOLE
 	bool
 
+config ADK_KERNEL_SERIAL_BFIN_CONSOLE
+	bool
+
+config ADK_KERNEL_SERIAL_BFIN_UART0
+	bool
+
+config ADK_KERNEL_SERIAL_BFIN_UART1
+	bool
+
+config ADK_KERNEL_SERIAL_BFIN
+	bool "BFIN serial driver"
+	select ADK_KERNEL_SERIAL_BFIN_CONSOLE
+	select ADK_KERNEL_SERIAL_BFIN_UART0
+	select ADK_KERNEL_SERIAL_BFIN_UART1
+	depends on ADK_TARGET_ARCH_BFIN
+	default y if ADK_TARGET_ARCH_BFIN
+
 config ADK_KERNEL_SERIAL_8250
 	bool "8250 serial driver"
 	select ADK_KERNEL_SERIAL_OF_PLATFORM if ADK_TARGET_SYSTEM_XILINX_KINTEX7 \
diff --git a/target/linux/config/Config.in.virtio b/target/linux/config/Config.in.virtio
index 634770a51..816f1670c 100644
--- a/target/linux/config/Config.in.virtio
+++ b/target/linux/config/Config.in.virtio
@@ -2,6 +2,7 @@
 # material, please see the LICENCE file in the top-level directory.
 
 menu "Virtio driver support"
+depends on ADK_TARGET_WITH_VIRTIO || ADK_TARGET_QEMU
 
 config ADK_KERNEL_VIRTIO
 	bool