drivers/pl011: Depend on `libukconsole`

Makes the pl011 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/pl011/Config.uk b/drivers/ukconsole/pl011/Config.uk
index 41cc55fbae9576b427893076ab6e51e4e5af1242..735ce48b2ddb6241294435c71be6a8ab374c0215 100644 (file)
--- a/drivers/ukconsole/pl011/Config.uk
+++ b/drivers/ukconsole/pl011/Config.uk
@@ -1,8 +1,8 @@
 menuconfig LIBUKCONSOLE_PL011
        bool "PrimeCell UART (PL011)"
        depends on ARCH_ARM_64
+       depends on LIBUKCONSOLE
        select LIBUKOFW
-       select LIBUKCONSOLE
 
 if LIBUKCONSOLE_PL011
 

diff --git a/plat/kvm/Config.uk b/plat/kvm/Config.uk
index 279fa0b66f6e21730f73ce0aab381d3aca6f8594..64bf6c95b82e243eb563d249c9da4a1682550afc 100644 (file)
--- a/plat/kvm/Config.uk
+++ b/plat/kvm/Config.uk
@@ -95,8 +95,8 @@ choice
 
 config KVM_VMM_QEMU
        bool "QEMU"
-       imply LIBUKCONSOLE_PL011 if ARCH_ARM_64
-       imply LIBUKCONSOLE_PL011_EARLY_CONSOLE if ARCH_ARM_64
+       imply LIBUKCONSOLE_PL011 if LIBUKCONSOLE && ARCH_ARM_64
+       imply LIBUKCONSOLE_PL011_EARLY_CONSOLE if LIBUKCONSOLE && ARCH_ARM_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