@ -54,51 +54,58 @@
# define CONFIG_SYS_NAND_ECCSIZE 512
# define CONFIG_SYS_NAND_ECCBYTES 3
# define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW_DETECTION_SW
# define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000
# define CONFIG_ENV_IS_IN_NAND 1
# define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
# define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
# define CONFIG_SYS_ENV_SECT_SIZE SZ_128K
# define CONFIG_ENV_OFFSET 0x260000
# define CONFIG_ENV_ADDR 0x260000
# define CONFIG_ENV_OVERWRITE
# define CONFIG_MTD_PARTITIONS /* required for UBI partition support */
/* NAND: SPL falcon mode configs */
# if defined(CONFIG_SPL_OS_BOOT)
# define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x28 0000
# define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x2a 0000
# endif /* CONFIG_SPL_OS_BOOT */
# endif /* CONFIG_NAND */
/* MUSB */
/* USB EHCI */
# define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1
/* Environment */
# define CONFIG_ENV_SIZE SZ_128K
# define CONFIG_PREBOOT "usb start"
# define MEM_LAYOUT_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV
# define BOOTENV_DEV_NAND(devtypeu, devtypel, instance) \
" bootcmd_ " # devtypel # instance " = " \
" run nandboot \0 "
# define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \
# devtypel #instance " "
# define BOOTENV_DEV_LEGACY_MMC(devtypeu, devtypel, instance) \
" bootcmd_ " # devtypel # instance " = " \
" setenv mmcdev " # instance " ; " \
" setenv bootpart " # instance " :${mmcpart} ; " \
" run mmcboot \0 "
# define BOOTENV_DEV_NAME_LEGACY_MMC(devtypeu, devtypel, instance) \
# devtypel #instance " "
# if defined(CONFIG_NAND)
# define BOOTENV_DEV_NAND(devtypeu, devtypel, instance) \
" bootcmd_ " # devtypel # instance " = " \
" if test ${mtdids} = '' || test ${mtdparts} = '' ; then " \
" echo NAND boot disabled: No mtdids and/or mtdparts; " \
" else " \
" run nandboot; " \
" fi \0 "
# define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \
# devtypel #instance " "
# define BOOT_TARGET_DEVICES(func) \
func ( MMC , mmc , 0 ) \
func ( LEGACY_MMC , legacy_mmc , 0 ) \
func ( UBIFS , ubifs , 0 ) \
func ( NAND , nand , 0 )
# else /* !CONFIG_NAND */
# define BOOT_TARGET_DEVICES(func) \
func ( MMC , mmc , 0 ) \
func ( LEGACY_MMC , legacy_mmc , 0 )
# endif /* CONFIG_NAND */
# include <config_distro_bootcmd.h>
# define CONFIG_EXTRA_ENV_SETTINGS \
@ -107,31 +114,29 @@
" mtdids= " CONFIG_MTDIDS_DEFAULT " \0 " \
" mtdparts= " CONFIG_MTDPARTS_DEFAULT " \0 " \
" fdt_high=0xffffffff \0 " \
" console=ttyO0,115200n8 \0 " \
" bootdir=/boot \0 " \
" bootenv=uEnv.txt \0 " \
" bootfile=zImage \0 " \
" bootpart=0:2 \0 " \
" bootubivol=rootfs \0 " \
" bootubipart=rootfs \0 " \
" optargs= \0 " \
" mmcdev=0 \0 " \
" mmcpart=2 \0 " \
" bootpart=${mmcdev}:${mmcpart} \0 " \
" console=ttyO0,115200n8 \0 " \
" mmcroot=/dev/mmcblk0p2 rw \0 " \
" mmcrootfstype=ext4 rootwait \0 " \
" mmcargs=setenv bootargs console=${console} " \
" ${mtdparts} " \
" ${optargs} " \
" root=/dev/mmcblk0p2 rw " \
" rootfstype=ext4 rootwait \0 " \
" nandargs=setenv bootargs console=${console} " \
" ${mtdparts} " \
" ${optargs} " \
" root=ubi0:rootfs rw ubi.mtd=rootfs noinitrd " \
" rootfstype=ubifs rootwait \0 " \
" root=${mmcroot} " \
" rootfstype=${mmcrootfstype} \0 " \
" loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv} \0 " \
" ext4bootenv=ext4load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootenv} \0 " \
" importbootenv=echo Importing environment from mmc ...; " \
" importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
" env import -t ${loadaddr} ${filesize} \0 " \
" mmcbootenv=mmc dev ${mmcdev}; " \
" mmcbootenv=setenv bootpart ${mmcdev}:${mmcpart}; " \
" mmc dev ${mmcdev}; " \
" if mmc rescan; then " \
" run loadbootenv && run importbootenv; " \
" run ext4bootenv && run importbootenv; " \
@ -153,8 +158,14 @@
" bootz ${loadaddr} - ${fdtaddr}; " \
" fi; " \
" fi \0 " \
" nandboot= " \
" if nand read ${loadaddr} kernel && nand read ${fdtaddr} dtb; then " \
" nandroot=ubi0:rootfs ubi.mtd=rootfs rw noinitrd \0 " \
" nandrootfstype=ubifs rootwait \0 " \
" nandargs=setenv bootargs console=${console} " \
" ${mtdparts} " \
" ${optargs} " \
" root=${nandroot} " \
" rootfstype=${nandrootfstype} \0 " \
" nandboot=if nand read ${loadaddr} kernel && nand read ${fdtaddr} dtb; then " \
" echo Booting uImage from NAND MTD 'kernel' partition ...; " \
" run nandargs; " \
" bootm ${loadaddr} - ${fdtaddr}; " \