diff options
| author | Tom Rini <trini@konsulko.com> | 2021-02-01 08:15:46 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-01 08:15:46 -0500 |
| commit | 7ee6205a5f286937cbd47f9ffbc27fd510be9223 (patch) | |
| tree | 608f320cbdf0b9fbbf8de40cb0b05b7e4f5bf02a /arch/x86/lib/spl.c | |
| parent | d039975f077f39a3129e1aa1f7236d67e4b06e7b (diff) | |
| parent | 77f898d04095cdccb69c476ba0aa19f257fca64d (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- Fix CMD_ACPI dependency in Kconfig
- Correct overflow in __udelay() in TSC timer driver
- Add a devicetree node for eMMC for Coral
- Minor improvements on image loading
- Reduce size of Samus image
Diffstat (limited to 'arch/x86/lib/spl.c')
| -rw-r--r-- | arch/x86/lib/spl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c index cf22fa2d7b5..6699de49c63 100644 --- a/arch/x86/lib/spl.c +++ b/arch/x86/lib/spl.c @@ -115,8 +115,8 @@ static int x86_spl_init(void) } #ifndef CONFIG_SYS_COREBOOT -# ifndef CONFIG_TPL memset(&__bss_start, 0, (ulong)&__bss_end - (ulong)&__bss_start); +# ifndef CONFIG_TPL /* TODO(sjg@chromium.org): Consider calling cpu_init_r() here */ ret = interrupt_init(); |