diff options
| author | Tom Rini <trini@konsulko.com> | 2017-08-21 07:16:16 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-21 07:16:16 -0400 |
| commit | 8197d92843952b376915fdbcbf67c723feab1532 (patch) | |
| tree | da0c744f5254b549498293dc2e148c59af0b9f8d /include | |
| parent | 2d7cb5b426e7e0cdf684d7f8029ad132d7a8d383 (diff) | |
| parent | 3444d1d40e9ee42ba7423f4fa6651703a8666bc1 (diff) | |
Merge git://git.denx.de/u-boot-uniphier
- Fix unmet direct dependencies warning
- Remove old sLD3 SoC support
- Update reset data
- Add dr_mode DT property to avoid warning
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/uniphier.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 6f5313931a..9a64063c3e 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -88,13 +88,8 @@ #define CONFIG_NAND_DENALI_ECC_SIZE 1024 -#ifdef CONFIG_ARCH_UNIPHIER_SLD3 -#define CONFIG_SYS_NAND_REGS_BASE 0xf8100000 -#define CONFIG_SYS_NAND_DATA_BASE 0xf8000000 -#else #define CONFIG_SYS_NAND_REGS_BASE 0x68100000 #define CONFIG_SYS_NAND_DATA_BASE 0x68000000 -#endif #define CONFIG_SYS_NAND_BASE (CONFIG_SYS_NAND_DATA_BASE + 0x10) @@ -249,8 +244,7 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE) /* only for SPL */ -#if defined(CONFIG_ARCH_UNIPHIER_SLD3) || \ - defined(CONFIG_ARCH_UNIPHIER_LD4) || \ +#if defined(CONFIG_ARCH_UNIPHIER_LD4) || \ defined(CONFIG_ARCH_UNIPHIER_SLD8) #define CONFIG_SPL_TEXT_BASE 0x00040000 #else |