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 30a4b8cd8dad5ea605b9aa866a9dce60c73c599e..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 */
 
@@ -91,10 +89,10 @@
        "name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \
 
 #define CONFIG_DFU_ALT \
-       "u-boot mmc 80 800;" \
-       "uImage ext4 0 2;" \
-       "modem.bin ext4 0 2;" \
-       "exynos4412-trats2.dtb ext4 0 2;" \
+       "u-boot raw 0x80 0x800;" \
+       "/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;" \
@@ -102,7 +100,7 @@
        ""PARTS_ROOT" part 0 5;" \
        ""PARTS_DATA" part 0 6;" \
        ""PARTS_UMS" part 0 7;" \
-       "params.bin mmc 0x38 0x8\0"
+       "params.bin raw 0x38 0x8\0"
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "bootk=" \
@@ -222,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 */
@@ -241,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 */