projects
/
oweals
/
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-i2c
[oweals/u-boot.git]
/
include
/
configs
/
galaxy5200.h
diff --git
a/include/configs/galaxy5200.h
b/include/configs/galaxy5200.h
index 8d530d86aa16d2c76538cd5224c9baf9b8d526b9..29951f7f122090953b0a3a0f6f383b568ce2e362 100644
(file)
--- a/
include/configs/galaxy5200.h
+++ b/
include/configs/galaxy5200.h
@@
-88,15
+88,21
@@
/*
* Autobooting
*/
/*
* Autobooting
*/
-#define CONFIG_BOOTDELAY
3 /* autoboot after 3
seconds */
+#define CONFIG_BOOTDELAY
10 /* autoboot after 10
seconds */
#define CONFIG_ZERO_BOOTDELAY_CHECK /* allow stopping of boot process */
/* even with bootdelay=0 */
#define CONFIG_ZERO_BOOTDELAY_CHECK /* allow stopping of boot process */
/* even with bootdelay=0 */
-#undef CONFIG_BOOTARGS
+#define CONFIG_BOOT_RETRY_TIME 120 /* Reset if no command is entered */
+#define CONFIG_RESET_TO_RETRY
#define CONFIG_PREBOOT "echo;" \
"echo Welcome to U-Boot;"\
"echo"
#define CONFIG_PREBOOT "echo;" \
"echo Welcome to U-Boot;"\
"echo"
+#define CONFIG_BOOTCOMMAND "go ff300004 0; go ff300004 2 2;" \
+ "bootm ff040000 ff900000 fffc0000"
+#define CONFIG_BOOTARGS "console=ttyPSC0,115200"
+#define CONFIG_EXTRA_ENV_SETTINGS "epson=yes\0"
+
/*
* IPB Bus clocking configuration.
*/
/*
* IPB Bus clocking configuration.
*/
@@
-110,6
+116,7
@@
#define CONFIG_SYS_I2C_MODULE 2 /* Select I2C module #1 or #2 */
#define CONFIG_SYS_I2C_SPEED 100000 /* 100 kHz */
#define CONFIG_SYS_I2C_SLAVE 0x7F
#define CONFIG_SYS_I2C_MODULE 2 /* Select I2C module #1 or #2 */
#define CONFIG_SYS_I2C_SPEED 100000 /* 100 kHz */
#define CONFIG_SYS_I2C_SLAVE 0x7F
+#define CONFIG_SYS_I2C_INIT_MPC5XXX /* Reset devices on i2c bus */
/*
* EEPROM CAT24WC32 configuration
/*
* EEPROM CAT24WC32 configuration
@@
-134,7
+141,7
@@
#define CONFIG_SYS_FLASH_BASE 0xfe000000
/*
#define CONFIG_SYS_FLASH_BASE 0xfe000000
/*
- * The flash size is autoconfigured, but cpu/mpc5xxx/cpu_init.c needs this
+ * The flash size is autoconfigured, but
arch/powerpc/
cpu/mpc5xxx/cpu_init.c needs this
* variable defined
*/
#define CONFIG_SYS_FLASH_SIZE 0x02000000
* variable defined
*/
#define CONFIG_SYS_FLASH_SIZE 0x02000000
@@
-209,7
+216,12
@@
/* Chip Select configuration for NAND flash */
#define CONFIG_SYS_CS1_START 0x20000000
#define CONFIG_SYS_CS1_SIZE 0x90000
/* Chip Select configuration for NAND flash */
#define CONFIG_SYS_CS1_START 0x20000000
#define CONFIG_SYS_CS1_SIZE 0x90000
-#define CONFIG_SYS_CS1_CFG 0x0002d900
+#define CONFIG_SYS_CS1_CFG 0x00025b00
+
+/* Chip Select configuration for Epson S1D13513 */
+#define CONFIG_SYS_CS3_START 0x10000000
+#define CONFIG_SYS_CS3_SIZE 0x400000
+#define CONFIG_SYS_CS3_CFG 0xffff3d10
/*
* Ethernet configuration
/*
* Ethernet configuration
@@
-361,6
+373,8
@@
CONFIG_BOOTP_DNS2 | \
CONFIG_BOOTP_SEND_HOSTNAME )
CONFIG_BOOTP_DNS2 | \
CONFIG_BOOTP_SEND_HOSTNAME )
+#define CONFIG_VERSION_VARIABLE 1
+
/*
* Various low-level settings
*/
/*
* Various low-level settings
*/