summaryrefslogtreecommitdiff
path: root/include/configs/trats.h
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-04-08 09:25:08 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-04-08 09:25:08 +0200
commit519fdde9e6a6ebce7dc743b4f5621503d25b7a45 (patch)
tree29649f48b92b92342183f71565c34afeca0b1735 /include/configs/trats.h
parentc71645ad2bd5179ad21e2501c26f574e9688f02a (diff)
parent04d2f0a9f33112bd70ce4d9c451fdca1682e3a59 (diff)
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/trats.h')
-rw-r--r--include/configs/trats.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/configs/trats.h b/include/configs/trats.h
index 84c71ced466..5d8bd605836 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -187,6 +187,9 @@
#define CONFIG_CMD_SPL
#define CONFIG_SYS_SPL_ARGS_ADDR CONFIG_SYS_SDRAM_BASE + 0x100
+/* GPT */
+#define CONFIG_RANDOM_UUID
+
/* I2C */
#include <asm/arch/gpio.h>
@@ -219,6 +222,10 @@
#define CONFIG_POWER_BATTERY
#define CONFIG_POWER_BATTERY_TRATS
+/* Security subsystem - enable hw_rand() */
+#define CONFIG_EXYNOS_ACE_SHA
+#define CONFIG_LIB_HW_RAND
+
/* Common misc for Samsung */
#define CONFIG_MISC_COMMON