diff options
| author | Tom Rini <trini@konsulko.com> | 2023-09-22 11:16:22 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-09-22 11:16:22 -0400 |
| commit | b05a184379631d13c4a49e423aa1324dc1ae6158 (patch) | |
| tree | d9937c7de598c7edc5741ebc67c98dce47ea42d5 /arch/x86/cpu/intel_common/mrc.c | |
| parent | 5d2fae79c7d60eaf7f50322e4ec125d2f58544e9 (diff) | |
| parent | 5728246dfa11400d4f7aa8262ea630d8c09a85b9 (diff) | |
Merge tag 'x86-pull-20230922' of https://source.denx.de/u-boot/custodians/u-boot-x86 into next
- Add bootstd support to 64-bit efi payload
- Fix a bug of missing setting size of initrd in pxeboot
- Allow Python packages to be dropped
- Reland "x86: Move FACP table into separate functions"
- Fixes for chromebook_link64 and chromebook_samus_tpl
- Fixes and improvements for coreboot
- x86 documentation updates
Diffstat (limited to 'arch/x86/cpu/intel_common/mrc.c')
| -rw-r--r-- | arch/x86/cpu/intel_common/mrc.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c index 56cc253831a..ff959d1bd8d 100644 --- a/arch/x86/cpu/intel_common/mrc.c +++ b/arch/x86/cpu/intel_common/mrc.c @@ -9,6 +9,7 @@ #include <dm.h> #include <init.h> #include <log.h> +#include <spl.h> #include <syscon.h> #include <asm/cpu.h> #include <asm/global_data.h> @@ -251,13 +252,28 @@ static int sdram_initialise(struct udevice *dev, struct udevice *me_dev, int mrc_common_init(struct udevice *dev, void *pei_data, bool use_asm_linkage) { struct udevice *me_dev; - int ret; + int ret, delay; ret = syscon_get_by_driver_data(X86_SYSCON_ME, &me_dev); if (ret) return ret; + delay = dev_read_u32_default(dev, "fspm,training-delay", 0); + if (spl_phase() == PHASE_SPL) { + if (delay) + printf("SDRAM training (%d seconds)...", delay); + else + log_debug("SDRAM init..."); + } else { + if (delay) + printf("(%d seconds)...", delay); + } + ret = sdram_initialise(dev, me_dev, pei_data, use_asm_linkage); + if (delay) + printf("done\n"); + else + log_debug("done\n"); if (ret) return ret; quick_ram_check(); |