Merge branch 'u-boot/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / include / configs / trats2.h

diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index 823a8ae66dfa8982ced83528d202e18e1caec28c..53d449c291a05d4c105387d6a54b6645438365bf 100644 (file)
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -36,7 +36,7 @@
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_SDRAM_BASE + 0x5E00000)
 #define CONFIG_SYS_LOAD_ADDR           (CONFIG_SYS_SDRAM_BASE + 0x3E00000)
 
-#define CONFIG_SYS_TEXT_BASE           0x78100000
+#define CONFIG_SYS_TEXT_BASE           0x43e00000
 
 #include <linux/sizes.h>
 /* Size of malloc() pool */
@@ -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