Motion-PRO: Code cleanup, fix of a typo in OF_STDOUT_PATH.

Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>

2 files changed, 22 insertions, 22 deletions

diff --git a/board/motionpro/motionpro.c b/board/motionpro/motionpro.c
index b05e2ab..40d304b 100644
--- a/board/motionpro/motionpro.c
+++ b/board/motionpro/motionpro.c
@@ -102,7 +102,7 @@ void reset_phy(void)
 /*
  * Helper function to initialize SDRAM controller.
  */
-static void sdram_start (int hi_addr)
+static void sdram_start(int hi_addr)
 {
 	long hi_addr_bit = hi_addr ? 0x01000000 : 0;
 
@@ -134,7 +134,7 @@ static void sdram_start (int hi_addr)
 /*
  * Initalize SDRAM - configure SDRAM controller, detect memory size.
  */
-long int initdram (int board_type)
+long int initdram(int board_type)
 {
 	ulong dramsize = 0;
 #ifndef CFG_RAMBOOT
@@ -187,7 +187,7 @@ long int initdram (int board_type)
 }
 
 
-int checkboard (void)
+int checkboard(void)
 {
 	uchar rev = *(vu_char *)CPLD_REV_REGISTER;
 	printf("Board: Promess Motion-PRO board (CPLD rev. 0x%02x)\n", rev);
@@ -204,7 +204,7 @@ void ft_board_setup(void *blob, bd_t *bd)
 
 
 #if defined(CONFIG_STATUS_LED)
-void __led_init (led_id_t regaddr, int state)
+void __led_init(led_id_t regaddr, int state)
 {
 	*((vu_long *) regaddr) |= ENABLE_GPIO_OUT;
 
@@ -214,7 +214,7 @@ void __led_init (led_id_t regaddr, int state)
 		*((vu_long *) regaddr) &= ~LED_ON;
 }
 
-void __led_set (led_id_t regaddr, int state)
+void __led_set(led_id_t regaddr, int state)
 {
 	if (state == STATUS_LED_ON)
 		*((vu_long *) regaddr) |= LED_ON;
@@ -222,7 +222,7 @@ void __led_set (led_id_t regaddr, int state)
 		*((vu_long *) regaddr) &= ~LED_ON;
 }
 
-void __led_toggle (led_id_t regaddr)
+void __led_toggle(led_id_t regaddr)
 {
 	*((vu_long *) regaddr) ^= LED_ON;
 }
diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index 8170ccb..e3899a5 100644
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -117,27 +117,27 @@
 	"fdt_file=/tftpboot/motionpro/motionpro.dtb\0"			\
 	"ramdisk_file=/tftpboot/motionpro/uRamdisk\0"			\
 	"multi_image_file=kernel+initrd+dtb.img\0"			\
-	"load=tftp $(u-boot_addr) $(u-boot)\0"				\
+	"load=tftp ${u-boot_addr} ${u-boot}\0"				\
 	"update=prot off fff00000 fff3ffff; era fff00000 fff3ffff; "	\
-		"cp.b $(u-boot_addr) fff00000 $(filesize);"		\
+		"cp.b ${u-boot_addr} fff00000 ${filesize};"		\
 		"prot on fff00000 fff3ffff\0"				\
 	"ramargs=setenv bootargs root=/dev/ram rw\0"			\
 	"nfsargs=setenv bootargs root=/dev/nfs rw "			\
-		"nfsroot=$(serverip):$(rootpath)\0"			\
+		"nfsroot=${serverip}:${rootpath}\0"			\
 	"fat_args=setenv bootargs rw\0"					\
-	"addmtd=setenv bootargs $(bootargs) $(mtdparts)\0"		\
-	"addip=setenv bootargs $(bootargs) "				\
-		"ip=$(ipaddr):$(serverip):$(gatewayip):"		\
-		"$(netmask):$(hostname):$(netdev):off panic=1 "		\
-		"console=$(console)\0"					\
-	"net_nfs=tftp $(kernel_addr) $(bootfile); "			\
-		"tftp $(fdt_addr) $(fdt_file); run nfsargs addip; "	\
-		"bootm $(kernel_addr) - $(fdt_addr)\0"			\
-	"net_self=tftp $(kernel_addr) $(bootfile); "			\
-		"tftp $(fdt_addr) $(fdt_file); "			\
-		"tftp $(ramdisk_addr) $(ramdisk_file); "		\
+	"addmtd=setenv bootargs ${bootargs} ${mtdparts}\0"		\
+	"addip=setenv bootargs ${bootargs} "				\
+		"ip=${ipaddr}:${serverip}:${gatewayip}:"		\
+		"${netmask}:${hostname}:${netdev}:off panic=1 "		\
+		"console=${console}\0"					\
+	"net_nfs=tftp ${kernel_addr} ${bootfile}; "			\
+		"tftp ${fdt_addr} ${fdt_file}; run nfsargs addip; "	\
+		"bootm ${kernel_addr} - ${fdt_addr}\0"			\
+	"net_self=tftp ${kernel_addr} ${bootfile}; "			\
+		"tftp ${fdt_addr} ${fdt_file}; "			\
+		"tftp ${ramdisk_addr} ${ramdisk_file}; "		\
 		"run ramargs addip; "					\
-		"bootm $(kernel_addr) $(ramdisk_addr) $(fdt_addr)\0"	\
+		"bootm ${kernel_addr} ${ramdisk_addr} ${fdt_addr}\0"	\
 	"fat_multi=run fat_args addip; fatload ide 0:1 "		\
 		"${multi_image_addr} ${multi_image_file}; "		\
 		"bootm ${multi_image_addr}\0"				\
@@ -418,6 +418,6 @@ extern void __led_set(led_id_t id, int state);
 #define OF_CPU			"PowerPC,5200@0"
 #define OF_SOC			"soc5200@f0000000"
 #define OF_TBCLK		(bd->bi_busfreq / 4)
-#define OF_STDOUT_PAT		"/soc5200@f0000000/serial@2000"
+#define OF_STDOUT_PATH		"/soc5200@f0000000/serial@2000"
 
 #endif /* __CONFIG_H */