diff options
Diffstat (limited to 'include/configs/mx51evk.h')
| -rw-r--r-- | include/configs/mx51evk.h | 51 | 
1 files changed, 44 insertions, 7 deletions
| diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index cb3d93890..13d1839eb 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -53,6 +53,9 @@  /*   * Hardware drivers   */ +#define CONFIG_FSL_IIM +#define CONFIG_CMD_FUSE +  #define CONFIG_MXC_UART  #define CONFIG_MXC_UART_BASE	UART1_BASE  #define CONFIG_MXC_GPIO @@ -149,32 +152,66 @@  #define CONFIG_ETHPRIME		"FEC0" -#define CONFIG_LOADADDR		0x90800000	/* loadaddr env var */ +#define CONFIG_LOADADDR		0x92000000	/* loadaddr env var */  #define CONFIG_EXTRA_ENV_SETTINGS \  	"script=boot.scr\0" \  	"uimage=uImage\0" \ +	"fdt_file=imx51-babbage.dtb\0" \ +	"fdt_addr=0x91000000\0" \ +	"boot_fdt=try\0" \ +	"ip_dyn=yes\0" \  	"mmcdev=0\0" \  	"mmcpart=2\0" \ -	"mmcroot=/dev/mmcblk0p3 rw\0" \ -	"mmcrootfstype=ext3 rootwait\0" \ +	"mmcroot=/dev/mmcblk0p3 rootwait rw\0" \  	"mmcargs=setenv bootargs console=ttymxc0,${baudrate} " \ -		"root=${mmcroot} " \ -		"rootfstype=${mmcrootfstype}\0" \ +		"root=${mmcroot}\0" \  	"loadbootscript=" \  		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \  	"bootscript=echo Running bootscript from mmc ...; " \  		"source\0" \  	"loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ +	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \  	"mmcboot=echo Booting from mmc ...; " \  		"run mmcargs; " \ -		"bootm\0" \ +		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +			"if run loadfdt; then " \ +				"bootm ${loadaddr} - ${fdt_addr}; " \ +			"else " \ +				"if test ${boot_fdt} = try; then " \ +					"bootm; " \ +				"else " \ +					"echo WARN: Cannot load the DT; " \ +				"fi; " \ +			"fi; " \ +		"else " \ +			"bootm; " \ +		"fi;\0" \  	"netargs=setenv bootargs console=ttymxc0,${baudrate} " \  		"root=/dev/nfs " \  		"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \  	"netboot=echo Booting from net ...; " \  		"run netargs; " \ -		"dhcp ${uimage}; bootm\0" \ +		"if test ${ip_dyn} = yes; then " \ +			"setenv get_cmd dhcp; " \ +		"else " \ +			"setenv get_cmd tftp; " \ +		"fi; " \ +		"${get_cmd} ${uimage}; " \ +		"if test ${boot_fdt} = yes ||  test ${boot_fdt} = try; then " \ +			"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ +				"bootm ${loadaddr} - ${fdt_addr}; " \ +			"else " \ +				"if test ${boot_fdt} = try; then " \ +					"bootm; " \ +				"else " \ +					"echo ERROR: Cannot load the DT; " \ +					"exit; " \ +				"fi; " \ +			"fi; " \ +		"else " \ +			"bootm; " \ +		"fi;\0"  #define CONFIG_BOOTCOMMAND \  	"mmc dev ${mmcdev}; if mmc rescan; then " \ |