Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / include / configs / trats2.h

diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index 6a4604ce938c56c2beff3448374e13d29c58e8be..95c011f9a90558ce73b0ad0d945fe661fd278d11 100644 (file)
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -38,7 +38,6 @@
 
 /* Console configuration */
 
-#define CONFIG_BOOTARGS                        "Please use defined boot"
 #define CONFIG_BOOTCOMMAND             "run autoboot"
 #define CONFIG_DEFAULT_CONSOLE         "console=ttySAC2,115200n8\0"
 
@@ -49,7 +48,6 @@
 
 #define CONFIG_SYS_MONITOR_BASE        0x00000000
 
-#define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV         CONFIG_MMC_DEFAULT_DEV
 #define CONFIG_ENV_SIZE                        4096
 #define CONFIG_ENV_OFFSET              ((32 - 4) << 10) /* 32KiB - 4KiB */
@@ -152,7 +150,6 @@
        "fdtaddr=40800000\0" \
 
 /* GPT */
-#define CONFIG_RANDOM_UUID
 
 /* Security subsystem - enable hw_rand() */
 #define CONFIG_EXYNOS_ACE_SHA
@@ -169,7 +166,6 @@
 
 /* Download menu - definitions for check keys */
 #ifndef __ASSEMBLY__
-#include <power/max77686_pmic.h>
 
 #define KEY_PWR_PMIC_NAME              "MAX77686_PMIC"
 #define KEY_PWR_STATUS_REG             MAX77686_REG_PMIC_STATUS1