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

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

diff --git a/include/configs/trats.h b/include/configs/trats.h
index a623371cd17b6e3572224630dfff9642653e04e8..718107ac9f0dd61031eea5273d5d9ce7f5f63429 100644 (file)
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -147,15 +147,23 @@
        ""PARTS_BOOT" part 0 2;" \
        ""PARTS_ROOT" part 0 5;" \
        ""PARTS_DATA" part 0 6;" \
-       ""PARTS_UMS" part 0 7\0"
+       ""PARTS_UMS" part 0 7;" \
+       "params.bin mmc 0x38 0x8\0"
 
 #define CONFIG_ENV_OVERWRITE
 #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
+
 #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 0 0x42008000 0 0x200;" \
                "mmc boot 0 1 1 0\0" \
@@ -178,7 +186,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=setenv opts init=/sbin/bootchartd; run bootcmd\0" \
        "boottrace=setenv opts initcall_debug; run bootcmd\0" \
        "mmcoops=mmc read 0 0x40000000 0x40 8; md 0x40000000 0x400\0" \
@@ -217,7 +225,6 @@
                   "setenv spl_imgaddr;" \
                   "setenv spl_addr_tmp;\0" \
        "fdtaddr=40800000\0" \
-       "fdtfile=exynos4210-trats.dtb\0"
 
 
 /* Miscellaneous configurable options */