From ecd9a94213216f2f50e501e6b27ee390928e0dbf Mon Sep 17 00:00:00 2001 From: Naresh G Solanki Date: Thu, 11 Aug 2016 14:56:28 +0530 Subject: soc/intel/skylake: Move bootblock specific code from skylake/romstage There is a lot of code that is being referred to in bootblock but resides under skylake/romstage folder. Hence move this code into skylake/bootblock, and update the relevant header files and Makefiles. TEST=Build and Boot kunimitsu. Change-Id: If94e16fe54ccb7ced9c6b480a661609bdd2dfa41 Signed-off-by: Naresh G Solanki Reviewed-on: https://review.coreboot.org/16225 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/soc/intel/skylake/include/soc/bootblock.h | 9 +++++++-- src/soc/intel/skylake/include/soc/romstage.h | 5 ----- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/soc/intel/skylake/include') diff --git a/src/soc/intel/skylake/include/soc/bootblock.h b/src/soc/intel/skylake/include/soc/bootblock.h index e57c369d14..bacbef8cff 100644 --- a/src/soc/intel/skylake/include/soc/bootblock.h +++ b/src/soc/intel/skylake/include/soc/bootblock.h @@ -26,9 +26,14 @@ inline void bootblock_fsp_temp_ram_init(void) {} void bootblock_cpu_init(void); void bootblock_pch_early_init(void); void bootblock_systemagent_early_init(void); - void pch_uart_init(void); + /* Bootblock post console init programing */ -void pch_enable_lpc(void); +void enable_smbus(void); +void i2c_early_init(void); +void pch_early_init(void); +void report_platform_info(void); +void report_memory_config(void); +void set_max_freq(void); #endif diff --git a/src/soc/intel/skylake/include/soc/romstage.h b/src/soc/intel/skylake/include/soc/romstage.h index 71887aa165..6c40bd626d 100644 --- a/src/soc/intel/skylake/include/soc/romstage.h +++ b/src/soc/intel/skylake/include/soc/romstage.h @@ -19,13 +19,8 @@ #include -void i2c_early_init(void); void systemagent_early_init(void); -void pch_early_init(void); void intel_early_me_status(void); -void report_platform_info(void); -void set_max_freq(void); - void enable_smbus(void); int smbus_read_byte(unsigned device, unsigned address); -- cgit v1.2.3