From: Simon Kuenzer Date: Thu, 19 Sep 2024 15:35:41 +0000 (+0200) Subject: drivers/ns16650: Rename `libukconsole_ns16550` to `libns16550` X-Git-Tag: RELEASE-0.18.0~16 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f3f84a9895e1307dc4767681a4e5377ad075722e;p=unikraft%2Funikraft.git drivers/ns16650: Rename `libukconsole_ns16550` to `libns16550` Rename the driver library and driver directory to `libns16550` to provide a naming scheme that is more appropriate for general purpose devices. The name `ns16550` is considered a precise description of the driver as it is the name of the actual serial I/O chip. 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 --- diff --git a/drivers/ukconsole/ns16550/Config.uk b/drivers/ukconsole/ns16550/Config.uk index 48f582008..20d2c8bbe 100644 --- a/drivers/ukconsole/ns16550/Config.uk +++ b/drivers/ukconsole/ns16550/Config.uk @@ -1,150 +1,149 @@ -menuconfig LIBUKCONSOLE_NS16550 +menuconfig LIBNS16550 bool "NS16550 / 8250" depends on (ARCH_ARM_64 || ARCH_X86_64) + depends on (!PLAT_XEN && ARCH_X86_64) depends on LIBUKCONSOLE select LIBUKOFW if ARCH_ARM_64 -if LIBUKCONSOLE_NS16550 +if LIBNS16550 if ARCH_ARM_64 - -config LIBUKCONSOLE_NS16550_EARLY_CONSOLE +config LIBNS16550_EARLY_CONSOLE bool "Early console" select LIBUKBOOT help Uses the fdt's `/chosen/stdout-path` to derive the default console. Override by setting `ns16550.base` at the cmdline, if LIBUKLIBPARAM is enabled. -endif +endif # ARCH_ARM_64 if ARCH_X86_64 - -config LIBUKCONSOLE_NS16550_COM_AVAIL +config LIBNS16550_COM_AVAIL bool -menuconfig LIBUKCONSOLE_NS16550_COM1 - bool "Enable COM1 driver (0x3f8)" +menuconfig LIBNS16550_COM1 + bool "Enable COM1 (0x3f8)" default y - select LIBUKCONSOLE_NS16550_COM_AVAIL + select LIBNS16550_COM_AVAIL -if LIBUKCONSOLE_NS16550_COM1 -choice LIBUKCONSOLE_NS16550_COM1_BAUD - prompt "COM1 port baud rate" - default LIBUKCONSOLE_NS16550_COM1_BAUD_115200 +if LIBNS16550_COM1 +choice + prompt "Baud rate" + default LIBNS16550_COM1_BAUD_115200 -config LIBUKCONSOLE_NS16550_COM1_BAUD_115200 +config LIBNS16550_COM1_BAUD_115200 bool "115200" -config LIBUKCONSOLE_NS16550_COM1_BAUD_57600 +config LIBNS16550_COM1_BAUD_57600 bool "57600" -config LIBUKCONSOLE_NS16550_COM1_BAUD_38400 +config LIBNS16550_COM1_BAUD_38400 bool "38400" -config LIBUKCONSOLE_NS16550_COM1_BAUD_19200 +config LIBNS16550_COM1_BAUD_19200 bool "19200" endchoice endif -menuconfig LIBUKCONSOLE_NS16550_COM2 - bool "Enable COM2 driver (0x2f8)" - select LIBUKCONSOLE_NS16550_COM_AVAIL +menuconfig LIBNS16550_COM2 + bool "Enable COM2 (0x2f8)" + select LIBNS16550_COM_AVAIL -if LIBUKCONSOLE_NS16550_COM2 -choice LIBUKCONSOLE_NS16550_COM2_BAUD - prompt "COM2 port baud rate" - default LIBUKCONSOLE_NS16550_COM2_BAUD_115200 +if LIBNS16550_COM2 +choice + prompt "Baud rate" + default LIBNS16550_COM2_BAUD_115200 -config LIBUKCONSOLE_NS16550_COM2_BAUD_115200 +config LIBNS16550_COM2_BAUD_115200 bool "115200" -config LIBUKCONSOLE_NS16550_COM2_BAUD_57600 +config LIBNS16550_COM2_BAUD_57600 bool "57600" -config LIBUKCONSOLE_NS16550_COM2_BAUD_38400 +config LIBNS16550_COM2_BAUD_38400 bool "38400" -config LIBUKCONSOLE_NS16550_COM2_BAUD_19200 +config LIBNS16550_COM2_BAUD_19200 bool "19200" endchoice endif -menuconfig LIBUKCONSOLE_NS16550_COM3 - bool "Enable COM3 driver (0x3e8)" - select LIBUKCONSOLE_NS16550_COM_AVAIL +menuconfig LIBNS16550_COM3 + bool "Enable COM3 (0x3e8)" + select LIBNS16550_COM_AVAIL -if LIBUKCONSOLE_NS16550_COM3 -choice LIBUKCONSOLE_NS16550_COM3_BAUD - prompt "COM3 port baud rate" - default LIBUKCONSOLE_NS16550_COM3_BAUD_115200 +if LIBNS16550_COM3 +choice + prompt "Baud rate" + default LIBNS16550_COM3_BAUD_115200 -config LIBUKCONSOLE_NS16550_COM3_BAUD_115200 +config LIBNS16550_COM3_BAUD_115200 bool "115200" -config LIBUKCONSOLE_NS16550_COM3_BAUD_57600 +config LIBNS16550_COM3_BAUD_57600 bool "57600" -config LIBUKCONSOLE_NS16550_COM3_BAUD_38400 +config LIBNS16550_COM3_BAUD_38400 bool "38400" -config LIBUKCONSOLE_NS16550_COM3_BAUD_19200 +config LIBNS16550_COM3_BAUD_19200 bool "19200" endchoice endif -menuconfig LIBUKCONSOLE_NS16550_COM4 - bool "Enable COM4 driver (0x2e8)" - select LIBUKCONSOLE_NS16550_COM_AVAIL +menuconfig LIBNS16550_COM4 + bool "Enable COM4 (0x2e8)" + select LIBNS16550_COM_AVAIL -if LIBUKCONSOLE_NS16550_COM4 -choice LIBUKCONSOLE_NS16550_COM4_BAUD - prompt "COM4 port baud rate" - default LIBUKCONSOLE_NS16550_COM4_BAUD_115200 +if LIBNS16550_COM4 +choice + prompt "Baud rate" + default LIBNS16550_COM4_BAUD_115200 -config LIBUKCONSOLE_NS16550_COM4_BAUD_115200 +config LIBNS16550_COM4_BAUD_115200 bool "115200" -config LIBUKCONSOLE_NS16550_COM4_BAUD_57600 +config LIBNS16550_COM4_BAUD_57600 bool "57600" -config LIBUKCONSOLE_NS16550_COM4_BAUD_38400 +config LIBNS16550_COM4_BAUD_38400 bool "38400" -config LIBUKCONSOLE_NS16550_COM4_BAUD_19200 +config LIBNS16550_COM4_BAUD_19200 bool "19200" endchoice endif -config LIBUKCONSOLE_NS16550_EARLY_CONSOLE +config LIBNS16550_EARLY_CONSOLE bool "Initialize early console" - depends on LIBUKCONSOLE_NS16550_COM_AVAIL + depends on LIBNS16550_COM_AVAIL -if LIBUKCONSOLE_NS16550_EARLY_CONSOLE -choice LIBUKCONSOLE_NS16550_EARLY_CONSOLE_DEVICE +if LIBNS16550_EARLY_CONSOLE +choice prompt "Early COM device" - default LIBUKCONSOLE_NS16550_COM4_EARLY if !LIBUKCONSOLE_NS16550_COM1 && !LIBUKCONSOLE_NS16550_COM2 && !LIBUKCONSOLE_NS16550_COM3 && LIBUKCONSOLE_NS16550_COM4 - default LIBUKCONSOLE_NS16550_COM3_EARLY if !LIBUKCONSOLE_NS16550_COM1 && !LIBUKCONSOLE_NS16550_COM2 && LIBUKCONSOLE_NS16550_COM3 - default LIBUKCONSOLE_NS16550_COM2_EARLY if !LIBUKCONSOLE_NS16550_COM1 && LIBUKCONSOLE_NS16550_COM2 - default LIBUKCONSOLE_NS16550_COM1_EARLY if LIBUKCONSOLE_NS16550_COM1 + default LIBNS16550_COM4_EARLY if !LIBNS16550_COM1 && !LIBNS16550_COM2 && !LIBNS16550_COM3 && LIBNS16550_COM4 + default LIBNS16550_COM3_EARLY if !LIBNS16550_COM1 && !LIBNS16550_COM2 && LIBNS16550_COM3 + default LIBNS16550_COM2_EARLY if !LIBNS16550_COM1 && LIBNS16550_COM2 + default LIBNS16550_COM1_EARLY if LIBNS16550_COM1 -config LIBUKCONSOLE_NS16550_COM1_EARLY +config LIBNS16550_COM1_EARLY bool "COM1" - depends on LIBUKCONSOLE_NS16550_COM1 + depends on LIBNS16550_COM1 -config LIBUKCONSOLE_NS16550_COM2_EARLY +config LIBNS16550_COM2_EARLY bool "COM2" - depends on LIBUKCONSOLE_NS16550_COM2 + depends on LIBNS16550_COM2 -config LIBUKCONSOLE_NS16550_COM3_EARLY +config LIBNS16550_COM3_EARLY bool "COM3" - depends on LIBUKCONSOLE_NS16550_COM3 + depends on LIBNS16550_COM3 -config LIBUKCONSOLE_NS16550_COM4_EARLY +config LIBNS16550_COM4_EARLY bool "COM4" - depends on LIBUKCONSOLE_NS16550_COM4 + depends on LIBNS16550_COM4 endchoice -endif +endif # LIBNS16550_EARLY_CONSOLE -endif +endif # ARCH_X86_64 -endif +endif # LIBNS16550 diff --git a/drivers/ukconsole/ns16550/Makefile.uk b/drivers/ukconsole/ns16550/Makefile.uk index 6cb2d2a82..9abb5a632 100644 --- a/drivers/ukconsole/ns16550/Makefile.uk +++ b/drivers/ukconsole/ns16550/Makefile.uk @@ -1,11 +1,11 @@ -$(eval $(call addplatlib_s,kvm,libukconsole_ns16550,$(CONFIG_LIBUKCONSOLE_NS16550))) -$(eval $(call addlib_paramprefix,libukconsole_ns16550,ns16550)) +$(eval $(call addlib_s,libns16550,$(CONFIG_LIBNS16550))) +$(eval $(call addlib_paramprefix,libns16550,ns16550)) -# TODO Remove as soon as plat dependencies go away -LIBUKCONSOLE_NS16550_CINCLUDES-y += -I$(UK_PLAT_COMMON_BASE)/include +# TODO: Remove as soon as plat dependencies go away +LIBNS16550_CINCLUDES-y += -I$(UK_PLAT_COMMON_BASE)/include -# FIXME Remove as soon as bootinfo is moved out of plat/ -LIBUKCONSOLE_NS16550_CINCLUDES-y += -I$(UK_PLAT_COMMON_BASE)/include +# FIXME: Remove as soon as bootinfo is moved out of plat/ +LIBNS16550_CINCLUDES-y += -I$(UK_PLAT_COMMON_BASE)/include -LIBUKCONSOLE_NS16550_SRCS-$(CONFIG_ARCH_ARM_64) += $(LIBUKCONSOLE_NS16550_BASE)/ns16550.c|isr -LIBUKCONSOLE_NS16550_SRCS-$(CONFIG_ARCH_X86_64) += $(LIBUKCONSOLE_NS16550_BASE)/com.c|isr +LIBNS16550_SRCS-$(CONFIG_ARCH_ARM_64) += $(LIBNS16550_BASE)/ns16550.c|isr +LIBNS16550_SRCS-$(CONFIG_ARCH_X86_64) += $(LIBNS16550_BASE)/com.c|isr diff --git a/drivers/ukconsole/ns16550/com.c b/drivers/ukconsole/ns16550/com.c index 4f67ed4ec..98b3b4c49 100644 --- a/drivers/ukconsole/ns16550/com.c +++ b/drivers/ukconsole/ns16550/com.c @@ -57,66 +57,66 @@ /* baudrate divisor */ #define COM_BAUDDIV_HI 0x00 -#if CONFIG_LIBUKCONSOLE_NS16550_COM1_BAUD_19200 +#if CONFIG_LIBNS16550_COM1_BAUD_19200 #define COM1_BAUDDIV_LO 0x04 -#elif CONFIG_LIBUKCONSOLE_NS16550_COM1_BAUD_38400 +#elif CONFIG_LIBNS16550_COM1_BAUD_38400 #define COM1_BAUDDIV_LO 0x03 -#elif CONFIG_LIBUKCONSOLE_NS16550_COM1_BAUD_57600 +#elif CONFIG_LIBNS16550_COM1_BAUD_57600 #define COM1_BAUDDIV_LO 0x02 -#elif CONFIG_LIBUKCONSOLE_NS16550_COM1_BAUD_115200 +#elif CONFIG_LIBNS16550_COM1_BAUD_115200 #define COM1_BAUDDIV_LO 0x01 #endif -#if CONFIG_LIBUKCONSOLE_NS16550_COM2_BAUD_19200 +#if CONFIG_LIBNS16550_COM2_BAUD_19200 #define COM2_BAUDDIV_LO 0x04 -#elif CONFIG_LIBUKCONSOLE_NS16550_COM2_BAUD_38400 +#elif CONFIG_LIBNS16550_COM2_BAUD_38400 #define COM2_BAUDDIV_LO 0x03 -#elif CONFIG_LIBUKCONSOLE_NS16550_COM2_BAUD_57600 +#elif CONFIG_LIBNS16550_COM2_BAUD_57600 #define COM2_BAUDDIV_LO 0x02 -#elif CONFIG_LIBUKCONSOLE_NS16550_COM2_BAUD_115200 +#elif CONFIG_LIBNS16550_COM2_BAUD_115200 #define COM2_BAUDDIV_LO 0x01 #endif -#if CONFIG_LIBUKCONSOLE_NS16550_COM3_BAUD_19200 +#if CONFIG_LIBNS16550_COM3_BAUD_19200 #define COM3_BAUDDIV_LO 0x04 -#elif CONFIG_LIBUKCONSOLE_NS16550_COM3_BAUD_38400 +#elif CONFIG_LIBNS16550_COM3_BAUD_38400 #define COM3_BAUDDIV_LO 0x03 -#elif CONFIG_LIBUKCONSOLE_NS16550_COM3_BAUD_57600 +#elif CONFIG_LIBNS16550_COM3_BAUD_57600 #define COM3_BAUDDIV_LO 0x02 -#elif CONFIG_LIBUKCONSOLE_NS16550_COM3_BAUD_115200 +#elif CONFIG_LIBNS16550_COM3_BAUD_115200 #define COM3_BAUDDIV_LO 0x01 #endif -#if CONFIG_LIBUKCONSOLE_NS16550_COM4_BAUD_19200 +#if CONFIG_LIBNS16550_COM4_BAUD_19200 #define COM4_BAUDDIV_LO 0x04 -#elif CONFIG_LIBUKCONSOLE_NS16550_COM4_BAUD_38400 +#elif CONFIG_LIBNS16550_COM4_BAUD_38400 #define COM4_BAUDDIV_LO 0x03 -#elif CONFIG_LIBUKCONSOLE_NS16550_COM4_BAUD_57600 +#elif CONFIG_LIBNS16550_COM4_BAUD_57600 #define COM4_BAUDDIV_LO 0x02 -#elif CONFIG_LIBUKCONSOLE_NS16550_COM4_BAUD_115200 +#elif CONFIG_LIBNS16550_COM4_BAUD_115200 #define COM4_BAUDDIV_LO 0x01 #endif -#if CONFIG_LIBUKCONSOLE_NS16550_COM1_EARLY +#if CONFIG_LIBNS16550_COM1_EARLY #define COM_EARLY_PORT COM1_PORT #define COM_EARLY_NAME "COM1" #define COM_EARLY_BAUDDIV_LO COM1_BAUDDIV_LO -#endif /* CONFIG_LIBUKCONSOLE_NS16550_COM1_EARLY */ -#if CONFIG_LIBUKCONSOLE_NS16550_COM2_EARLY +#endif /* CONFIG_LIBNS16550_COM1_EARLY */ +#if CONFIG_LIBNS16550_COM2_EARLY #define COM_EARLY_PORT COM2_PORT #define COM_EARLY_NAME "COM2" #define COM_EARLY_BAUDDIV_LO COM2_BAUDDIV_LO -#endif /* CONFIG_LIBUKCONSOLE_NS16550_COM2_EARLY */ -#if CONFIG_LIBUKCONSOLE_NS16550_COM3_EARLY +#endif /* CONFIG_LIBNS16550_COM2_EARLY */ +#if CONFIG_LIBNS16550_COM3_EARLY #define COM_EARLY_PORT COM3_PORT #define COM_EARLY_NAME "COM3" #define COM_EARLY_BAUDDIV_LO COM3_BAUDDIV_LO -#endif /* CONFIG_LIBUKCONSOLE_NS16550_COM3_EARLY */ -#if CONFIG_LIBUKCONSOLE_NS16550_COM4_EARLY +#endif /* CONFIG_LIBNS16550_COM3_EARLY */ +#if CONFIG_LIBNS16550_COM4_EARLY #define COM_EARLY_PORT COM4_PORT #define COM_EARLY_NAME "COM4" #define COM_EARLY_BAUDDIV_LO COM4_BAUDDIV_LO -#endif /* CONFIG_LIBUKCONSOLE_NS16550_COM4_EARLY */ +#endif /* CONFIG_LIBNS16550_COM4_EARLY */ #define DLAB 0x80 #define PROT 0x03 /* 8N1 (8 bits, no parity, one stop bit) */ @@ -129,14 +129,14 @@ struct com_device { struct uk_console dev; }; -#if CONFIG_LIBUKCONSOLE_NS16550_EARLY_CONSOLE +#if CONFIG_LIBNS16550_EARLY_CONSOLE static struct com_device early_dev; #if CONFIG_LIBUKLIBPARAM UK_LIBPARAM_PARAM_ALIAS(early_port, &early_dev.port, __u16, "early COM device port"); #endif /* CONFIG_LIBUKLIBPARAM */ -#endif /* CONFIG_LIBUKCONSOLE_NS16550_EARLY_CONSOLE */ +#endif /* CONFIG_LIBNS16550_EARLY_CONSOLE */ static inline void outb(__u16 port, __u8 v) { @@ -222,7 +222,7 @@ static struct uk_console_ops com_ops = { .in = com_in }; -#if CONFIG_LIBUKCONSOLE_NS16550_EARLY_CONSOLE +#if CONFIG_LIBNS16550_EARLY_CONSOLE int com_early_init(struct ukplat_bootinfo *bi __unused) { /* Use COM_EARLY_PORT as the default if there was no @@ -238,7 +238,7 @@ int com_early_init(struct ukplat_bootinfo *bi __unused) return 0; } -#endif /* CONFIG_LIBUKCONSOLE_NS16550_EARLY_CONSOLE */ +#endif /* CONFIG_LIBNS16550_EARLY_CONSOLE */ #if CONFIG_LIBUKALLOC __maybe_unused @@ -270,37 +270,37 @@ static int com_init(struct uk_init_ctx *ctx __unused) if (!a) return -1; -#if CONFIG_LIBUKCONSOLE_NS16550_COM1 && !CONFIG_LIBUKCONSOLE_NS16550_COM1_EARLY +#if CONFIG_LIBNS16550_COM1 && !CONFIG_LIBNS16550_COM1_EARLY rc = com_init_port(a, "COM1", COM1_PORT, COM1_BAUDDIV_LO, COM_BAUDDIV_HI); if (unlikely(rc < 0)) return rc; -#endif /* CONFIG_LIBUKCONSOLE_NS16550_COM1 && - * !CONFIG_LIBUKCONSOLE_NS16550_COM1_EARLY +#endif /* CONFIG_LIBNS16550_COM1 && + * !CONFIG_LIBNS16550_COM1_EARLY */ -#if CONFIG_LIBUKCONSOLE_NS16550_COM2 && !CONFIG_LIBUKCONSOLE_NS16550_COM2_EARLY +#if CONFIG_LIBNS16550_COM2 && !CONFIG_LIBNS16550_COM2_EARLY rc = com_init_port(a, "COM2", COM2_PORT, COM2_BAUDDIV_LO, COM_BAUDDIV_HI); if (unlikely(rc < 0)) return rc; -#endif /* CONFIG_LIBUKCONSOLE_NS16550_COM2 && - * !CONFIG_LIBUKCONSOLE_NS16550_COM2_EARLY +#endif /* CONFIG_LIBNS16550_COM2 && + * !CONFIG_LIBNS16550_COM2_EARLY */ -#if CONFIG_LIBUKCONSOLE_NS16550_COM3 && !CONFIG_LIBUKCONSOLE_NS16550_COM3_EARLY +#if CONFIG_LIBNS16550_COM3 && !CONFIG_LIBNS16550_COM3_EARLY rc = com_init_port(a, "COM3", COM3_PORT, COM3_BAUDDIV_LO, COM_BAUDDIV_HI); if (unlikely(rc < 0)) return rc; -#endif /* CONFIG_LIBUKCONSOLE_NS16550_COM3 && - * !CONFIG_LIBUKCONSOLE_NS16550_COM3_EARLY +#endif /* CONFIG_LIBNS16550_COM3 && + * !CONFIG_LIBNS16550_COM3_EARLY */ -#if CONFIG_LIBUKCONSOLE_NS16550_COM4 && !CONFIG_LIBUKCONSOLE_NS16550_COM4_EARLY +#if CONFIG_LIBNS16550_COM4 && !CONFIG_LIBNS16550_COM4_EARLY rc = com_init_port(a, "COM4", COM4_PORT, COM4_BAUDDIV_LO, COM_BAUDDIV_HI); if (unlikely(rc < 0)) return rc; -#endif /* CONFIG_LIBUKCONSOLE_NS16550_COM4 && - * !CONFIG_LIBUKCONSOLE_NS16550_COM4_EARLY +#endif /* CONFIG_LIBNS16550_COM4 && + * !CONFIG_LIBNS16550_COM4_EARLY */ #endif /* CONFIG_LIBUKALLOC */ @@ -308,8 +308,8 @@ static int com_init(struct uk_init_ctx *ctx __unused) return 0; } -#if CONFIG_LIBUKCONSOLE_NS16550_EARLY_CONSOLE +#if CONFIG_LIBNS16550_EARLY_CONSOLE UK_BOOT_EARLYTAB_ENTRY(com_early_init, UK_PRIO_AFTER(UK_PRIO_EARLIEST)); -#endif /* CONFIG_LIBUKCONSOLE_NS16550_EARLY_CONSOLE */ +#endif /* CONFIG_LIBNS16550_EARLY_CONSOLE */ uk_plat_initcall_prio(com_init, 0, UK_PRIO_AFTER(UK_PRIO_EARLIEST)); diff --git a/drivers/ukconsole/ns16550/ns16550.c b/drivers/ukconsole/ns16550/ns16550.c index 59c2631ab..10dd9e949 100644 --- a/drivers/ukconsole/ns16550/ns16550.c +++ b/drivers/ukconsole/ns16550/ns16550.c @@ -48,9 +48,9 @@ #include #endif /* CONFIG_PAGING */ -#if CONFIG_LIBUKCONSOLE_NS16550_EARLY_CONSOLE +#if CONFIG_LIBNS16550_EARLY_CONSOLE #include -#endif /* CONFIG_LIBUKCONSOLE_NS16550_EARLY_CONSOLE */ +#endif /* CONFIG_LIBNS16550_EARLY_CONSOLE */ #define NS16550_THR_OFFSET 0x00U #define NS16550_RBR_OFFSET 0x00U @@ -90,11 +90,11 @@ struct ns16550_device { __u64 base, size; }; -#if CONFIG_LIBUKCONSOLE_NS16550_EARLY_CONSOLE +#if CONFIG_LIBNS16550_EARLY_CONSOLE static struct ns16550_device earlycon; UK_LIBPARAM_PARAM_ALIAS(base, &earlycon.base, __u64, "ns15550 base"); -#endif /* CONFIG_LIBUKCONSOLE_NS16550_EARLY_CONSOLE */ +#endif /* CONFIG_LIBNS16550_EARLY_CONSOLE */ /* The register shift. Default is 0 (device-tree spec v0.4 Sect. 4.2.2) */ static __u32 ns16550_reg_shift; @@ -250,7 +250,7 @@ static int init_ns16550(__u64 base) return 0; } -#if CONFIG_LIBUKCONSOLE_NS16550_EARLY_CONSOLE +#if CONFIG_LIBNS16550_EARLY_CONSOLE static inline int config_fdt_chosen_stdout(const void *dtb) { __u64 base, size; @@ -330,7 +330,7 @@ static int early_init(struct ukplat_bootinfo *bi) return 0; } -#endif /* !CONFIG_LIBUKCONSOLE_NS16550_EARLY_CONSOLE */ +#endif /* !CONFIG_LIBNS16550_EARLY_CONSOLE */ #if CONFIG_LIBUKALLOC static int fdt_get_device(struct ns16550_device *dev, const void *dtb, @@ -429,7 +429,7 @@ static int init(struct uk_init_ctx *ictx __unused) } #endif /* !CONFIG_PAGING */ -#if CONFIG_LIBUKCONSOLE_NS16550_EARLY_CONSOLE +#if CONFIG_LIBNS16550_EARLY_CONSOLE /* `ukconsole` mandates that there is only a single * `struct uk_console` registered per device. */ @@ -437,7 +437,7 @@ static int init(struct uk_init_ctx *ictx __unused) uk_pr_info("Skipping ns16550 device\n"); continue; } -#endif /* CONFIG_LIBUKCONSOLE_NS16550_EARLY_CONSOLE */ +#endif /* CONFIG_LIBNS16550_EARLY_CONSOLE */ regs = fdt_getprop(dtb, offset, "reg-shift", &len); if (regs) @@ -462,9 +462,9 @@ static int init(struct uk_init_ctx *ictx __unused) return 0; } -#if CONFIG_LIBUKCONSOLE_NS16550_EARLY_CONSOLE +#if CONFIG_LIBNS16550_EARLY_CONSOLE UK_BOOT_EARLYTAB_ENTRY(early_init, UK_PRIO_AFTER(UK_PRIO_EARLIEST)); -#endif /* CONFIG_LIBUKCONSOLE_NS16550_EARLY_CONSOLE */ +#endif /* CONFIG_LIBNS16550_EARLY_CONSOLE */ /* UK_PRIO_EARLIEST reserved for cmdline */ uk_plat_initcall_prio(init, 0, UK_PRIO_AFTER(UK_PRIO_EARLIEST)); diff --git a/plat/kvm/Config.uk b/plat/kvm/Config.uk index 64bf6c95b..79fb687cb 100644 --- a/plat/kvm/Config.uk +++ b/plat/kvm/Config.uk @@ -97,9 +97,9 @@ config KVM_VMM_QEMU bool "QEMU" 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 + imply LIBNS16550 if LIBUKCONSOLE && ARCH_X86_64 + imply LIBNS16550_EARLY_CONSOLE if LIBUKCONSOLE && ARCH_X86_64 + 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 @@ -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 if LIBUKCONSOLE - imply LIBUKCONSOLE_NS16550_EARLY_CONSOLE if LIBUKCONSOLE - imply LIBUKCONSOLE_NS16550_COM1 if LIBUKCONSOLE && ARCH_X86_64 + imply LIBNS16550 if LIBUKCONSOLE + imply LIBNS16550_EARLY_CONSOLE if LIBUKCONSOLE + imply LIBNS16550_COM1 if LIBUKCONSOLE && ARCH_X86_64 imply LIBUKINTCTLR_GICV3 if ARCH_ARM_64 imply LIBUKRTC_PL031 depends on ARCH_X86_64 || ARCH_ARM_64