diff options
Diffstat (limited to 'src/mainboard/intel')
| -rw-r--r-- | src/mainboard/intel/galileo/Kconfig | 2 | ||||
| -rw-r--r-- | src/mainboard/intel/galileo/Makefile.inc | 3 | ||||
| -rw-r--r-- | src/mainboard/intel/galileo/gpio.c | 5 | ||||
| -rw-r--r-- | src/mainboard/intel/galileo/romstage.c | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/src/mainboard/intel/galileo/Kconfig b/src/mainboard/intel/galileo/Kconfig index 2acc439746..1f32d63a42 100644 --- a/src/mainboard/intel/galileo/Kconfig +++ b/src/mainboard/intel/galileo/Kconfig @@ -54,7 +54,7 @@ config USE_FSP1_1 config USE_FSP2_0 bool default n + select BOOTBLOCK_CONSOLE select PLATFORM_USES_FSP2_0 - select POSTCAR_STAGE endif # BOARD_INTEL_QUARK diff --git a/src/mainboard/intel/galileo/Makefile.inc b/src/mainboard/intel/galileo/Makefile.inc index 5aad30861a..efaf007677 100644 --- a/src/mainboard/intel/galileo/Makefile.inc +++ b/src/mainboard/intel/galileo/Makefile.inc @@ -23,5 +23,8 @@ bootblock-y += reg_access.c romstage-y += gpio.c romstage-y += reg_access.c +postcar-y += gpio.c +postcar-y += reg_access.c + ramstage-y += gpio.c ramstage-y += reg_access.c 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); diff --git a/src/mainboard/intel/galileo/romstage.c b/src/mainboard/intel/galileo/romstage.c index dfae772580..baf9af37cb 100644 --- a/src/mainboard/intel/galileo/romstage.c +++ b/src/mainboard/intel/galileo/romstage.c @@ -14,6 +14,7 @@ * GNU General Public License for more details. */ +#if IS_ENABLED(CONFIG_PLATFORM_USES_FSP1_1) #include <fsp/romstage.h> /* All FSP specific code goes in this block */ @@ -22,3 +23,4 @@ void mainboard_romstage_entry(struct romstage_params *rp) /* Call back into chipset code with platform values updated. */ romstage_common(rp); } +#endif /* IS_ENABLED(CONFIG_PLATFORM_USES_FSP1_1) */ |