diff options
| author | Tom Rini <trini@konsulko.com> | 2015-05-30 20:16:01 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-05-30 20:16:01 -0400 |
| commit | 43b1ff5f33456e85b2fccccaf2f9fe09821a45ac (patch) | |
| tree | 0e75720408e20f807f250c7cf862c780f2a68b41 /include/configs | |
| parent | b1f7ecc9b5f0ce07691f6804f436fcaa2a377b26 (diff) | |
| parent | fcb2525d373f7a5bab213e8a89681bd3b7d09c44 (diff) | |
| download | talos-obmc-uboot-43b1ff5f33456e85b2fccccaf2f9fe09821a45ac.tar.gz talos-obmc-uboot-43b1ff5f33456e85b2fccccaf2f9fe09821a45ac.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/uniphier.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 331df6251a..850083c110 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -1,7 +1,5 @@ /* - * Copyright (C) 2012-2015 Panasonic Corporation - * Copyright (C) 2015 Socionext Inc. - * Author: Masahiro Yamada <yamada.masahiro@socionext.com> + * Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com> * * SPDX-License-Identifier: GPL-2.0+ */ @@ -252,6 +250,8 @@ /* Open Firmware flat tree */ #define CONFIG_OF_LIBFDT +#define CONFIG_LIB_RAND + #define CONFIG_HAVE_ARM_SECURE /* Memory Size & Mapping */ @@ -266,8 +266,6 @@ #define CONFIG_SYS_SDRAM_SIZE (CONFIG_SDRAM0_SIZE) #endif -#define CONFIG_SYS_TEXT_BASE 0x84000000 - #if defined(CONFIG_MACH_PH1_LD4) || defined(CONFIG_MACH_PH1_SLD8) #define CONFIG_SPL_TEXT_BASE 0x00040000 #endif |
