diff options
| author | Tom Rini <trini@konsulko.com> | 2019-06-20 09:14:35 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-06-20 09:14:35 -0400 |
| commit | f643fb9f4c8fc5c5dceb8c2c2893447d18413d77 (patch) | |
| tree | 9b77dd853b6027698069c5882a237778ad69e576 /arch/powerpc/cpu/mpc85xx/pci.c | |
| parent | e8c185bb15f7e362f0d77e042b6811966917a6b7 (diff) | |
| parent | 70833d530e3b9a776c5127487c7d3c1a1bb238cc (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-mpc85xx
- PCIe driver change to support DM model
- T2080QDS migrated to use PCIe DM model
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/pci.c')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/pci.c b/arch/powerpc/cpu/mpc85xx/pci.c index 90ccc3427c7..1d0213a513c 100644 --- a/arch/powerpc/cpu/mpc85xx/pci.c +++ b/arch/powerpc/cpu/mpc85xx/pci.c @@ -12,7 +12,7 @@ #include <asm/cpm_85xx.h> #include <pci.h> -#if !defined(CONFIG_FSL_PCI_INIT) +#if !defined(CONFIG_FSL_PCI_INIT) && !defined(CONFIG_DM_PCI) #ifndef CONFIG_SYS_PCI1_MEM_BUS #define CONFIG_SYS_PCI1_MEM_BUS CONFIG_SYS_PCI1_MEM_BASE |