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 'master' of git://git.denx.de/u-boot
[platform/kernel/u-boot.git]
/
include
/
configs
/
trats.h
diff --git
a/include/configs/trats.h
b/include/configs/trats.h
index
84c71ce
..
b21ea2d
100644
(file)
--- a/
include/configs/trats.h
+++ b/
include/configs/trats.h
@@
-10,14
+10,12
@@
#ifndef __CONFIG_TRATS_H
#define __CONFIG_TRATS_H
#ifndef __CONFIG_TRATS_H
#define __CONFIG_TRATS_H
-#include <configs/exynos4-
dt
.h>
+#include <configs/exynos4-
common
.h>
#define CONFIG_SYS_PROMPT "Trats # " /* Monitor Command Prompt */
#define CONFIG_TRATS
#define CONFIG_SYS_PROMPT "Trats # " /* Monitor Command Prompt */
#define CONFIG_TRATS
-#undef CONFIG_DEFAULT_DEVICE_TREE
-#define CONFIG_DEFAULT_DEVICE_TREE exynos4210-trats
#define CONFIG_TIZEN /* TIZEN lib */
#define CONFIG_TIZEN /* TIZEN lib */
@@
-41,10
+39,6
@@
#define CONFIG_SYS_TEXT_BASE 0x63300000
#define CONFIG_SYS_TEXT_BASE 0x63300000
-#include <linux/sizes.h>
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (80 * SZ_1M))
-
/* select serial console configuration */
#define CONFIG_SERIAL2
#define CONFIG_BAUDRATE 115200
/* select serial console configuration */
#define CONFIG_SERIAL2
#define CONFIG_BAUDRATE 115200
@@
-59,7
+53,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)
@@
-101,10
+95,10
@@
"name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \
#define CONFIG_DFU_ALT \
"name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \
#define CONFIG_DFU_ALT \
- "u-boot
mmc 80
400;" \
- "uImage ext4 0 2;" \
- "modem.bin ext4 0 2;" \
- "exynos4210-trats.dtb ext4 0 2;" \
+ "u-boot
raw 0x80 0x
400;" \
+ "
/
uImage ext4 0 2;" \
+ "
/
modem.bin ext4 0 2;" \
+ "
/
exynos4210-trats.dtb ext4 0 2;" \
""PARTS_CSA" part 0 1;" \
""PARTS_BOOT" part 0 2;" \
""PARTS_QBOOT" part 0 3;" \
""PARTS_CSA" part 0 1;" \
""PARTS_BOOT" part 0 2;" \
""PARTS_QBOOT" part 0 3;" \
@@
-112,7
+106,7
@@
""PARTS_ROOT" part 0 5;" \
""PARTS_DATA" part 0 6;" \
""PARTS_UMS" part 0 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=" \
#define CONFIG_EXTRA_ENV_SETTINGS \
"bootk=" \
@@
-121,12
+115,9
@@
"bootm 0x40007FC0 - ${fdtaddr};" \
"fi;" \
"bootm 0x40007FC0;\0" \
"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" \
"updatebackup=" \
"updatebackup=" \
- "mmc
boot 0 1 1
2; mmc write 0 0x42100000 0 0x200;" \
- "mmc
boot 0 1 1
0\0" \
+ "mmc
dev 0
2; mmc write 0 0x42100000 0 0x200;" \
+ "mmc
dev 0
0\0" \
"updatebootb=" \
"mmc read 0 0x42100000 0x80 0x200; run updatebackup\0" \
"lpj=lpj=3981312\0" \
"updatebootb=" \
"mmc read 0 0x42100000 0x80 0x200; run updatebackup\0" \
"lpj=lpj=3981312\0" \
@@
-187,6
+178,9
@@
#define CONFIG_CMD_SPL
#define CONFIG_SYS_SPL_ARGS_ADDR CONFIG_SYS_SDRAM_BASE + 0x100
#define CONFIG_CMD_SPL
#define CONFIG_SYS_SPL_ARGS_ADDR CONFIG_SYS_SDRAM_BASE + 0x100
+/* GPT */
+#define CONFIG_RANDOM_UUID
+
/* I2C */
#include <asm/arch/gpio.h>
/* I2C */
#include <asm/arch/gpio.h>
@@
-204,8
+198,8
@@
#define CONFIG_SYS_I2C_INIT_BOARD
/* I2C FG */
#define CONFIG_SYS_I2C_INIT_BOARD
/* I2C FG */
-#define CONFIG_SOFT_I2C_GPIO_SCL
exynos4_gpio_get(2, y4, 1)
-#define CONFIG_SOFT_I2C_GPIO_SDA
exynos4_gpio_get(2, y4, 0)
+#define CONFIG_SOFT_I2C_GPIO_SCL
EXYNOS4_GPIO_Y41
+#define CONFIG_SOFT_I2C_GPIO_SDA
EXYNOS4_GPIO_Y40
/* POWER */
#define CONFIG_POWER
/* POWER */
#define CONFIG_POWER
@@
-219,6
+213,10
@@
#define CONFIG_POWER_BATTERY
#define CONFIG_POWER_BATTERY_TRATS
#define CONFIG_POWER_BATTERY
#define CONFIG_POWER_BATTERY_TRATS
+/* Security subsystem - enable hw_rand() */
+#define CONFIG_EXYNOS_ACE_SHA
+#define CONFIG_LIB_HW_RAND
+
/* Common misc for Samsung */
#define CONFIG_MISC_COMMON
/* Common misc for Samsung */
#define CONFIG_MISC_COMMON
@@
-238,8
+236,8
@@
#define KEY_PWR_INTERRUPT_REG MAX8997_REG_INT1
#define KEY_PWR_INTERRUPT_MASK (1 << 0)
#define KEY_PWR_INTERRUPT_REG MAX8997_REG_INT1
#define KEY_PWR_INTERRUPT_MASK (1 << 0)
-#define KEY_VOL_UP_GPIO
exynos4_gpio_get(2, x2, 0)
-#define KEY_VOL_DOWN_GPIO
exynos4_gpio_get(2, x2, 1)
+#define KEY_VOL_UP_GPIO
EXYNOS4_GPIO_X20
+#define KEY_VOL_DOWN_GPIO
EXYNOS4_GPIO_X21
#endif /* __ASSEMBLY__ */
/* LCD console */
#endif /* __ASSEMBLY__ */
/* LCD console */
@@
-257,7
+255,4
@@
#define CONFIG_VIDEO_BMP_GZIP
#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE ((500 * 160 * 4) + 54)
#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 */
#endif /* __CONFIG_H */