diff options
| author | Tom Rini <trini@konsulko.com> | 2016-10-12 12:29:42 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-12 12:29:42 (GMT) |
| commit | 711b534120c0a5f73cdb9a25eb91f9aa0c5e09ab (patch) | |
| tree | 4982ebe5c4ed6d1e28e110f17f2ca09e388d9ba1 /include/configs/ls2080a_common.h | |
| parent | 8435179271106ec6fe9a9a5679b897755b1db8dd (diff) | |
| parent | 76379dfb7e7e5092f32c79897bb58c19979e576b (diff) | |
| download | u-boot-711b534120c0a5f73cdb9a25eb91f9aa0c5e09ab.tar.xz | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
include/configs/ls1021aqds.h
include/configs/ls1021atwr.h
Diffstat (limited to 'include/configs/ls2080a_common.h')
| -rw-r--r-- | include/configs/ls2080a_common.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 5576279..2cae966 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -9,16 +9,12 @@ #define CONFIG_REMAKE_ELF #define CONFIG_FSL_LAYERSCAPE -#define CONFIG_FSL_LSCH3 #define CONFIG_MP #define CONFIG_GICV3 #define CONFIG_FSL_TZPC_BP147 #include <asm/arch/ls2080a_stream_id.h> #include <asm/arch/config.h> -#if (defined(CONFIG_SYS_FSL_SRDS_1) || defined(CONFIG_SYS_FSL_SRDS_2)) -#define CONFIG_SYS_HAS_SERDES -#endif /* Link Definitions */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_FSL_OCRAM_BASE + 0xfff0) @@ -50,7 +46,6 @@ #define CONFIG_FSL_DDR_INTERACTIVE /* Interactive debugging */ #endif #ifndef CONFIG_SYS_FSL_DDR4 -#define CONFIG_SYS_FSL_DDR3 /* Use DDR3 memory */ #define CONFIG_SYS_DDR_RAW_TIMING #endif |