diff options
Diffstat (limited to 'include/configs/omap3logic.h')
| -rw-r--r-- | include/configs/omap3logic.h | 45 |
1 files changed, 39 insertions, 6 deletions
diff --git a/include/configs/omap3logic.h b/include/configs/omap3logic.h index 6c91462576..882349f65e 100644 --- a/include/configs/omap3logic.h +++ b/include/configs/omap3logic.h @@ -33,6 +33,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <ecc-method_autogenerated.h> + /* * High Level Configuration Options */ @@ -211,7 +213,12 @@ #define MTDPARTS_NAND_DEFAULT "mtdparts=omap2-nand.0:512k(x-loader),"\ "1664k(u-boot),384k(u-boot-env),"\ "5m(kernel),20m(ramdisk),-(fs)" +#if defined(SYSCFG_NAND_ECC_SOFT_BCH) +#define MTDFLAGS_NAND_DEFAULT "default=ecc_bch;x-loader=ecc_hw,repeat;fs=yaffs" +#endif +#if defined(SYSCFG_NAND_ECC_IN_CHIP) #define MTDFLAGS_NAND_DEFAULT "default=ecc_chip;x-loader=ecc_hw,repeat;fs=yaffs" +#endif #define MTDPARTS_NOR_DEFAULT "physmap-flash.0:-(nor)" @@ -350,7 +357,7 @@ /* ram, tftp, /dev, nfs, mmc, nand, nand-part. */ /* */ /* - $rootfs_type */ -/* Must always be set. Values can be ramdisk, jffs, yaffs, ext3, or nfs. */ +/* Must always be set. Values can be ramdisk, initramfs, jffs, yaffs, ext3, or nfs. */ /* */ /* - $loadaddr */ /* Must always be set. */ @@ -364,6 +371,8 @@ /* must be set. */ /* - If booting from a ramdisk image, then $ramdisksize, and $ramdiskaddr */ /* must be set. */ +/* - If booting from a initramfs image, then $ramdiskaddr */ +/* must be set. */ /* - If booting from an nfs location, then $serverip, $nfsrootpath, and */ /* $nfsoptions must be set. */ /* - If booting from nand, $ramdisk_partition, */ @@ -418,6 +427,7 @@ "ubootimage=u-boot.bin.ift\0" \ "kernelimage=uImage\0" \ "ramdiskimage=rootfs.ext2.gz.uboot\0" \ + "initramfsimage=initramfs.cpio.gz.uboot\0" \ "yaffsimage=rootfs.yaffs2\0" \ "xloader_partition=x-loader\0" \ "uboot_partition=u-boot\0" \ @@ -444,6 +454,18 @@ " run _defaultboot;\n" \ " fi; \n" \ " else run _defaultboot; fi\0" \ + "get_dhcp_address=if true;then;\n" \ + " old_autoload=$autoload;\n" \ + " old_serverip=$serverip;\n" \ + " setenv autoload no;\n" \ + " echo \"Getting DHCP address\";\n" \ + " dhcp;\n" \ + " if test -n \\\"$old_serverip\\\"; then;\n" \ + " setenv serverip $old_serverip;\n" \ + " fi;\n" \ + " setenv autoload $old_autoload;\n" \ + " setenv old_autoload \"\";\n" \ + " setenv old_serverip \"\"; fi\0" \ "_loadbootscript=fatload mmc 1 $mmc_bootscript_addr " CONFIG_MMC_BOOTSCRIPT_NAME "\0" \ "bootscript=source ${mmc_bootscript_addr}\0" \ "_vrfb_arg=if itest ${rotation} -ne 0; then \n" \ @@ -492,14 +514,22 @@ " fi\n\0" \ \ /* load_rootfs_* targets */ \ + "_get_fsimage_name=if true;then;\n" \ + " if test $rootfs_type = ramdisk; then;\n" \ + " setenv fs_image $ramdiskimage;\n" \ + " else\n" \ + " setenv fs_image $initramfsimage;\n" \ + " fi;\n" \ + " fi;\n\0" \ "_load_rootfs_ram=if true;then;\n" \ " echo \"== rootfs located at $ramdiskaddr ==\"; \n" \ " echo \"\"; \n" \ " setenv bootm_arg2 ${ramdiskaddr}; \n" \ " fi\0" \ "_load_rootfs_tftp=if true;then;\n" \ - " echo \"== Loading rootfs file $tftpdir$ramdiskimage to $ramdiskaddr ==\"; \n" \ - " tftpboot $ramdiskaddr $tftpdir$ramdiskimage;\n" \ + " run _get_fsimage_name;\n" \ + " echo \"== Loading rootfs file ${tftpdir}${fs_image} to $ramdiskaddr ==\"; \n" \ + " tftpboot $ramdiskaddr ${tftpdir}${fs_image};\n" \ " echo \"\"; \n" \ " setenv bootm_arg2 ${ramdiskaddr}; \n" \ " fi\0" \ @@ -514,8 +544,9 @@ " setenv bootargs ${bootargs} root=/dev/nfs; \n" \ " fi\0" \ "_load_rootfs_mmc=if true;then;\n" \ - " echo \"== Loading rootfs file $ramdiskimage to $ramdiskaddr ==\"; \n" \ - " fatload mmc 1 ${ramdiskaddr} ${ramdiskimage}; \n"\ + " run _get_fsimage_name;\n" \ + " echo \"== Loading rootfs file ${fs_image} to $ramdiskaddr ==\"; \n" \ + " fatload mmc 1 ${ramdiskaddr} ${fs_image}; \n"\ " setenv bootm_arg2 ${ramdiskaddr}; \n" \ " fi\0" \ "_load_rootfs_nand=if true;then;\n" \ @@ -534,6 +565,7 @@ " fi\n\0" \ \ /* set_rootfs_type_* targets */ \ + "_set_rootfs_type_initramfs=setenv bootargs ${bootargs} rw\0" \ "_set_rootfs_type_ramdisk=setenv bootargs ${bootargs} root=/dev/ram rw ramdisk_size=${ramdisksize}\0" \ "_set_rootfs_type_jffs=setenv bootargs ${bootargs} rw rootfstype=jffs2\0" \ "_set_rootfs_type_yaffs=setenv bootargs ${bootargs} rw rootfstype=yaffs2\0" \ @@ -558,7 +590,8 @@ " fi\0" \ "defaultboot=run _defaultboot\0_defaultboot=if true;then\n" \ " run _dump_boot_sources;\n" \ - " run setconsole; setenv bootargs console=${console};\n" \ + " run setconsole;\n" \ + " setenv bootargs nand-ecc=$defaultecc console=${console};\n" \ " run _common_bootargs;\n" \ " run _load_kernel;\n" \ " run _load_rootfs;\n" \ |