diff options
| author | Okash Khawaja <okash.khawaja@gmail.com> | 2018-09-06 14:39:13 +0100 |
|---|---|---|
| committer | Philipp Deppenwiese <zaolin.daisuki@gmail.com> | 2018-09-07 10:25:52 +0000 |
| commit | dd5411a8b1c7d94de98eab3a23e655a7267d818c (patch) | |
| tree | 3ec8b9b8042ef91d2676a30df321a8142992c609 | |
| parent | 2d602098f9def150d1111f334a668391c25da5cf (diff) | |
fsp_broadwell_de: enable spi console
this enables spi console for wedge100s with broadwell_de. the console
size is 64kb. enabling spi console in `board.fmd` enables code which
calls into `timer_monotonic_get` (from `spi_flash_cmd_poll_bit`) and
`udelay` (from `ich_status_poll`). this patch selects `TSC_CONSTANT_RATE`
in fsp_broadwell_de's Kconfig to satisfy that.
Change-Id: Ib925c5aee88b65c46a81534405c364dd5649f8e8
Signed-off-by: Okash Khawaja <okash.khawaja@gmail.com>
Reviewed-on: https://review.coreboot.org/28528
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@gmail.com>
| -rw-r--r-- | src/mainboard/ocp/wedge100s/board.fmd | 3 | ||||
| -rw-r--r-- | src/soc/intel/fsp_broadwell_de/Kconfig | 1 | ||||
| -rw-r--r-- | src/soc/intel/fsp_broadwell_de/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/soc/intel/fsp_broadwell_de/spi.c | 7 |
4 files changed, 8 insertions, 4 deletions
diff --git a/src/mainboard/ocp/wedge100s/board.fmd b/src/mainboard/ocp/wedge100s/board.fmd index da6e3e346e..8e440810e6 100644 --- a/src/mainboard/ocp/wedge100s/board.fmd +++ b/src/mainboard/ocp/wedge100s/board.fmd @@ -21,6 +21,7 @@ FLASH@0xff000000 0x1000000 { RO_VPD@0x0 0x1000 } RW_MRC_CACHE@0x10000 0x10000 - COREBOOT(CBFS)@0x20000 0x7e0000 + CONSOLE@0x20000 0x10000 + COREBOOT(CBFS)@0x30000 0x7d0000 } } diff --git a/src/soc/intel/fsp_broadwell_de/Kconfig b/src/soc/intel/fsp_broadwell_de/Kconfig index cc3e6e235a..37876b5482 100644 --- a/src/soc/intel/fsp_broadwell_de/Kconfig +++ b/src/soc/intel/fsp_broadwell_de/Kconfig @@ -26,6 +26,7 @@ config CPU_SPECIFIC_OPTIONS select SMM_TSEG select HAVE_SMI_HANDLER select TSC_MONOTONIC_TIMER + select TSC_CONSTANT_RATE config CBFS_SIZE hex diff --git a/src/soc/intel/fsp_broadwell_de/Makefile.inc b/src/soc/intel/fsp_broadwell_de/Makefile.inc index 024035cef9..386adc1f5e 100644 --- a/src/soc/intel/fsp_broadwell_de/Makefile.inc +++ b/src/soc/intel/fsp_broadwell_de/Makefile.inc @@ -12,6 +12,7 @@ subdirs-y += ../../../lib/fsp subdirs-y += fsp romstage-y += gpio.c +romstage-y += spi.c ramstage-y += spi.c ramstage-y += cpu.c diff --git a/src/soc/intel/fsp_broadwell_de/spi.c b/src/soc/intel/fsp_broadwell_de/spi.c index f60249105d..1b1589db5b 100644 --- a/src/soc/intel/fsp_broadwell_de/spi.c +++ b/src/soc/intel/fsp_broadwell_de/spi.c @@ -26,6 +26,7 @@ #include <device/pci_ids.h> #include <spi_flash.h> #include <spi-generic.h> +#include <arch/early_variables.h> #ifdef __SMM__ #define pci_read_config_byte(dev, reg, targ)\ @@ -59,7 +60,7 @@ typedef struct spi_slave ich_spi_slave; -static int ichspi_lock = 0; +static int ichspi_lock CAR_GLOBAL = 0; typedef struct ich9_spi_regs { uint32_t bfpr; @@ -109,7 +110,7 @@ typedef struct ich_spi_controller { uint32_t *bbar; } ich_spi_controller; -static ich_spi_controller cntlr; +static ich_spi_controller cntlr CAR_GLOBAL; enum { SPIS_SCIP = 0x0001, @@ -268,7 +269,7 @@ void spi_init(void) uint8_t bios_cntl; ich9_spi_regs *ich9_spi; -#ifdef __SMM__ +#if defined(__SIMPLE_DEVICE__) pci_devfn_t dev = PCI_DEV(0, 31, 0); #else struct device *dev; |