Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

OMAP3: mcx: updated default environment

Browse source 
Patch drops also not used CFI setup in the
configuration file.

Signed-off-by: Stefano Babic <sbabic@denx.de>
CC: Tom Rini <trini@ti.com>
This commit is contained in:
Stefano Babic 2012-06-13 22:34:43 +00:00 committed by Albert ARIBAUD
parent aeadeaaf17
commit f89a8b6a76
1 changed files with 91 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

128
include/configs/mcx.h
View file

@ -183,38 +183,95 @@
#define CONFIG_BOOTFILE "uImage" #define CONFIG_BOOTFILE "uImage"
#define xstr(s) str(s)
#define str(s) #s
/* Setup MTD for NAND on the SOM */
#define MTDIDS_DEFAULT "nand0=omap2-nand.0"
#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:512k(MLO)," \
"1m(u-boot),256k(env1)," \
"256k(env2),6m(kernel),6m(k_recovery)," \
"8m(fs_recovery),-(common_data)"
#define CONFIG_HOSTNAME mcx
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x82000000\0" \ "adddbg=setenv bootargs ${bootargs} trace_buf_size=64M\0" \
"console=ttyO2,115200n8\0" \ "adddebug=setenv bootargs ${bootargs} earlyprintk=serial\0" \
"mmcargs=setenv bootargs console=${console} " \ "addeth=setenv bootargs ${bootargs} ethaddr=${ethaddr}\0" \
"root=/dev/mmcblk0p2 rw " \ "addfb=setenv bootargs ${bootargs} vram=6M " \
"rootfstype=ext3 rootwait\0" \ "omapfb.vram=1:2M,2:2M,3:2M omapdss.def_disp=lcd\0" \
"nandargs=setenv bootargs console=${console} " \ "addip_sta=setenv bootargs ${bootargs} " \
"root=/dev/mtdblock4 rw " \ "ip=${ipaddr}:${serverip}:${gatewayip}:" \
"rootfstype=jffs2\0" \ "${netmask}:${hostname}:eth0:off\0" \
"loadbootscript=fatload mmc 0 ${loadaddr} boot.scr\0" \ "addip_dyn=setenv bootargs ${bootargs} ip=dhcp\0" \
"bootscript=echo Running bootscript from mmc ...; " \ "addip=if test -n ${ipdyn};then run addip_dyn;" \
"source ${loadaddr}\0" \ "else run addip_sta;fi\0" \
"loaduimage=fatload mmc 0 ${loadaddr} uImage\0" \ "addmisc=setenv bootargs ${bootargs} ${misc}\0" \
"mmcboot=echo Booting from mmc ...; " \ "addtty=setenv bootargs ${bootargs} " \
"run mmcargs; " \ "console=${consoledev},${baudrate}\0" \
"bootm ${loadaddr}\0" \ "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" \
"nandboot=echo Booting from nand ...; " \ "baudrate=115200\0" \
"run nandargs; " \ "consoledev=ttyO2\0" \
"nand read ${loadaddr} 280000 400000; " \ "hostname=" xstr(CONFIG_HOSTNAME) "\0" \
"bootm ${loadaddr}\0" \ "loadaddr=0x82000000\0" \
"load=tftp ${loadaddr} ${u-boot}\0" \
"load_k=tftp ${loadaddr} ${bootfile}\0" \
"loaduimage=fatload mmc 0 ${loadaddr} uImage\0" \
"loadmlo=tftp ${loadaddr} ${mlo}\0" \
"mlo=" xstr(CONFIG_HOSTNAME) "/MLO\0" \
"mmcargs=root=/dev/mmcblk0p2 rw " \
"rootfstype=ext3 rootwait\0" \
"mmcboot=echo Booting from mmc ...; " \
"run mmcargs; " \
"run addip addtty addmtd addfb addeth addmisc;" \
"run loaduimage; " \
"bootm ${loadaddr}\0" \
"net_nfs=run load_k; " \
"run nfsargs; " \
"run addip addtty addmtd addfb addeth addmisc;" \
"bootm ${loadaddr}\0" \
"nfsargs=setenv bootargs root=/dev/nfs rw " \
"nfsroot=${serverip}:${rootpath}\0" \
"u-boot=" xstr(CONFIG_HOSTNAME) "/u-boot.img\0" \
"uboot_addr=0x80000\0" \
"update=nandecc sw;nand erase ${uboot_addr} 100000;" \
"nand write ${loadaddr} ${uboot_addr} 80000\0" \
"updatemlo=nandecc hw;nand erase 0 20000;" \
"nand write ${loadaddr} 0 20000\0" \
"upd=if run load;then echo Updating u-boot;if run update;" \
"then echo U-Boot updated;" \
"else echo Error updating u-boot !;" \
"echo Board without bootloader !!;" \
"fi;" \
"else echo U-Boot not downloaded..exiting;fi\0" \
"loadbootscript=fatload mmc 0 ${loadaddr} boot.scr\0" \
"bootscript=echo Running bootscript from mmc ...; " \
"source ${loadaddr}\0" \
"nandargs=setenv bootargs ubi.mtd=7 " \
"root=ubi0:rootfs rootfstype=ubifs\0" \
"nandboot=echo Booting from nand ...; " \
"run nandargs; " \
"ubi part nand0,4;" \
"ubi readvol ${loadaddr} kernel;" \
"run addip addtty addmtd addfb addeth addmisc;" \
"bootm ${loadaddr}\0" \
"swupdate_args=setenv bootargs ubi.mtd=6 root=ubi0:fs_recovery "\
"rootfstype=ubifs quiet loglevel=1 " \
"consoleblank=0 ${swupdate_misc}\0" \
"swupdate=echo Running Sw-Update...;" \
"if printenv mtdparts;then echo Starting SwUpdate...; " \
"else mtdparts default;fi; " \
"ubi part nand0,5;" \
"ubi readvol 0x82000000 kernel_recovery;" \
"run swupdate_args; " \
"setenv bootargs ${bootargs} " \
"${mtdparts} " \
"vram=6M omapfb.vram=1:2M,2:2M,3:2M " \
"omapdss.def_disp=lcd;" \
"bootm ${loadaddr}\0"
#define CONFIG_BOOTCOMMAND \ #define CONFIG_BOOTCOMMAND \
"if mmc init; then " \ "run nandboot"
"if run loadbootscript; then " \
"run bootscript; " \
"else " \
"if run loaduimage; then " \
"run mmcboot; " \
"else run nandboot; " \
"fi; " \
"fi; " \
"else run nandboot; fi"
#define CONFIG_AUTO_COMPLETE #define CONFIG_AUTO_COMPLETE
#define CONFIG_CMDLINE_EDITING #define CONFIG_CMDLINE_EDITING
@ -279,18 +336,15 @@
#define CONFIG_NAND_OMAP_GPMC #define CONFIG_NAND_OMAP_GPMC
#define GPMC_NAND_ECC_LP_x16_LAYOUT #define GPMC_NAND_ECC_LP_x16_LAYOUT
#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_IS_IN_NAND
#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ #define SMNAND_ENV_OFFSET 0x180000 /* environment starts here */
/* Redundant Environment */
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET #define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET #define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \
/* 2 * CONFIG_SYS_ENV_SECT_SIZE)
* CFI FLASH driver setup #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE
*/
/* timeout values are in ticks */
#define CONFIG_SYS_FLASH_ERASE_TOUT (100 * CONFIG_SYS_HZ)
#define CONFIG_SYS_FLASH_WRITE_TOUT (100 * CONFIG_SYS_HZ)
/* Flash banks JFFS2 should use */ /* Flash banks JFFS2 should use */
#define CONFIG_SYS_MAX_MTD_BANKS (CONFIG_SYS_MAX_FLASH_BANKS + \ #define CONFIG_SYS_MAX_MTD_BANKS (CONFIG_SYS_MAX_FLASH_BANKS + \