diff options
| author | Tom Rini <trini@konsulko.com> | 2019-06-22 12:09:33 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-06-22 12:09:33 -0400 |
| commit | 5eea874b5e989e62519824ad140aa086432d01ee (patch) | |
| tree | 0d6a3538406d23917874a9087c896b7ff809d91c /arch/x86 | |
| parent | bdf97b5d393fc94666a847e9bac1c358b2c63c59 (diff) | |
| parent | c974a3d1550557f246c98480083651c0a502e7e7 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- boot failure fix for Intel edison
- tangier wdt conversion to driver model
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/cpu/tangier/Kconfig | 1 | ||||
| -rw-r--r-- | arch/x86/dts/edison.dts | 4 | ||||
| -rw-r--r-- | arch/x86/lib/init_helpers.c | 5 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/cpu/tangier/Kconfig b/arch/x86/cpu/tangier/Kconfig index a3bd16799d..d2b7edecd6 100644 --- a/arch/x86/cpu/tangier/Kconfig +++ b/arch/x86/cpu/tangier/Kconfig @@ -10,7 +10,6 @@ config INTEL_TANGIER imply MMC_SDHCI imply MMC_SDHCI_SDMA imply MMC_SDHCI_TANGIER - imply TANGIER_WATCHDOG imply USB imply USB_DWC3 diff --git a/arch/x86/dts/edison.dts b/arch/x86/dts/edison.dts index e8564bbb8a..c0487656d3 100644 --- a/arch/x86/dts/edison.dts +++ b/arch/x86/dts/edison.dts @@ -104,6 +104,10 @@ reg = <0xff009000 0x1000>; }; + watchdog: wdt@0 { + compatible = "intel,tangier-wdt"; + }; + reset { compatible = "intel,reset-tangier"; u-boot,dm-pre-reloc; diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c index ac85278cdf..0481f453ca 100644 --- a/arch/x86/lib/init_helpers.c +++ b/arch/x86/lib/init_helpers.c @@ -18,10 +18,7 @@ __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_SPL_BUILD) && \ - !CONFIG_IS_ENABLED(CONFIG_X86_RUN_64BIT))) && \ - !defined(CONFIG_HAVE_FSP) +#if CONFIG_IS_ENABLED(X86_32BIT_INIT) && !defined(CONFIG_HAVE_FSP) int ret; ret = mtrr_commit(false); |