diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-04-08 09:25:08 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-04-08 09:25:08 +0200 |
| commit | 519fdde9e6a6ebce7dc743b4f5621503d25b7a45 (patch) | |
| tree | 29649f48b92b92342183f71565c34afeca0b1735 /include/configs/trats2.h | |
| parent | c71645ad2bd5179ad21e2501c26f574e9688f02a (diff) | |
| parent | 04d2f0a9f33112bd70ce4d9c451fdca1682e3a59 (diff) | |
| download | blackbird-obmc-uboot-519fdde9e6a6ebce7dc743b4f5621503d25b7a45.tar.gz blackbird-obmc-uboot-519fdde9e6a6ebce7dc743b4f5621503d25b7a45.zip | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts:
arch/arm/cpu/arm926ejs/mxs/Makefile
include/configs/trats.h
include/configs/trats2.h
include/mmc.h
Diffstat (limited to 'include/configs/trats2.h')
| -rw-r--r-- | include/configs/trats2.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/configs/trats2.h b/include/configs/trats2.h index 85cf4aadc5..53d449c291 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -166,6 +166,9 @@ "setenv spl_addr_tmp;\0" \ "fdtaddr=40800000\0" \ +/* GPT */ +#define CONFIG_RANDOM_UUID + /* I2C */ #include <asm/arch/gpio.h> @@ -201,6 +204,10 @@ int get_soft_i2c_sda_pin(void); #define CONFIG_POWER_FG_MAX77693 #define CONFIG_POWER_BATTERY_TRATS2 +/* Security subsystem - enable hw_rand() */ +#define CONFIG_EXYNOS_ACE_SHA +#define CONFIG_LIB_HW_RAND + /* Common misc for Samsung */ #define CONFIG_MISC_COMMON |
