|
@@ -151,7 +151,7 @@
|
|
|
#define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase TO (ms) */
|
|
|
#define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write TO (ms) */
|
|
|
|
|
|
-#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */
|
|
|
+#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */
|
|
|
|
|
|
#if (CONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE)
|
|
|
#define CONFIG_SYS_RAMBOOT
|
|
@@ -191,7 +191,7 @@
|
|
|
#define CONFIG_SYS_NS16550_CLK get_bus_freq(0)
|
|
|
|
|
|
#define CONFIG_SYS_BAUDRATE_TABLE \
|
|
|
- {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 115200}
|
|
|
+ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 115200}
|
|
|
|
|
|
#define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR + 0x4500)
|
|
|
#define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR + 0x4600)
|
|
@@ -217,7 +217,7 @@
|
|
|
#define CONFIG_I2C_CMD_TREE
|
|
|
#define CONFIG_SYS_I2C_SPEED 400000 /* I2C speed and slave address */
|
|
|
#define CONFIG_SYS_I2C_SLAVE 0x7F
|
|
|
-#define CONFIG_SYS_I2C_NOPROBES {{0, 0x69}} /* Don't probe these addrs */
|
|
|
+#define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} } /* Don't probe these addrs */
|
|
|
#define CONFIG_SYS_I2C1_OFFSET 0x3000
|
|
|
#define CONFIG_SYS_I2C2_OFFSET 0x3100
|
|
|
#define CONFIG_SYS_I2C_OFFSET CONFIG_SYS_I2C1_OFFSET
|
|
@@ -579,22 +579,23 @@
|
|
|
"fdtfile=vme8349.dtb\0" \
|
|
|
""
|
|
|
|
|
|
-#define CONFIG_NFSBOOTCOMMAND \
|
|
|
- "setenv bootargs root=/dev/nfs rw " \
|
|
|
- "nfsroot=$serverip:$rootpath " \
|
|
|
- "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
|
|
|
- "console=$consoledev,$baudrate $othbootargs;" \
|
|
|
- "tftp $loadaddr $bootfile;" \
|
|
|
- "tftp $fdtaddr $fdtfile;" \
|
|
|
- "bootm $loadaddr - $fdtaddr"
|
|
|
+#define CONFIG_NFSBOOTCOMMAND \
|
|
|
+ "setenv bootargs root=/dev/nfs rw " \
|
|
|
+ "nfsroot=$serverip:$rootpath " \
|
|
|
+ "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:" \
|
|
|
+ "$netdev:off " \
|
|
|
+ "console=$consoledev,$baudrate $othbootargs;" \
|
|
|
+ "tftp $loadaddr $bootfile;" \
|
|
|
+ "tftp $fdtaddr $fdtfile;" \
|
|
|
+ "bootm $loadaddr - $fdtaddr"
|
|
|
|
|
|
#define CONFIG_RAMBOOTCOMMAND \
|
|
|
- "setenv bootargs root=/dev/ram rw " \
|
|
|
- "console=$consoledev,$baudrate $othbootargs;" \
|
|
|
- "tftp $ramdiskaddr $ramdiskfile;" \
|
|
|
- "tftp $loadaddr $bootfile;" \
|
|
|
- "tftp $fdtaddr $fdtfile;" \
|
|
|
- "bootm $loadaddr $ramdiskaddr $fdtaddr"
|
|
|
+ "setenv bootargs root=/dev/ram rw " \
|
|
|
+ "console=$consoledev,$baudrate $othbootargs;" \
|
|
|
+ "tftp $ramdiskaddr $ramdiskfile;" \
|
|
|
+ "tftp $loadaddr $bootfile;" \
|
|
|
+ "tftp $fdtaddr $fdtfile;" \
|
|
|
+ "bootm $loadaddr $ramdiskaddr $fdtaddr"
|
|
|
|
|
|
#define CONFIG_BOOTCOMMAND "run flash_self"
|
|
|
|