Changes to config file for BCH8

Change-Id: Ia144822905f51971a9893380f18c9a90d4816f39

1 files changed, 65 insertions, 72 deletions

diff --git a/include/configs/omap3_h1.h b/include/configs/omap3_h1.h
index 808afc343..f1d852bfe 100644
--- a/include/configs/omap3_h1.h
+++ b/include/configs/omap3_h1.h
@@ -77,7 +77,7 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_SYS_BAUDRATE_TABLE	{4800, 9600, 19200, 38400, 57600,\
-  115200, 3000000}
+					115200}
 
 /* Enable Multi Bus support for I2C */
 #define CONFIG_I2C_MULTI_BUS		1
@@ -139,72 +139,69 @@
 /* Environment information */
 #define CONFIG_BOOTDELAY		3
 
-#define CONFIG_EXTRA_ENV_SETTINGS                               \
-    "loadaddr=0x80200000\0"                                     \
-    "rdaddr=0x81000000\0"                                       \
-    "fdt_high=0xffffffff\0"                                     \
-    "fdtaddr=0x80f80000\0"                                      \
-    "usbtty=cdc_acm\0"                                          \
-    "bootfile=uImage\0"                                         \
-    "ramdisk=ramdisk.gz\0"                                      \
-    "bootdir=/boot\0"                                           \
-    "bootpart=0:2\0"                                            \
-    "console=ttyO2,115200n8\0"                                  \
-    "mpurate=auto\0"                                            \
-    "optargs=\0"                                                \
-    "vram=12M\0"                                                \
-    "dvimode=640x480MR-16@60\0"                                 \
-    "defaultdisplay=dvi\0"                                      \
-    "mmcdev=0\0"                                                \
-    "mmcroot=/dev/mmcblk0p2 rw\0"                               \
-    "mmcrootfstype=ext3 rootwait\0"                             \
-    "nandroot=ubi0:rootfs ubi.mtd=4\0"                          \
-    "nandrootfstype=ubifs\0"                                    \
-    "ramroot=/dev/ram0 rw ramdisk_size=8192 initrd=0x81000000,8M\0" \
-    "ramrootfstype=ext2\0"                                          \
-    "nandargs=setenv bootargs console=${console} "                  \
-    "${optargs} "                                                   \
-    "mpurate=${mpurate} "                                           \
-    "buddy=${buddy} "                                               \
-    "camera=${camera} "                                             \
-    "vram=${vram} "                                                 \
-    "omapfb.mode=dvi:${dvimode} "                                   \
-    "omapdss.def_disp=${defaultdisplay} "                           \
-    "root=${nandroot} "                                             \
-    "rootfstype=${nandrootfstype}\0"                                \
-    "bootenv=uEnv.txt\0"                                            \
-    "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0"    \
-    "ramargs=setenv bootargs console=${console} "                   \
-    "${optargs} "                                                   \
-    "mpurate=${mpurate} "                                           \
-    "vram=${vram} "                                                 \
-    "omapfb.mode=dvi:${dvimode} "                                   \
-    "omapdss.def_disp=${defaultdisplay} "                           \
-    "root=${ramroot} "                                              \
-    "rootfstype=${ramrootfstype}\0"                                 \
-    "nandboot=echo Booting from nand ...; "                         \
-    "run nandargs; "                                                \
-    "nand read ${loadaddr} 280000 A00000; "                         \
-    "bootm ${loadaddr}\0"                                           \
-    "ramboot=echo Booting from ramdisk ...; "                       \
-    "run ramargs; "                                                 \
-    "bootm ${loadaddr}\0"                                           \
-    "h1args=setenv bootargs console=${console} "                    \
-    "androidboot.console=ttyO2 "                                    \
-    "${optargs} "                                                   \
-    "mpurate=${mpurate} "                                           \
-    "vram=${vram} "                                                 \
-    "omapfb.mode=dvi:${dvimode} "                                   \
-    "omapfb.vram=0:6M,0:6M "                                        \
-    "omapdss.def_disp=${defaultdisplay}\0"                          \
-    "h1boot=run h1args; "                                           \
-    "nand read ${loadaddr} 280000 A00000; "                         \
-    "bootm ${loadaddr}\0"
-
-/* 
- * #define CONFIG_BOOTCOMMAND                    \
- * "run h1boot;"
- */
+#define CONFIG_EXTRA_ENV_SETTINGS \
+	"loadaddr=0x80200000\0" \
+	"rdaddr=0x81000000\0" \
+	"fdt_high=0xffffffff\0" \
+	"fdtaddr=0x80f80000\0" \
+	"usbtty=cdc_acm\0" \
+	"bootfile=uImage\0" \
+	"ramdisk=ramdisk.gz\0" \
+	"bootdir=/boot\0" \
+	"bootpart=0:2\0" \
+	"console=ttyO2,115200n8\0" \
+	"mpurate=auto\0" \
+	"optargs=\0" \
+	"vram=12M\0" \
+	"dvimode=640x480MR-16@60\0" \
+	"defaultdisplay=dvi\0" \
+	"mmcdev=0\0" \
+	"mmcroot=/dev/mmcblk0p2 rw\0" \
+	"mmcrootfstype=ext3 rootwait\0" \
+	"nandroot=ubi0:rootfs ubi.mtd=4\0" \
+	"nandrootfstype=ubifs\0" \
+	"ramroot=/dev/ram0 rw ramdisk_size=8192 initrd=0x81000000,8M\0" \
+	"ramrootfstype=ext2\0" \
+	"nandargs=setenv bootargs console=${console} " \
+		"${optargs} " \
+		"mpurate=${mpurate} " \
+		"buddy=${buddy} "\
+		"camera=${camera} "\
+		"vram=${vram} " \
+		"omapfb.mode=dvi:${dvimode} " \
+		"omapdss.def_disp=${defaultdisplay} " \
+		"root=${nandroot} " \
+		"rootfstype=${nandrootfstype}\0" \
+	"bootenv=uEnv.txt\0" \
+	"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
+	"ramargs=setenv bootargs console=${console} " \
+		"${optargs} " \
+		"mpurate=${mpurate} " \
+		"vram=${vram} " \
+		"omapfb.mode=dvi:${dvimode} " \
+		"omapdss.def_disp=${defaultdisplay} " \
+		"root=${ramroot} " \
+		"rootfstype=${ramrootfstype}\0" \
+	"nandboot=echo Booting from nand ...; " \
+		"run nandargs; " \
+		"nand read ${loadaddr} 280000 A00000; " \
+		"bootm ${loadaddr}\0" \
+	"ramboot=echo Booting from ramdisk ...; " \
+		"run ramargs; " \
+		"bootm ${loadaddr}\0" \
+	"h1args=setenv bootargs console=${console} " \
+		"androidboot.console=ttyO2 " \
+		"${optargs} " \
+		"mpurate=${mpurate} " \
+		"vram=${vram} " \
+		"omapfb.mode=dvi:${dvimode} " \
+		"omapfb.vram=0:6M,0:6M " \
+		"omapdss.def_disp=${defaultdisplay}\0" \
+	"h1boot=run h1args; " \
+		"nand read ${loadaddr} 280000 A00000; " \
+		"bootm ${loadaddr}\0"
+#define CONFIG_BOOTCOMMAND \
+	"run h1boot;"
 
 #define CONFIG_AUTO_COMPLETE		1
 /*
@@ -327,13 +324,9 @@
 						10, 11, 12, 13}
 #define CONFIG_SYS_NAND_ECCSIZE		512
 #define CONFIG_SYS_NAND_ECCBYTES	3
-
 #define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_HAM1_CODE_HW
-
-/* #define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_BCH8_CODE_HW_DETECTION_SW */
-/* #define CONFIG_BCH */
 #define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_NAND_U_BOOT_OFFS	    0x80000
+#define CONFIG_SYS_NAND_U_BOOT_OFFS	0x80000
 
 /*
  * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM