diff options
author | Arthur Heymans <arthur@aheymans.xyz> | 2019-11-12 20:37:21 +0100 |
---|---|---|
committer | Patrick Georgi <pgeorgi@google.com> | 2019-11-15 16:45:36 +0000 |
commit | dc584c3f221bb59ee6b89e5517617b9d1d74bcf3 (patch) | |
tree | eb17076271066e5c271742227f76720b28da6d16 /src/mainboard/apple/macbook21 | |
parent | bf53acca5e9c6b61086e42eb9e73fd4bb59a6f31 (diff) |
nb/intel/i945: Move boilerplate romstage to a common location
This adds callbacks for mainboard specific init.
Change-Id: Ib67bc492a7b7f02f9b57a52fd6730e16501b436e
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36787
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard/apple/macbook21')
-rw-r--r-- | src/mainboard/apple/macbook21/romstage.c | 57 |
1 files changed, 1 insertions, 56 deletions
diff --git a/src/mainboard/apple/macbook21/romstage.c b/src/mainboard/apple/macbook21/romstage.c index 41c0e9f384..d4654de118 100644 --- a/src/mainboard/apple/macbook21/romstage.c +++ b/src/mainboard/apple/macbook21/romstage.c @@ -15,19 +15,10 @@ * GNU General Public License for more details. */ -#include <stdint.h> -#include <cf9_reset.h> -#include <device/pci_ops.h> -#include <device/pci_def.h> -#include <arch/romstage.h> -#include <cpu/x86/lapic.h> -#include <console/console.h> #include <northbridge/intel/i945/i945.h> -#include <northbridge/intel/i945/raminit.h> #include <southbridge/intel/i82801gx/i82801gx.h> -#include <southbridge/intel/common/pmclib.h> -static void rcba_config(void) +void mainboard_late_rcba_config(void) { /* V0CTL Virtual Channel 0 Resource Control */ RCBA32(0x0014) = 0x80000001; @@ -57,49 +48,3 @@ static void rcba_config(void) RCBA32(0x1e9c) = 0x000200f0; RCBA32(0x1e98) = 0x000c0801; } - -void mainboard_romstage_entry(void) -{ - int s3resume = 0; - const u8 spd_addrmap[2 * DIMM_SOCKETS] = { 0x50, 0x51, 0x52, 0x53 }; - - enable_lapic(); - - i82801gx_lpc_setup(); - - /* Set up the console */ - console_init(); - - if (MCHBAR16(SSKPD) == 0xCAFE) { - printk(BIOS_DEBUG, - "Soft reset detected, rebooting properly.\n"); - system_reset(); - } - - /* Perform some early chipset initialization required - * before RAM initialization can work - */ - i82801gx_early_init(); - i945_early_initialization(); - - s3resume = southbridge_detect_s3_resume(); - - /* Enable SPD ROMs and DDR-II DRAM */ - enable_smbus(); - - if (CONFIG(DEBUG_RAM_SETUP)) - dump_spd_registers(); - - sdram_initialize(s3resume ? 2 : 0, spd_addrmap); - - /* This should probably go away. Until now it is required - * and mainboard specific - */ - rcba_config(); - - /* Chipset Errata! */ - fixup_i945_errata(); - - /* Initialize the internal PCIe links before we go into stage2 */ - i945_late_initialization(s3resume); -} |