diff options
| author | mattis fjallstrom <mattis@acm.org> | 2014-11-11 12:11:29 -0800 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2014-11-11 12:11:29 -0800 |
| commit | 87096d665ad32825fc6b8661c5cf92f70f062ff8 (patch) | |
| tree | 40d1c07fae66fb4ca9d682e8def83225273723fd /include/configs/omap3_h1.h | |
| parent | dd3a236bfa7b3d026dd81d732b1eff4c4c536ddc (diff) | |
| download | olio-uboot-2014.01-87096d665ad32825fc6b8661c5cf92f70f062ff8.tar.xz olio-uboot-2014.01-87096d665ad32825fc6b8661c5cf92f70f062ff8.zip | |
Cleaned up broken solution for building with software ECC.
Change-Id: Ibd0e5688eb23d3d9d5a5c14efcfabf059404fe47
Diffstat (limited to 'include/configs/omap3_h1.h')
| -rw-r--r-- | include/configs/omap3_h1.h | 126 |
1 files changed, 61 insertions, 65 deletions
diff --git a/include/configs/omap3_h1.h b/include/configs/omap3_h1.h index 0c368ec32..808afc343 100644 --- a/include/configs/omap3_h1.h +++ b/include/configs/omap3_h1.h @@ -139,67 +139,67 @@ /* 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_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 \ @@ -328,11 +328,7 @@ #define CONFIG_SYS_NAND_ECCSIZE 512 #define CONFIG_SYS_NAND_ECCBYTES 3 -#ifdef SW_ECC -#define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_HAM1_CODE_SW -#else #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_HAM1_CODE_HW -#endif /* #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW_DETECTION_SW */ /* #define CONFIG_BCH */ |