diff options
author | Tom Rini <trini@konsulko.com> | 2017-02-04 04:33:42 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-02-04 04:33:42 +0300 |
commit | c83a824e62277162ad35f52879b2316902c0eff5 (patch) | |
tree | fa91cdcda24b8822d0f1e52786b2657e4d68be27 /include/configs/MPC8569MDS.h | |
parent | 0ff27d4a94637d4b1937c625d33212375bd118d9 (diff) | |
parent | add63f94a9c3bbe1af3fdf3f4c56a5185a4c0504 (diff) | |
download | u-boot-c83a824e62277162ad35f52879b2316902c0eff5.tar.xz |
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/MPC8569MDS.h')
-rw-r--r-- | include/configs/MPC8569MDS.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index caa52bec00..91e17d9399 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -10,8 +10,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_FSL_ELBC 1 /* Has Enhance localbus controller */ - #define CONFIG_SYS_SRIO #define CONFIG_SRIO1 /* SRIO port 1 */ |