projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
[platform/kernel/u-boot.git]
/
include
/
configs
/
trats2.h
diff --git
a/include/configs/trats2.h
b/include/configs/trats2.h
index
14def7d
..
206975b
100644
(file)
--- a/
include/configs/trats2.h
+++ b/
include/configs/trats2.h
@@
-52,7
+52,7
@@
#define CONFIG_BOOTARGS "Please use defined boot"
#define CONFIG_BOOTCOMMAND "run mmcboot"
#define CONFIG_BOOTARGS "Please use defined boot"
#define CONFIG_BOOTCOMMAND "run mmcboot"
-#define CONFIG_DEFAULT_CONSOLE "console=ttySAC
1
,115200n8\0"
+#define CONFIG_DEFAULT_CONSOLE "console=ttySAC
2
,115200n8\0"
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \
- GENERATED_GBL_DATA_SIZE)
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \
- GENERATED_GBL_DATA_SIZE)
@@
-111,16
+111,11
@@
"bootm 0x40007FC0 - ${fdtaddr};" \
"fi;" \
"bootm 0x40007FC0;\0" \
"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=" \
"updatebackup=" \
- "mmc
boot 0 1 1 2; mmc write 0x42100000 0 0x2
00;" \
- " mmc
boot 0 1 1
0\0" \
+ "mmc
dev 0 2; mmc write 0x51000000 0 0x8
00;" \
+ " mmc
dev 0
0\0" \
"updatebootb=" \
"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}; " \
"mmcboot=" \
"setenv bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart} " \
"${lpj} rootwait ${console} ${meminfo} ${opts} ${lcdinfo}; " \
@@
-227,8
+222,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_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 */
#endif /* __ASSEMBLY__ */
/* LCD console */