GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpayload: Change CONFIG_X86_SERIAL_CONSOLE to CONFIG_8250_SERIAL_CONSOLE 

While the 8250 compatible serial port driver is primarily useful on x86
systems because it works with the legacy x86 com ports, some devices which
aren't x86 based have 8250 compatible UARTs as well. This change renames the
CONFIG_X86_SERIAL_CONSOLE option to the more general and direct
CONFIG_8250_SERIAL_CONSOLE and fixes up the dependencies so that non-x86
systems can enable the driver, although it will default to on on x86 and off
otherwise.

Also, the default IO port address that's added to the sysinfo structure on x86
and which is intended to be overwritten by a value in the coreboot tables is
not used on ARM. That variable is adjusted so that it's more clear it's a
default value, and made dependent on x86 since that's the only place its value
is actually used.

Change-Id: Ifeaade0e7bd76d382426e947275a9c933da4930e
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: https://chromium-review.googlesource.com/170834
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Commit-Queue: Gabe Black <gabeblack@chromium.org>
Tested-by: Gabe Black <gabeblack@chromium.org>
(cherry picked from commit 9a10e39a2da3cb0bfb316c0869cf5025078e287f)
Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com>
Reviewed-on: http://review.coreboot.org/6655
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
This commit is contained in:
Gabe Black 2013-09-26 16:13:08 -07:00 committed by Isaac Christensen
parent 7f0747562e
commit 9135cb4542
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
payloads/libpayload/Config.in
View File

@ -162,14 +162,16 @@ config SERIAL_CONSOLE
bool "See output on the serial port console" bool "See output on the serial port console"
default y default y
config X86_SERIAL_CONSOLE config 8250_SERIAL_CONSOLE
bool bool "8250, 16450, 16550, 16550A compatible serial port driver"
depends on ARCH_X86 && SERIAL_CONSOLE depends on SERIAL_CONSOLE
default y default y if ARCH_X86
default n if !ARCH_X86
config SERIAL_IOBASE config SERIAL_IOBASE
hex "I/O base for the serial port (default 0x3f8)" ## This default is currently not used on non-x86 systems.
depends on X86_SERIAL_CONSOLE hex "Default I/O base for the serial port (default 0x3f8)"
depends on SERIAL_CONSOLE && ARCH_X86
default 0x3f8 default 0x3f8
config SERIAL_SET_SPEED config SERIAL_SET_SPEED

2
payloads/libpayload/configs/defconfig
View File

@ -36,7 +36,7 @@ CONFIG_LP_LZMA=y
# CONFIG_LP_SKIP_CONSOLE_INIT is not set # CONFIG_LP_SKIP_CONSOLE_INIT is not set
CONFIG_LP_CBMEM_CONSOLE=y CONFIG_LP_CBMEM_CONSOLE=y
CONFIG_LP_SERIAL_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_IOBASE=0x3f8
# CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_SET_SPEED is not set
# CONFIG_LP_SERIAL_ACS_FALLBACK is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set

2
payloads/libpayload/drivers/Makefile.inc
View File

@ -33,7 +33,7 @@ libc-$(CONFIG_LP_PCI) += pci.c
libc-$(CONFIG_LP_SPEAKER) += speaker.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 libc-$(CONFIG_LP_PC_KEYBOARD) += keyboard.c

2
payloads/libpayload/tests/libpayload-config.h
View File

@ -15,7 +15,7 @@
#define CONFIG_LP_STORAGE_ATA 1 #define CONFIG_LP_STORAGE_ATA 1
#define CONFIG_LP_ARCH_SPECIFIC_OPTIONS 1 #define CONFIG_LP_ARCH_SPECIFIC_OPTIONS 1
#define CONFIG_LP_STORAGE_AHCI_ONLY_TESTED 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_PDCURSES 1
#define CONFIG_LP_NVRAM 1 #define CONFIG_LP_NVRAM 1
#define CONFIG_LP_PC_KEYBOARD_LAYOUT_US 1 #define CONFIG_LP_PC_KEYBOARD_LAYOUT_US 1