Merge remote-tracking branch 'u-boot-imx/master'

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

diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index 14def7d16e8f2bbcd79532178f46c41addd5a23b..e9a04f7af3b2f6a72e1d6f8d7db4aa661ff1b290 100644 (file)
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -15,8 +15,6 @@
 
 #define CONFIG_SYS_PROMPT      "Trats2 # "     /* Monitor Command Prompt */
 
-#undef CONFIG_DEFAULT_DEVICE_TREE
-#define CONFIG_DEFAULT_DEVICE_TREE     exynos4412-trats2
 
 #define CONFIG_TIZEN                   /* TIZEN lib */
 
@@ -52,7 +50,7 @@
 
 #define CONFIG_BOOTARGS                        "Please use defined boot"
 #define CONFIG_BOOTCOMMAND             "run mmcboot"
-#define CONFIG_DEFAULT_CONSOLE         "console=ttySAC1,115200n8\0"
+#define CONFIG_DEFAULT_CONSOLE         "console=ttySAC2,115200n8\0"
 
 #define CONFIG_SYS_INIT_SP_ADDR        (CONFIG_SYS_LOAD_ADDR \
                                        - GENERATED_GBL_DATA_SIZE)
@@ -92,9 +90,9 @@
 
 #define CONFIG_DFU_ALT \
        "u-boot raw 0x80 0x800;" \
-       "uImage ext4 0 2;" \
-       "modem.bin ext4 0 2;" \
-       "exynos4412-trats2.dtb ext4 0 2;" \
+       "/uImage ext4 0 2;" \
+       "/modem.bin ext4 0 2;" \
+       "/exynos4412-trats2.dtb ext4 0 2;" \
        ""PARTS_CSA" part 0 1;" \
        ""PARTS_BOOT" part 0 2;" \
        ""PARTS_QBOOT" part 0 3;" \
@@ -111,16 +109,11 @@
                        "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" \
        "updatebackup=" \
-               "mmc boot 0 1 1 2; mmc write 0x42100000 0 0x200;" \
-               " mmc boot 0 1 1 0\0" \
+               "mmc dev 0 2; mmc write 0x51000000 0 0x800;" \
+               " mmc dev 0 0\0" \
        "updatebootb=" \
-               "mmc read 0x51000000 0x80 0x200; run updatebackup\0" \
-       "updateuboot=" \
-               "mmc write 0x50000000 0x80 0x400\0" \
+               "mmc read 0x51000000 0x80 0x800; run updatebackup\0" \
        "mmcboot=" \
                "setenv bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart} " \
                "${lpj} rootwait ${console} ${meminfo} ${opts} ${lcdinfo}; " \
@@ -227,8 +220,8 @@ int get_soft_i2c_sda_pin(void);
 #define KEY_PWR_INTERRUPT_REG          MAX77686_REG_PMIC_INT1
 #define KEY_PWR_INTERRUPT_MASK         (1 << 1)
 
-#define KEY_VOL_UP_GPIO                        exynos4x12_gpio_get(2, x2, 2)
-#define KEY_VOL_DOWN_GPIO              exynos4x12_gpio_get(2, x3, 3)
+#define KEY_VOL_UP_GPIO                        EXYNOS4X12_GPIO_X22
+#define KEY_VOL_DOWN_GPIO              EXYNOS4X12_GPIO_X33
 #endif /* __ASSEMBLY__ */
 
 /* LCD console */
@@ -246,7 +239,4 @@ int get_soft_i2c_sda_pin(void);
 #define CONFIG_VIDEO_BMP_GZIP
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE ((500 * 160 * 4) + 54)
 
-#define LCD_XRES       720
-#define LCD_YRES       1280
-
 #endif /* __CONFIG_H */