aboutsummaryrefslogtreecommitdiffstats
path: root/payloads
diff options
context:
space:
mode:
Diffstat (limited to 'payloads')
-rw-r--r--payloads/libpayload/Config.in14
-rw-r--r--payloads/libpayload/configs/defconfig2
-rw-r--r--payloads/libpayload/drivers/Makefile.inc2
-rw-r--r--payloads/libpayload/tests/libpayload-config.h2
4 files changed, 11 insertions, 9 deletions
diff --git a/payloads/libpayload/Config.in b/payloads/libpayload/Config.in
index f28f9b874..e3e064e87 100644
--- a/payloads/libpayload/Config.in
+++ b/payloads/libpayload/Config.in
@@ -162,14 +162,16 @@ config SERIAL_CONSOLE
bool "See output on the serial port console"
default y
-config X86_SERIAL_CONSOLE
- bool
- depends on ARCH_X86 && SERIAL_CONSOLE
- default y
+config 8250_SERIAL_CONSOLE
+ bool "8250, 16450, 16550, 16550A compatible serial port driver"
+ depends on SERIAL_CONSOLE
+ default y if ARCH_X86
+ default n if !ARCH_X86
config SERIAL_IOBASE
- hex "I/O base for the serial port (default 0x3f8)"
- depends on X86_SERIAL_CONSOLE
+ ## This default is currently not used on non-x86 systems.
+ hex "Default I/O base for the serial port (default 0x3f8)"
+ depends on SERIAL_CONSOLE && ARCH_X86
default 0x3f8
config SERIAL_SET_SPEED
diff --git a/payloads/libpayload/configs/defconfig b/payloads/libpayload/configs/defconfig
index 5804ed898..aef9fc30c 100644
--- a/payloads/libpayload/configs/defconfig
+++ b/payloads/libpayload/configs/defconfig
@@ -36,7 +36,7 @@ CONFIG_LP_LZMA=y
# CONFIG_LP_SKIP_CONSOLE_INIT is not set
CONFIG_LP_CBMEM_CONSOLE=y
CONFIG_LP_SERIAL_CONSOLE=y
-CONFIG_LP_X86_SERIAL_CONSOLE=y
+CONFIG_LP_8250_SERIAL_CONSOLE=y
CONFIG_LP_SERIAL_IOBASE=0x3f8
# CONFIG_LP_SERIAL_SET_SPEED is not set
# CONFIG_LP_SERIAL_ACS_FALLBACK is not set
diff --git a/payloads/libpayload/drivers/Makefile.inc b/payloads/libpayload/drivers/Makefile.inc
index b31e341ef..881c80118 100644
--- a/payloads/libpayload/drivers/Makefile.inc
+++ b/payloads/libpayload/drivers/Makefile.inc
@@ -33,7 +33,7 @@ libc-$(CONFIG_LP_PCI) += pci.c
libc-$(CONFIG_LP_SPEAKER) += speaker.c
-libc-$(CONFIG_LP_X86_SERIAL_CONSOLE) += serial.c
+libc-$(CONFIG_LP_8250_SERIAL_CONSOLE) += serial.c
libc-$(CONFIG_LP_PC_KEYBOARD) += keyboard.c
diff --git a/payloads/libpayload/tests/libpayload-config.h b/payloads/libpayload/tests/libpayload-config.h
index 68995b846..cce7c4cf8 100644
--- a/payloads/libpayload/tests/libpayload-config.h
+++ b/payloads/libpayload/tests/libpayload-config.h
@@ -15,7 +15,7 @@
#define CONFIG_LP_STORAGE_ATA 1
#define CONFIG_LP_ARCH_SPECIFIC_OPTIONS 1
#define CONFIG_LP_STORAGE_AHCI_ONLY_TESTED 1
-#define CONFIG_LP_X86_SERIAL_CONSOLE 1
+#define CONFIG_LP_8250_SERIAL_CONSOLE 1
#define CONFIG_LP_PDCURSES 1
#define CONFIG_LP_NVRAM 1
#define CONFIG_LP_PC_KEYBOARD_LAYOUT_US 1