diff options
| author | Tom Rini <trini@konsulko.com> | 2019-06-11 13:41:24 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-06-11 13:41:24 -0400 |
| commit | 529faf80c339b78bd361b59735664f2605322b8e (patch) | |
| tree | 2186ebe6f8f713d0dd497eb9d20c1a30e64105bb /arch/arm/mach-imx/cpu.c | |
| parent | 68b90e57bc034e237923b02acb633dc4e91d44cb (diff) | |
| parent | 23612534fe0fe426716ee9cb5cfeb74a456cb891 (diff) | |
Merge tag 'u-boot-imx-20190612' of git://git.denx.de/u-boot-imx
u-boot-imx-20190612
--------------------
- Board fixes:
- imx6logic
- wandboard
- mx6sabre boots again
- imx8qm_mek
- pico-* boards
- Toradex apalis / colibri
- engicam imx6 (environment)
- KP MX53
- opos6ul
- Switch to DM:
- vining2000
- dh MX6
- Toradex colibri i.MX7
- Novena
- Security : fix CSF size for HAB
- Other:
- imx: fix building for i.mx8 without spl
- pcie and switch to DM
mx6sabreauto: Enable SPL SDP support
Diffstat (limited to 'arch/arm/mach-imx/cpu.c')
| -rw-r--r-- | arch/arm/mach-imx/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c index 64a0670fcf..d62ff6ef25 100644 --- a/arch/arm/mach-imx/cpu.c +++ b/arch/arm/mach-imx/cpu.c @@ -285,7 +285,7 @@ u32 get_ahb_clk(void) void arch_preboot_os(void) { -#if defined(CONFIG_PCIE_IMX) +#if defined(CONFIG_PCIE_IMX) && !CONFIG_IS_ENABLED(DM_PCI) imx_pcie_remove(); #endif #if defined(CONFIG_SATA) |