diff options
| author | Lee Leahy <leroy.p.leahy@intel.com> | 2016-08-06 09:51:35 -0700 |
|---|---|---|
| committer | Lee Leahy <leroy.p.leahy@intel.com> | 2016-08-10 22:31:52 +0200 |
| commit | 5e07a7e474eb2ceeb252ddc33fb26fe041425c1b (patch) | |
| tree | c8d65f11a3197dece346ef23528ac6ac6b434aee /src/soc/intel/quark | |
| parent | 00a38a4a9e668caf573517051aafff9eba61def3 (diff) | |
soc/intel/quark: Switch to using serial routines for FSP
Switch from passing FSP the serial port address to passing FSP the
serial port output routine. This enables coreboot to use any UART in
the system and also log the FSP output.
TEST=Build and run on Galileo Gen2
Change-Id: I67d820ea0360a3188480455dd2595be7f2debd5c
Signed-off-by: Lee Leahy <leroy.p.leahy@intel.com>
Reviewed-on: https://review.coreboot.org/16105
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'src/soc/intel/quark')
| -rw-r--r-- | src/soc/intel/quark/include/soc/fsp/FspmUpd.h | 14 | ||||
| -rw-r--r-- | src/soc/intel/quark/romstage/fsp1_1.c | 17 | ||||
| -rw-r--r-- | src/soc/intel/quark/romstage/fsp2_0.c | 5 |
3 files changed, 26 insertions, 10 deletions
diff --git a/src/soc/intel/quark/include/soc/fsp/FspmUpd.h b/src/soc/intel/quark/include/soc/fsp/FspmUpd.h index bb0fc51b3d..a7a54a842d 100644 --- a/src/soc/intel/quark/include/soc/fsp/FspmUpd.h +++ b/src/soc/intel/quark/include/soc/fsp/FspmUpd.h @@ -53,7 +53,7 @@ struct FSP_M_CONFIG { /** Offset 0x0048 - SerialPortBaseAddress Debug serial port base address set by BIOS. Zero disables debug serial output. **/ - uint32_t SerialPortBaseAddress; + uint32_t Reserved_48; /** Offset 0x004C - tRAS ACT to PRE command period in picoseconds. @@ -200,6 +200,18 @@ struct FSP_M_CONFIG { /** Offset 0x0080 **/ + uint32_t SerialPortPollForChar; + +/** Offset 0x0084 +**/ + uint32_t SerialPortReadChar; + +/** Offset 0x0088 +**/ + uint32_t SerialPortWriteChar; + +/** Offset 0x008C +**/ uint16_t UpdTerminator; } __attribute__((packed)); diff --git a/src/soc/intel/quark/romstage/fsp1_1.c b/src/soc/intel/quark/romstage/fsp1_1.c index 5ba2174628..d7f19a74f5 100644 --- a/src/soc/intel/quark/romstage/fsp1_1.c +++ b/src/soc/intel/quark/romstage/fsp1_1.c @@ -21,7 +21,6 @@ #include "../chip.h" #include <fsp/memmap.h> #include <fsp/util.h> -#include <soc/iomap.h> #include <soc/pci_devs.h> #include <soc/QuarkNcSocId.h> #include <soc/romstage.h> @@ -120,8 +119,8 @@ void soc_memory_init_params(struct romstage_params *params, upd->RankMask = config->RankMask; upd->RmuBaseAddress = (uintptr_t)rmu_file; upd->RmuLength = rmu_file_len; - upd->SerialPortBaseAddress = console_log_level(BIOS_SPEW) - ? UART_BASE_ADDRESS : 0; + upd->SerialPortWriteChar = console_log_level(BIOS_SPEW) + ? (uintptr_t)fsp_write_line : 0; upd->SmmTsegSize = IS_ENABLED(CONFIG_HAVE_SMI_HANDLER) ? config->SmmTsegSize : 0; upd->SocRdOdtVal = config->SocRdOdtVal; @@ -176,9 +175,15 @@ void soc_display_memory_init_params(const MEMORY_INIT_UPD *old, old->RmuBaseAddress, new->RmuBaseAddress); fsp_display_upd_value("RmuLength", sizeof(old->RmuLength), old->RmuLength, new->RmuLength); - fsp_display_upd_value("SerialPortBaseAddress", - sizeof(old->SerialPortBaseAddress), - old->SerialPortBaseAddress, new->SerialPortBaseAddress); + fsp_display_upd_value("SerialPortPollForChar", + sizeof(old->SerialPortPollForChar), + old->SerialPortPollForChar, new->SerialPortPollForChar); + fsp_display_upd_value("SerialPortReadChar", + sizeof(old->SerialPortReadChar), + old->SerialPortReadChar, new->SerialPortReadChar); + fsp_display_upd_value("SerialPortWriteChar", + sizeof(old->SerialPortWriteChar), + old->SerialPortWriteChar, new->SerialPortWriteChar); fsp_display_upd_value("SmmTsegSize", sizeof(old->SmmTsegSize), old->SmmTsegSize, new->SmmTsegSize); fsp_display_upd_value("SocRdOdtVal", sizeof(old->SocRdOdtVal), diff --git a/src/soc/intel/quark/romstage/fsp2_0.c b/src/soc/intel/quark/romstage/fsp2_0.c index 6ca6a4c011..51fcde71e5 100644 --- a/src/soc/intel/quark/romstage/fsp2_0.c +++ b/src/soc/intel/quark/romstage/fsp2_0.c @@ -20,7 +20,6 @@ #include "../chip.h" #include <cpu/x86/cache.h> #include <fsp/util.h> -#include <soc/iomap.h> #include <soc/pci_devs.h> #include <soc/pm.h> #include <soc/romstage.h> @@ -161,8 +160,8 @@ void platform_fsp_memory_init_params_cb(struct FSPM_UPD *fspm_upd) upd->RankMask = config->RankMask; upd->RmuBaseAddress = (uintptr_t)rmu_file; upd->RmuLength = rmu_file_len; - upd->SerialPortBaseAddress = console_log_level(BIOS_SPEW) - ? UART_BASE_ADDRESS : 0; + upd->SerialPortWriteChar = console_log_level(BIOS_SPEW) + ? (uintptr_t)fsp_write_line : 0; upd->SmmTsegSize = IS_ENABLED(CONFIG_HAVE_SMI_HANDLER) ? config->SmmTsegSize : 0; upd->SocRdOdtVal = config->SocRdOdtVal; |