diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/omap3_h1.h | 155 | 
1 files changed, 86 insertions, 69 deletions
diff --git a/include/configs/omap3_h1.h b/include/configs/omap3_h1.h index f1d852bfe..037c1c344 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} +  115200, 3000000}  /* Enable Multi Bus support for I2C */  #define CONFIG_I2C_MULTI_BUS		1 @@ -139,69 +139,75 @@  /* 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 500000; "                         \ +    "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"                                           \ +    "ramfsboot=setenv bootargs console=ttyO2,115200n8 "             \ +    "mpurate=${mpurate}; nandecc hw; "                                  \ +    "nand read 0x80200000 0x280000 0x500000; "                          \ +    "nand read 0x81000000 0x780000 0xa00000; "                          \ +    "bootm 0x80200000 0x81000000\0" + +#define CONFIG_BOOTCMD "run ramfsboot" +  #define CONFIG_AUTO_COMPLETE		1  /* @@ -320,13 +326,24 @@  #define CONFIG_SYS_NAND_OOBSIZE		64  #define CONFIG_SYS_NAND_BLOCK_SIZE	(128*1024)  #define CONFIG_SYS_NAND_BAD_BLOCK_POS	0 -#define CONFIG_SYS_NAND_ECCPOS		{2, 3, 4, 5, 6, 7, 8, 9,\ -						10, 11, 12, 13} +#define CONFIG_SYS_NAND_ECCPOS		{12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, \ +                         23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, \ +                         37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, \ +                         51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63} + +/* #define CONFIG_SYS_NAND_ECCPOS {2, 3, 4, 5, 6, 7, 8, 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_SYS_NAND_ECCBYTES	13 + +/* #define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_HAM1_CODE_SW */ +/* #define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_BCH_CODE_SW */ + +#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  |