sizes.h - consolidate for all architectures

[platform/kernel/u-boot.git] / include / configs / trats.h

diff --git a/include/configs/trats.h b/include/configs/trats.h
index 6e14a59..7cea259 100644 (file)
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -51,7 +51,7 @@
 #define MACH_TYPE_TRATS                        3928
 #define CONFIG_MACH_TYPE               MACH_TYPE_TRATS
 
-#include <asm/sizes.h>
+#include <linux/sizes.h>
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + (80 * SZ_1M))
 
@@ -159,7 +159,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 0 0x42008000 0 0x200;" \
                "mmc boot 0 1 1 0\0" \
@@ -182,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" \
@@ -221,7 +225,6 @@
                   "setenv spl_imgaddr;" \
                   "setenv spl_addr_tmp;\0" \
        "fdtaddr=40800000\0" \
-       "fdtfile=exynos4210-trats.dtb\0"
 
 
 /* Miscellaneous configurable options */