diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-09 23:27:15 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-09 23:27:15 -0400 |
| commit | 9fd8b2c8c714b383b6768d53d7b46682fdf87013 (patch) | |
| tree | 47d9b59ac1129e9bf71a065d5f3c526d1ada15a5 /arch/x86/lib/init_helpers.c | |
| parent | 188f0109055300a099f90bedd96b0e93d28acfbd (diff) | |
| parent | dbaec467671fd5b56cf380121340844863f5472d (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- Enable SD slot on Intel Edison
- Populate CSRT ACPI table for shared DMA controller on Intel Tangier
- Convert Intel ICH-SPI driver to use new spi-mem ops
- Enable config_distro_bootcmd for QEMU x86
- Support U-Boot as a payload for Intel Slim Bootloader
- Avoid writing temporary asl files into the source tree which fixes the
parallel build issue occasionally seen
Diffstat (limited to 'arch/x86/lib/init_helpers.c')
| -rw-r--r-- | arch/x86/lib/init_helpers.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c index 0481f453ca..5e19f13720 100644 --- a/arch/x86/lib/init_helpers.c +++ b/arch/x86/lib/init_helpers.c @@ -18,7 +18,8 @@ __weak ulong board_get_usable_ram_top(ulong total_size) int init_cache_f_r(void) { -#if CONFIG_IS_ENABLED(X86_32BIT_INIT) && !defined(CONFIG_HAVE_FSP) +#if CONFIG_IS_ENABLED(X86_32BIT_INIT) && !defined(CONFIG_HAVE_FSP) && \ + !defined(CONFIG_SYS_SLIMBOOTLOADER) int ret; ret = mtrr_commit(false); |