Cleanup board config file and fix issues reported by
checkpatch.pl script.
Signed-off-by: Anatolij Gustschin ag...@denx.de
Cc: Stefano Babic sba...@denx.de
---
include/configs/imx31_phycore.h | 112 +++
1 files changed, 67 insertions(+), 45 deletions(-)
diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index 48bd50b..f8cc5ec 100644
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -30,7 +30,7 @@
#include asm/arch/imx-regs.h
- /* High Level Configuration Options */
+/* High Level Configuration Options */
#define CONFIG_ARM1136 1/* This is an arm1136 CPU core */
#define CONFIG_MX311/* in a mx31 */
#define CONFIG_MX31_HCLK_FREQ 2600
@@ -86,26 +86,40 @@
#define CONFIG_BOOTDELAY 3
-#define MTDPARTS_DEFAULT
mtdparts=physmap-flash.0:128k(uboot)ro,1536k(kernel),-(root)
+#define MTDPARTS_DEFAULT mtdparts=physmap-flash.0:128k(uboot)ro, \
+ 1536k(kernel),-(root)
#define CONFIG_NETMASK 255.255.255.0
#define CONFIG_IPADDR 192.168.23.168
#define CONFIG_SERVERIP192.168.23.2
-#defineCONFIG_EXTRA_ENV_SETTINGS
\
- bootargs_base=setenv bootargs console=ttySMX0,115200\0
\
- bootargs_nfs=setenv bootargs $(bootargs) root=/dev/nfs ip=dhcp
nfsroot=$(serverip):$(nfsrootfs),v3,tcp\0 \
- bootargs_flash=setenv bootargs $(bootargs) root=/dev/mtdblock2
rootfstype=jffs2 \
- bootargs_mtd=setenv bootargs $(bootargs) $(mtdparts)
\
- bootcmd=run bootcmd_net\0
\
- bootcmd_net=run bootargs_base bootargs_mtd bootargs_nfs; tftpboot
0x8000 $(uimage); bootm\0 \
- bootcmd_flash=run bootargs_base bootargs_mtd bootargs_flash; bootm
0x8000\0 \
- unlock=yes\0
\
- mtdparts= MTDPARTS_DEFAULT \0
\
- prg_uboot=tftpboot 0x8000 $(uboot); protect off 0xa000
+0x2; erase 0xa000 +0x2; cp.b 0x8000 0xa000 $(filesize)\0 \
- prg_kernel=tftpboot 0x8000 $(uimage); erase 0xa004 +0x18;
cp.b 0x8000 0xa004 $(filesize)\0\
- prg_jffs2=tftpboot 0x8000 $(jffs2); erase 0xa01c 0xa1ff;
cp.b 0x8000 0xa01c $(filesize)\0 \
-
videomode=video=ctfb:x:240,y:320,depth:16,mode:0,pclk:185925,le:9,ri:17,up:7,lo:10,hs:1,vs:1,sync:1241513985,vmode:0\0
+#defineCONFIG_EXTRA_ENV_SETTINGS
\
+ bootargs_base=setenv bootargs console=ttySMX0,115200\0\
+ bootargs_nfs=setenv bootargs $(bootargs) root=/dev/nfs\
+ ip=dhcp nfsroot=$(serverip):$(nfsrootfs),v3,tcp\0 \
+ bootargs_flash=setenv bootargs $(bootargs)\
+ root=/dev/mtdblock2 rootfstype=jffs2\0\
+ bootargs_mtd=setenv bootargs $(bootargs) $(mtdparts)\0\
+ bootcmd=run bootcmd_net\0 \
+ bootcmd_net=run bootargs_base bootargs_mtd bootargs_nfs; \
+ tftpboot 0x8000 $(uimage);bootm\0 \
+ bootcmd_flash=run bootargs_base bootargs_mtd bootargs_flash; \
+ bootm 0x8000\0\
+ unlock=yes\0 \
+ mtdparts= MTDPARTS_DEFAULT \0 \
+ prg_uboot=tftpboot 0x8000 $(uboot); \
+ protect off 0xa000 +0x2; \
+ erase 0xa000 +0x2;\
+ cp.b 0x8000 0xa000 $(filesize)\0 \
+ prg_kernel=tftpboot 0x8000 $(uimage); \
+ erase 0xa004 +0x18; \
+ cp.b 0x8000 0xa004 $(filesize)\0 \
+ prg_jffs2=tftpboot 0x8000 $(jffs2); \
+ erase 0xa01c 0xa1ff; \
+ cp.b 0x8000 0xa01c $(filesize)\0 \
+ videomode=video=ctfb:x:240,y:320,depth:16,mode:0, \
+ pclk:185925,le:9,ri:17,up:7,lo:10,hs:1,vs:1, \
+ sync:1241513985,vmode:0\0
#define CONFIG_SMC911X 1
@@ -117,11 +131,15 @@
*/
#define CONFIG_SYS_LONGHELP/*