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

soc/intel/common: Restrict common romstage/ramstage code to FSP 

Restrict the use of the common romstage/ramstage code to FSP 1.1

BRANCH=none
BUG=None
TEST=Build and run on cyan/sklrvp

Change-Id: Ifbdb6b4c201560a97617e83d69bf9974f9411994
Signed-off-by: Lee Leahy <leroy.p.leahy@intel.com>
Reviewed-on: http://review.coreboot.org/10653
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Lee Leahy 2015-06-24 11:17:54 -07:00 committed by Leroy P Leahy
parent fbe276b96f
commit 3e5bc1feab
3 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/soc/intel/common/Kconfig
View File

@ -73,18 +73,22 @@ config SOC_INTEL_COMMON_FSP_RAM_INIT
config SOC_INTEL_COMMON_FSP_ROMSTAGE config SOC_INTEL_COMMON_FSP_ROMSTAGE
bool bool
default n default n
depends on PLATFORM_USES_FSP1_1
config SOC_INTEL_COMMON_RESET config SOC_INTEL_COMMON_RESET
bool bool
default n default n
depends on PLATFORM_USES_FSP1_1
config SOC_INTEL_COMMON_STACK config SOC_INTEL_COMMON_STACK
bool bool
default n default n
depends on PLATFORM_USES_FSP1_1
config SOC_INTEL_COMMON_STAGE_CACHE config SOC_INTEL_COMMON_STAGE_CACHE
bool bool
default n default n
depends on PLATFORM_USES_FSP1_1
config ROMSTAGE_RAM_STACK_SIZE config ROMSTAGE_RAM_STACK_SIZE
hex "Size of the romstage RAM stack in bytes" hex "Size of the romstage RAM stack in bytes"

30
src/soc/intel/common/romstage.c
View File

@ -85,10 +85,8 @@ asmlinkage void *romstage_main(unsigned int bist,
"No Memory Support")); "No Memory Support"));
/* Display FSP banner */ /* Display FSP banner */
if (IS_ENABLED(CONFIG_PLATFORM_USES_FSP1_1)) { printk(BIOS_DEBUG, "FSP TempRamInit successful\n");
printk(BIOS_DEBUG, "FSP TempRamInit successful\n"); print_fsp_info(params.chipset_context);
print_fsp_info(params.chipset_context);
}
/* Get power state */ /* Get power state */
params.power_state = fill_power_state(); params.power_state = fill_power_state();
@ -109,10 +107,8 @@ asmlinkage void *romstage_main(unsigned int bist,
top_of_stack = setup_stack_and_mtrrs(); top_of_stack = setup_stack_and_mtrrs();
if (IS_ENABLED(CONFIG_PLATFORM_USES_FSP1_1)) { printk(BIOS_DEBUG, "Calling FspTempRamExit API\n");
printk(BIOS_DEBUG, "Calling FspTempRamExit API\n"); timestamp_add_now(TS_FSP_TEMP_RAM_EXIT_START);
timestamp_add_now(TS_FSP_TEMP_RAM_EXIT_START);
}
return top_of_stack; return top_of_stack;
} }
@ -197,12 +193,10 @@ void romstage_common(struct romstage_params *params)
asmlinkage void romstage_after_car(void *chipset_context) asmlinkage void romstage_after_car(void *chipset_context)
{ {
if (IS_ENABLED(CONFIG_PLATFORM_USES_FSP1_1)) { timestamp_add_now(TS_FSP_TEMP_RAM_EXIT_END);
timestamp_add_now(TS_FSP_TEMP_RAM_EXIT_END); printk(BIOS_DEBUG, "FspTempRamExit returned successfully\n");
printk(BIOS_DEBUG, "FspTempRamExit returned successfully\n"); soc_after_temp_ram_exit();
soc_after_temp_ram_exit(); soc_display_mtrrs();
soc_display_mtrrs();
}
timestamp_add_now(TS_END_ROMSTAGE); timestamp_add_now(TS_END_ROMSTAGE);
@ -253,7 +247,6 @@ __attribute__((weak)) void mainboard_romstage_entry(
} }
/* Save the DIMM information for SMBIOS table 17 */ /* Save the DIMM information for SMBIOS table 17 */
#if IS_ENABLED(CONFIG_PLATFORM_USES_FSP1_1)
__attribute__((weak)) void mainboard_save_dimm_info( __attribute__((weak)) void mainboard_save_dimm_info(
struct romstage_params *params) struct romstage_params *params)
{ {
@ -348,13 +341,6 @@ __attribute__((weak)) void mainboard_save_dimm_info(
mem_info->dimm_cnt = index; mem_info->dimm_cnt = index;
printk(BIOS_DEBUG, "%d DIMMs found\n", mem_info->dimm_cnt); printk(BIOS_DEBUG, "%d DIMMs found\n", mem_info->dimm_cnt);
} }
#else /* CONFIG_PLATFORM_USES_FSP1_1 */
__attribute__((weak)) void mainboard_save_dimm_info(
struct romstage_params *params)
{
printk(BIOS_DEBUG, "WEAK: %s/%s called\n", __FILE__, __func__);
}
#endif /* CONFIG_PLATFORM_USES_FSP1_1 */
/* Get the memory configuration data */ /* Get the memory configuration data */
__attribute__((weak)) int mrc_cache_get_current( __attribute__((weak)) int mrc_cache_get_current(

6
src/soc/intel/common/romstage.h
View File

@ -23,9 +23,7 @@
#include <stdint.h> #include <stdint.h>
#include <arch/cpu.h> #include <arch/cpu.h>
#if IS_ENABLED(CONFIG_PLATFORM_USES_FSP1_1)
#include <fsp_util.h> #include <fsp_util.h>
#endif /* CONFIG_PLATFORM_USES_FSP1_1 */
#include <soc/intel/common/util.h> #include <soc/intel/common/util.h>
#include <soc/pei_data.h> #include <soc/pei_data.h>
#include <soc/pm.h> /* chip_power_state */ #include <soc/pm.h> /* chip_power_state */
@ -73,10 +71,8 @@ struct romstage_params {
*/ */
void mainboard_check_ec_image(struct romstage_params *params); void mainboard_check_ec_image(struct romstage_params *params);
#if IS_ENABLED(CONFIG_PLATFORM_USES_FSP1_1)
void mainboard_memory_init_params(struct romstage_params *params, void mainboard_memory_init_params(struct romstage_params *params,
MEMORY_INIT_UPD *memory_params); MEMORY_INIT_UPD *memory_params);
#endif /* CONFIG_PLATFORM_USES_FSP1_1 */
void mainboard_pre_console_init(struct romstage_params *params); void mainboard_pre_console_init(struct romstage_params *params);
void mainboard_romstage_entry(struct romstage_params *params); void mainboard_romstage_entry(struct romstage_params *params);
void mainboard_save_dimm_info(struct romstage_params *params); void mainboard_save_dimm_info(struct romstage_params *params);
@ -91,11 +87,9 @@ void *setup_stack_and_mtrrs(void);
void set_max_freq(void); void set_max_freq(void);
void soc_after_ram_init(struct romstage_params *params); void soc_after_ram_init(struct romstage_params *params);
void soc_after_temp_ram_exit(void); void soc_after_temp_ram_exit(void);
#if IS_ENABLED(CONFIG_PLATFORM_USES_FSP1_1)
void soc_display_memory_init_params(const MEMORY_INIT_UPD *old, void soc_display_memory_init_params(const MEMORY_INIT_UPD *old,
MEMORY_INIT_UPD *new); MEMORY_INIT_UPD *new);
void soc_memory_init_params(MEMORY_INIT_UPD *params); void soc_memory_init_params(MEMORY_INIT_UPD *params);
#endif /* CONFIG_PLATFORM_USES_FSP1_1 */
void soc_pre_console_init(struct romstage_params *params); void soc_pre_console_init(struct romstage_params *params);
void soc_pre_ram_init(struct romstage_params *params); void soc_pre_ram_init(struct romstage_params *params);
void soc_romstage_init(struct romstage_params *params); void soc_romstage_init(struct romstage_params *params);