diff options
| author | Lee Leahy <leroy.p.leahy@intel.com> | 2016-07-25 07:41:54 -0700 |
|---|---|---|
| committer | Lee Leahy <leroy.p.leahy@intel.com> | 2016-08-05 01:50:45 +0200 |
| commit | 102f6253600cfa3f741c0d1d126436d612daa203 (patch) | |
| tree | dc3d0c6376b405dc053e4f4c9c864d30cf4737eb /src/mainboard/intel/galileo/gpio.c | |
| parent | 6e05c33626e128c383470579f423b1ee569302ba (diff) | |
soc/intel/quark: Add FSP 2.0 boot block support
Add the pieces necessary to successfully build and run bootblock using
the FSP 2.0 build.
TEST=Build and run bootblock on Galileo Gen2
Change-Id: I2377f0b0147196f100396b8cd7eaca8f92d6932f
Signed-off-by: Lee Leahy <leroy.p.leahy@intel.com>
Reviewed-on: https://review.coreboot.org/15865
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'src/mainboard/intel/galileo/gpio.c')
| -rw-r--r-- | src/mainboard/intel/galileo/gpio.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mainboard/intel/galileo/gpio.c b/src/mainboard/intel/galileo/gpio.c index 8f3c2e3b05..b7518c0523 100644 --- a/src/mainboard/intel/galileo/gpio.c +++ b/src/mainboard/intel/galileo/gpio.c @@ -15,7 +15,7 @@ #include <arch/io.h> #include <console/console.h> -#include <fsp/romstage.h> +#include <soc/car.h> #include <soc/ramstage.h> #include "reg_access.h" #include "gen1.h" @@ -37,7 +37,8 @@ void car_mainboard_pre_console_init(void) if (IS_ENABLED(CONFIG_GALILEO_GEN2)) script = gen2_hsuart0; else - script = (reg_legacy_gpio_read (R_QNC_GPIO_RGLVL_RESUME_WELL) + script = (reg_legacy_gpio_read( + R_QNC_GPIO_RGLVL_RESUME_WELL) & GALILEO_DETERMINE_IOEXP_SLA_RESUMEWELL_GPIO) ? gen1_hsuart0_0x20 : gen1_hsuart0_0x21; reg_script_run(script); |