diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2021-02-17 18:10:49 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2021-02-23 02:35:53 +0000 |
| commit | 4ce0a07f0670e74dd22d5f7af4b8603db2320ded (patch) | |
| tree | 60679c42a7f8eba961dab8c8d9fcdfb14b02c47b /src/northbridge/intel/sandybridge | |
| parent | b6fc13b3dbc943b4981b6b33ba7a0e025c62398a (diff) | |
nb/intel/x4x,sandybridge: Move romstage_handoff_init() call
Change-Id: I6356bb7ea904ca860cbedd46515924505d515791
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50972
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'src/northbridge/intel/sandybridge')
| -rw-r--r-- | src/northbridge/intel/sandybridge/early_init.c | 5 | ||||
| -rw-r--r-- | src/northbridge/intel/sandybridge/romstage.c | 5 | ||||
| -rw-r--r-- | src/northbridge/intel/sandybridge/sandybridge.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/northbridge/intel/sandybridge/early_init.c b/src/northbridge/intel/sandybridge/early_init.c index 42957e540b..b7ee3225ec 100644 --- a/src/northbridge/intel/sandybridge/early_init.c +++ b/src/northbridge/intel/sandybridge/early_init.c @@ -6,7 +6,6 @@ #include <device/pci_ops.h> #include <device/pci_def.h> #include <option.h> -#include <romstage_handoff.h> #include <types.h> #include "sandybridge.h" @@ -194,9 +193,7 @@ void systemagent_early_init(void) start_peg_link_training(); } -void northbridge_romstage_finalize(int s3resume) +void northbridge_romstage_finalize(void) { MCHBAR16(SSKPD_HI) = 0xCAFE; - - romstage_handoff_init(s3resume); } diff --git a/src/northbridge/intel/sandybridge/romstage.c b/src/northbridge/intel/sandybridge/romstage.c index 5c0dd5c1a7..fad8e2f91a 100644 --- a/src/northbridge/intel/sandybridge/romstage.c +++ b/src/northbridge/intel/sandybridge/romstage.c @@ -4,6 +4,7 @@ #include <cf9_reset.h> #include <device/pci_ops.h> #include <cpu/x86/lapic.h> +#include <romstage_handoff.h> #include <timestamp.h> #include "sandybridge.h" #include <arch/romstage.h> @@ -75,7 +76,9 @@ void mainboard_romstage_entry(void) post_code(0x3d); - northbridge_romstage_finalize(s3resume); + northbridge_romstage_finalize(); post_code(0x3f); + + romstage_handoff_init(s3resume); } diff --git a/src/northbridge/intel/sandybridge/sandybridge.h b/src/northbridge/intel/sandybridge/sandybridge.h index 27295955b1..63b51b0bc5 100644 --- a/src/northbridge/intel/sandybridge/sandybridge.h +++ b/src/northbridge/intel/sandybridge/sandybridge.h @@ -72,7 +72,7 @@ void intel_sandybridge_finalize_smm(void); void systemagent_early_init(void); void sandybridge_init_iommu(void); void sandybridge_late_initialization(void); -void northbridge_romstage_finalize(int s3resume); +void northbridge_romstage_finalize(void); void early_init_dmi(void); /* mainboard_early_init: Optional callback, run after console init but before raminit. */ |