diff options
| author | Tom Rini | 2017-02-03 20:33:42 -0500 |
|---|---|---|
| committer | Tom Rini | 2017-02-03 20:33:42 -0500 |
| commit | c83a824e62277162ad35f52879b2316902c0eff5 (patch) | |
| tree | fa91cdcda24b8822d0f1e52786b2657e4d68be27 /include/configs/p1_twr.h | |
| parent | 0ff27d4a94637d4b1937c625d33212375bd118d9 (diff) | |
| parent | add63f94a9c3bbe1af3fdf3f4c56a5185a4c0504 (diff) | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
configs/ls1046aqds_defconfig
configs/ls1046aqds_nand_defconfig
configs/ls1046aqds_qspi_defconfig
configs/ls1046aqds_sdcard_ifc_defconfig
configs/ls1046aqds_sdcard_qspi_defconfig
configs/ls1046ardb_emmc_defconfig
configs/ls1046ardb_qspi_defconfig
configs/ls1046ardb_sdcard_defconfig
Diffstat (limited to 'include/configs/p1_twr.h')
| -rw-r--r-- | include/configs/p1_twr.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index a98e1b2b17f..d403f846177 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -40,7 +40,6 @@ #define CONFIG_MP -#define CONFIG_FSL_ELBC #define CONFIG_PCIE1 /* PCIE controller 1 (slot 1) */ #define CONFIG_PCIE2 /* PCIE controller 2 (slot 2) */ #define CONFIG_FSL_PCI_INIT /* Use common FSL init code */ |