drivers/ns16550: Depend on `libukconsole`

Makes the ns16550 console driver dependent on `libukconsole` instead of
selecting it. This fits our current driver model: only include drivers
when there is an application need.

Signed-off-by: Simon Kuenzer <simon@unikraft.io>
Reviewed-by: Oleksii Moisieiev <oleksii_moisieiev@epam.com>
Reviewed-by: Oleksii Moisieiev <oleksii_moisieiev@epam.com>
Reviewed-by: Michalis Pappas <michalis@unikraft.io>
Approved-by: Michalis Pappas <michalis@unikraft.io>
GitHub-Closes: #1501

diff --git a/drivers/ukconsole/ns16550/Config.uk b/drivers/ukconsole/ns16550/Config.uk
index 4a4f5f0ab24e0b74e2110f7440b5940c0e712e4a..48f582008312749dee444dc48a75e733cb0dbdbf 100644 (file)
--- a/drivers/ukconsole/ns16550/Config.uk
+++ b/drivers/ukconsole/ns16550/Config.uk
@@ -1,8 +1,8 @@
 menuconfig LIBUKCONSOLE_NS16550
        bool "NS16550 / 8250"
        depends on (ARCH_ARM_64 || ARCH_X86_64)
+       depends on LIBUKCONSOLE
        select LIBUKOFW if ARCH_ARM_64
-       select LIBUKCONSOLE
 
 if LIBUKCONSOLE_NS16550
 

diff --git a/plat/kvm/Config.uk b/plat/kvm/Config.uk
index 9e9887b3105bf58d5c78695708cb2ff508ab143c..279fa0b66f6e21730f73ce0aab381d3aca6f8594 100644 (file)
--- a/plat/kvm/Config.uk
+++ b/plat/kvm/Config.uk
@@ -97,9 +97,9 @@ config KVM_VMM_QEMU
        bool "QEMU"
        imply LIBUKCONSOLE_PL011 if ARCH_ARM_64
        imply LIBUKCONSOLE_PL011_EARLY_CONSOLE if ARCH_ARM_64
-       imply LIBUKCONSOLE_NS16550 if ARCH_X86_64
-       imply LIBUKCONSOLE_NS16550_EARLY_CONSOLE if ARCH_X86_64
-       imply LIBUKCONSOLE_NS16550_COM1 if ARCH_X86_64
+       imply LIBUKCONSOLE_NS16550 if LIBUKCONSOLE && ARCH_X86_64
+       imply LIBUKCONSOLE_NS16550_EARLY_CONSOLE if LIBUKCONSOLE && ARCH_X86_64
+       imply LIBUKCONSOLE_NS16550_COM1 if LIBUKCONSOLE && ARCH_X86_64
        imply LIBUKINTCTLR_GICV2 if ARCH_ARM_64
        imply LIBUKRTC_PL031
        imply LIBUKCONSOLE_VGA if ARCH_X86_64
@@ -111,9 +111,9 @@ config KVM_VMM_FIRECRACKER
        select KVM_BOOT_PROTO_LXBOOT
        select HAVE_MMIO
        select VIRTIO_MMIO_LINUX_COMPAT_CMDLINE if LIBVIRTIO_MMIO
-       imply LIBUKCONSOLE_NS16550
-       imply LIBUKCONSOLE_NS16550_EARLY_CONSOLE
-       imply LIBUKCONSOLE_NS16550_COM1 if ARCH_X86_64
+       imply LIBUKCONSOLE_NS16550 if LIBUKCONSOLE
+       imply LIBUKCONSOLE_NS16550_EARLY_CONSOLE if LIBUKCONSOLE
+       imply LIBUKCONSOLE_NS16550_COM1 if LIBUKCONSOLE && ARCH_X86_64
        imply LIBUKINTCTLR_GICV3 if ARCH_ARM_64
        imply LIBUKRTC_PL031
        depends on ARCH_X86_64 || ARCH_ARM_64