Merge branch 'master' of git://git.denx.de/u-boot-spi

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

diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index b72f4920d90e4ded851b9a53029b581e54654f5c..e30c428a442e2d6ba061ff9017d53a903b3326df 100644 (file)
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -152,6 +152,9 @@
 #define CONFIG_SYS_CONSOLE_INFO_QUIET
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
 
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
+#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+
 /* Tizen - partitions definitions */
 #define PARTS_CSA              "csa"
 #define PARTS_BOOT             "boot"
@@ -183,7 +186,11 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "bootk=" \
-               "run loaddtb; run loaduimage; bootm 0x40007FC0 - ${fdtaddr}\0" \
+               "run loaduimage;" \
+               "if run loaddtb; then " \
+                       "bootm 0x40007FC0 - ${fdtaddr};" \
+               "fi;" \
+               "bootm 0x40007FC0;\0" \
        "updatemmc=" \
                "mmc boot 0 1 1 1; mmc write 0x42008000 0 0x200;" \
                "mmc boot 0 1 1 0\0" \
@@ -197,7 +204,7 @@
        "mmcboot=" \
                "setenv bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart} " \
                "${lpj} rootwait ${console} ${meminfo} ${opts} ${lcdinfo}; " \
-               "run loaddtb; run loaduimage; bootm 0x40007FC0 - ${fdtaddr}\0" \
+               "run bootk\0" \
        "bootchart=set opts init=/sbin/bootchartd; run bootcmd\0" \
        "boottrace=setenv opts initcall_debug; run bootcmd\0" \
        "verify=n\0" \
@@ -238,7 +245,6 @@
                   "setenv spl_imgaddr;" \
                   "setenv spl_addr_tmp;\0" \
        "fdtaddr=40800000\0" \
-       "fdtfile=exynos4412-trats2.dtb\0"
 
 /*
  * Miscellaneous configurable options