MPC52xx, motionpro: update default configuration

Signed-off-by: Wolfgang Denk <wd@denx.de>

1 files changed, 27 insertions, 43 deletions

diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index 935b5b9a052..f7493f56be7 100644
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -47,29 +47,27 @@
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 
-
 /*
  * Command line configuration.
  */
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_BEDBUG
+#define CONFIG_CMD_DATE
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_IMMAP
+#define CONFIG_CMD_DTT
+#define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_ELF
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_IDE
+#define CONFIG_CMD_IMMAP
+#define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_BEDBUG
 #define CONFIG_CMD_NET
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_IDE
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_I2C
-#define CONFIG_CMD_DATE
-#define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_DTT
-
+#define CONFIG_CMD_REGINFO
 
 /*
  * Serial console configuration
@@ -79,7 +77,6 @@
 #define CONFIG_BAUDRATE		115200
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200, 230400 }
 
-
 /*
  * Ethernet configuration
  */
@@ -101,11 +98,14 @@
 #define CONFIG_AUTOBOOT_PROMPT	"Autobooting in %d seconds, "		\
 				"press \"<Esc><Esc>\" to stop\n", bootdelay
 
+#define CONFIG_CMDLINE_EDITING		1	/* add command line history	*/
+#define	CONFIG_SYS_HUSH_PARSER		1	/* use "hush" command parser	*/
+#define	CONFIG_SYS_PROMPT_HUSH_PS2	"> "
+
 #define CONFIG_ETHADDR		00:50:C2:40:10:00
 #define CONFIG_OVERWRITE_ETHADDR_ONCE	1
 #define CONFIG_VERSION_VARIABLE	1	/* include version env variable */
 
-
 /*
  * Default environment settings
  */
@@ -117,21 +117,22 @@
 	"serverip=192.168.1.1\0"					\
 	"gatewayip=192.168.1.1\0"					\
 	"console=ttyPSC0,115200\0"					\
-	"u-boot_addr=100000\0"						\
-	"kernel_addr=200000\0"						\
-	"fdt_addr=400000\0"						\
-	"ramdisk_addr=500000\0"						\
+	"u-boot_addr=400000\0"						\
+	"kernel_addr=400000\0"						\
+	"fdt_addr=700000\0"						\
+	"ramdisk_addr=800000\0"						\
 	"multi_image_addr=800000\0"					\
-	"rootpath=/opt/eldk-4.1/ppc_6xx\0"				\
-	"u-boot=/tftpboot/motionpro/u-boot.bin\0"			\
-	"bootfile=/tftpboot/motionpro/uImage\0"				\
-	"fdt_file=/tftpboot/motionpro/motionpro.dtb\0"			\
-	"ramdisk_file=/tftpboot/motionpro/uRamdisk\0"			\
+	"rootpath=/opt/eldk/ppc_6xx\0"					\
+	"u-boot=motionpro/u-boot.bin\0"					\
+	"bootfile=motionpro/uImage\0"					\
+	"fdt_file=motionpro/motionpro.dtb\0"				\
+	"ramdisk_file=motionpro/uRamdisk\0"				\
 	"multi_image_file=kernel+initrd+dtb.img\0"			\
 	"load=tftp ${u-boot_addr} ${u-boot}\0"				\
-	"update=prot off fff00000 fff3ffff; era fff00000 fff3ffff; "	\
+	"update=prot off fff00000 +${filesize};"			\
+		"era fff00000 +${filesize}; "				\
 		"cp.b ${u-boot_addr} fff00000 ${filesize};"		\
-		"prot on fff00000 fff3ffff\0"				\
+		"prot on fff00000 +${filesize}\0"			\
 	"ramargs=setenv bootargs root=/dev/ram rw\0"			\
 	"nfsargs=setenv bootargs root=/dev/nfs rw "			\
 		"nfsroot=${serverip}:${rootpath}\0"			\
@@ -160,24 +161,20 @@
  */
 #define CONFIG_BOARD_EARLY_INIT_R	1
 
-
 /*
  * Low level configuration
  */
 
-
 /*
  * Clock configuration: SYS_XTALIN = 33MHz
  */
 #define CONFIG_SYS_MPC5XXX_CLKIN	33000000
 
-
 /*
  * Set IPB speed to 100MHz
  */
 #define CONFIG_SYS_IPBCLK_EQUALS_XLBCLK
 
-
 /*
  * Memory map
  */
@@ -186,7 +183,7 @@
  * Setting MBAR to otherwise will cause system hang when using SmartDMA such
  * as network commands.
  */
-#define CONFIG_SYS_MBAR		0xf0000000
+#define CONFIG_SYS_MBAR			0xf0000000
 #define CONFIG_SYS_SDRAM_BASE		0x00000000
 
 /*
@@ -218,7 +215,6 @@
 #define CONFIG_SYS_MALLOC_LEN		(1024 << 10)	/* 1 MiB for malloc() */
 #define CONFIG_SYS_BOOTMAPSZ		(8 << 20)	/* initial mem map for Linux */
 
-
 /*
  * Chip selects configuration
  */
@@ -251,7 +247,6 @@
 #define CONFIG_SYS_CS_BURST		0x00000000
 #define CONFIG_SYS_CS_DEADCYCLE	0x22222222
 
-
 /*
  * SDRAM configuration
  */
@@ -261,7 +256,6 @@
 #define SDRAM_CONTROL		0x504f0000
 #define SDRAM_MODE		0x00cd0000
 
-
 /*
  * Flash configuration
  */
@@ -299,7 +293,6 @@
 #define CONFIG_SYS_ATA_STRIDE		4
 #define CONFIG_DOS_PARTITION
 
-
 /*
  * I2C configuration
  */
@@ -308,7 +301,6 @@
 #define CONFIG_SYS_I2C_SPEED		100000	/* 100 kHz */
 #define CONFIG_SYS_I2C_SLAVE		0x7F
 
-
 /*
  * EEPROM configuration
  */
@@ -317,14 +309,12 @@
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS	5	/* 2ms/cycle + 3ms extra */
 #define CONFIG_SYS_I2C_MULTI_EEPROMS		1	/* 2 EEPROMs (addr:50,52) */
 
-
 /*
  * RTC configuration
  */
 #define CONFIG_RTC_DS1337	1
 #define CONFIG_SYS_I2C_RTC_ADDR	0x68
 
-
 /*
  * Status LED configuration
  */
@@ -346,14 +336,12 @@ extern void __led_toggle(led_id_t id);
 extern void __led_set(led_id_t id, int state);
 #endif /* __ASSEMBLY__ */
 
-
 /*
  * Temperature sensor
  */
 #define CONFIG_DTT_LM75		1
 #define CONFIG_DTT_SENSORS	{ 0x49 }
 
-
 /*
  * Environment settings
  */
@@ -381,13 +369,11 @@ extern void __led_set(led_id_t id, int state);
  */
 #define CONFIG_SYS_GPS_PORT_CONFIG	0x1105a004
 
-
 /*
  * Motion-PRO's CPLD revision control register
  */
 #define CPLD_REV_REGISTER	(CONFIG_SYS_CS2_START + 0x06)
 
-
 /*
  * Miscellaneous configurable options
  */
@@ -406,7 +392,6 @@ extern void __led_set(led_id_t id, int state);
 
 #define CONFIG_SYS_HZ			1000	/* decrementer freq: 1 ms ticks */
 
-
 /*
  * Various low-level settings
  */
@@ -415,7 +400,6 @@ extern void __led_set(led_id_t id, int state);
 
 #define CONFIG_SYS_CACHELINE_SIZE	32	/* For MPC5xxx CPUs */
 
-
 /* Not needed for MPC 5xxx U-Boot, but used by tools/updater */
 #define CONFIG_SYS_RESET_ADDRESS	0xfff00100