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
diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index 85cf4aa..53d449c 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 @@
#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