From bd4d16a27b4e36cbb85800bcf2f201ae6d3a574e Mon Sep 17 00:00:00 2001 From: Simon Kuenzer Date: Thu, 19 Sep 2024 17:20:58 +0200 Subject: [PATCH] drivers/vgacons: Rename `libukconsole_vga` to `libvgacons` Rename the driver library and driver directory to `libvgacons` to provide a naming scheme that is more appropriate for general purpose devices and to highlight that this driver is inteded for text-mode only. Configuration options are adopted accordingly. Signed-off-by: Simon Kuenzer Reviewed-by: Oleksii Moisieiev Reviewed-by: Oleksii Moisieiev Reviewed-by: Michalis Pappas Approved-by: Michalis Pappas GitHub-Closes: #1501 --- drivers/ukconsole/Makefile.uk | 2 +- drivers/ukconsole/vga/Makefile.uk | 6 ------ drivers/ukconsole/{vga => vgacons}/Config.uk | 2 +- drivers/ukconsole/vgacons/Makefile.uk | 6 ++++++ drivers/ukconsole/{vga => vgacons}/exportsyms.uk | 0 drivers/ukconsole/{vga => vgacons}/vga.c | 2 +- plat/kvm/Config.uk | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 drivers/ukconsole/vga/Makefile.uk rename drivers/ukconsole/{vga => vgacons}/Config.uk (81%) create mode 100644 drivers/ukconsole/vgacons/Makefile.uk rename drivers/ukconsole/{vga => vgacons}/exportsyms.uk (100%) rename drivers/ukconsole/{vga => vgacons}/vga.c (98%) diff --git a/drivers/ukconsole/Makefile.uk b/drivers/ukconsole/Makefile.uk index af2b064eb..b87d42be0 100644 --- a/drivers/ukconsole/Makefile.uk +++ b/drivers/ukconsole/Makefile.uk @@ -8,4 +8,4 @@ UK_DRIV_CONSOLE_BASE := $(UK_DRIV_BASE)/ukconsole $(eval $(call import_lib,$(UK_DRIV_CONSOLE_BASE)/ns16550)) $(eval $(call import_lib,$(UK_DRIV_CONSOLE_BASE)/pl011)) -$(eval $(call import_lib,$(UK_DRIV_CONSOLE_BASE)/vga)) +$(eval $(call import_lib,$(UK_DRIV_CONSOLE_BASE)/vgacons)) diff --git a/drivers/ukconsole/vga/Makefile.uk b/drivers/ukconsole/vga/Makefile.uk deleted file mode 100644 index 5df981fc1..000000000 --- a/drivers/ukconsole/vga/Makefile.uk +++ /dev/null @@ -1,6 +0,0 @@ -$(eval $(call addlib_s,libukconsole_vga,$(CONFIG_LIBUKCONSOLE_VGA))) - -# TODO: Remove as soon as plat dependencies go away -LIBUKCONSOLE_VGA_CINCLUDES-y += -I$(UK_PLAT_COMMON_BASE)/include - -LIBUKCONSOLE_VGA_SRCS-y += $(LIBUKCONSOLE_VGA_BASE)/vga.c diff --git a/drivers/ukconsole/vga/Config.uk b/drivers/ukconsole/vgacons/Config.uk similarity index 81% rename from drivers/ukconsole/vga/Config.uk rename to drivers/ukconsole/vgacons/Config.uk index 41906d2f7..df6c3b4a5 100644 --- a/drivers/ukconsole/vga/Config.uk +++ b/drivers/ukconsole/vgacons/Config.uk @@ -1,4 +1,4 @@ -config LIBUKCONSOLE_VGA +config LIBVGACONS bool "VGA console driver" depends on ARCH_X86_64 depends on LIBUKCONSOLE diff --git a/drivers/ukconsole/vgacons/Makefile.uk b/drivers/ukconsole/vgacons/Makefile.uk new file mode 100644 index 000000000..fd43d9447 --- /dev/null +++ b/drivers/ukconsole/vgacons/Makefile.uk @@ -0,0 +1,6 @@ +$(eval $(call addlib_s,libvgacons,$(CONFIG_LIBVGACONS))) + +# TODO: Remove as soon as plat dependencies go away +LIBVGACONS_CINCLUDES-y += -I$(UK_PLAT_COMMON_BASE)/include + +LIBVGACONS_SRCS-y += $(LIBVGACONS_BASE)/vga.c diff --git a/drivers/ukconsole/vga/exportsyms.uk b/drivers/ukconsole/vgacons/exportsyms.uk similarity index 100% rename from drivers/ukconsole/vga/exportsyms.uk rename to drivers/ukconsole/vgacons/exportsyms.uk diff --git a/drivers/ukconsole/vga/vga.c b/drivers/ukconsole/vgacons/vga.c similarity index 98% rename from drivers/ukconsole/vga/vga.c rename to drivers/ukconsole/vgacons/vga.c index 77f440805..1ba8c3ded 100644 --- a/drivers/ukconsole/vga/vga.c +++ b/drivers/ukconsole/vgacons/vga.c @@ -249,7 +249,7 @@ static int vga_init(struct ukplat_bootinfo *bi) clear_terminal(); - uk_console_init(&vga_dev, "VGA", &vga_ops, UK_CONSOLE_FLAG_STDOUT); + uk_console_init(&vga_dev, "vgacons", &vga_ops, UK_CONSOLE_FLAG_STDOUT); uk_console_register(&vga_dev); mrd.pbase = X86_VIDEO_MEM_START; diff --git a/plat/kvm/Config.uk b/plat/kvm/Config.uk index 7f01d549e..bec0ef02f 100644 --- a/plat/kvm/Config.uk +++ b/plat/kvm/Config.uk @@ -102,7 +102,7 @@ config KVM_VMM_QEMU imply LIBNS16550_COM1 if LIBUKCONSOLE && ARCH_X86_64 imply LIBUKINTCTLR_GICV2 if ARCH_ARM_64 imply LIBUKRTC_PL031 - imply LIBUKCONSOLE_VGA if ARCH_X86_64 + imply LIBVGACONS if ARCH_X86_64 select HAVE_PCI select HAVE_MMIO -- 2.39.5