intel: Use CF9 reset (part 1)
Add SOUTHBRIDGE_INTEL_COMMON_RESET for all Intel platforms that used to perform a "system reset" in their hard_reset() implementation. Replace all duplicate CF9 reset implementations for these platforms. Change-Id: I8e359b0c4d5a1060edd0940d24c2f78dfed8a590 Signed-off-by: Patrick Rudolph <siro@das-labor.org> Signed-off-by: Nico Huber <nico.h@gmx.de> Reviewed-on: https://review.coreboot.org/28862 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
committed by
Patrick Georgi
parent
33fcaf91ff
commit
45022ae056
@@ -18,6 +18,7 @@
|
||||
#include <cbfs.h>
|
||||
#include <console/console.h>
|
||||
#include <arch/cpu.h>
|
||||
#include <cf9_reset.h>
|
||||
#include <cpu/cpu.h>
|
||||
#include <cpu/x86/bist.h>
|
||||
#include <cpu/x86/msr.h>
|
||||
@@ -32,7 +33,6 @@
|
||||
#include <cbmem.h>
|
||||
#include <program_loading.h>
|
||||
#include <romstage_handoff.h>
|
||||
#include <reset.h>
|
||||
#include <vendorcode/google/chromeos/chromeos.h>
|
||||
#if IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC)
|
||||
#include <ec/google/chromeec/ec.h>
|
||||
@@ -44,12 +44,6 @@
|
||||
#include <cpu/intel/romstage.h>
|
||||
#include "haswell.h"
|
||||
|
||||
static inline void reset_system(void)
|
||||
{
|
||||
hard_reset();
|
||||
halt();
|
||||
}
|
||||
|
||||
#define ROMSTAGE_RAM_STACK_SIZE 0x5000
|
||||
|
||||
/* platform_enter_postcar() determines the stack to use after
|
||||
@@ -147,7 +141,7 @@ void romstage_common(const struct romstage_params *params)
|
||||
} else if (cbmem_initialize()) {
|
||||
#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)
|
||||
/* Failed S3 resume, reset to come up cleanly */
|
||||
reset_system();
|
||||
system_reset();
|
||||
#endif
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user