diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2014-10-20 15:31:17 +0200 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2014-10-23 11:11:04 +0200 |
| commit | 7b443ec768337bba7a9556d2ba2c7e156569e09b (patch) | |
| tree | 3b3594ca178de6cd7fe9723e246d2cc95c794e77 | |
| parent | 68870e53cb0087becd86119005417987201e2ef6 (diff) | |
colibri_vf: fix environment for NFS/SD-Boot
Switch to zImage for SD and NFS-Boot. Explicitly define the load
address in all commands.
| -rw-r--r-- | include/configs/colibri_vf.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index dcef92e6fb..0051016548 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -43,8 +43,10 @@ /* Allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG +#define CONFIG_VERSION_VARIABLE #define CONFIG_SYS_UART_PORT (0) #define CONFIG_BAUDRATE 115200 +#define CONFIG_CMD_ASKENV /* NAND support */ #define CONFIG_CMD_WRITEBCB @@ -78,6 +80,8 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_CMD_FAT +#define CONFIG_CMD_EXT3 +#define CONFIG_CMD_EXT4 #define CONFIG_DOS_PARTITION #define CONFIG_RBTREE @@ -109,7 +113,10 @@ #define CONFIG_LOADADDR 0x80008000 #define CONFIG_FDTADDR 0x84000000 + +/* We boot from the gfxRAM area of the OCRAM. */ #define CONFIG_SYS_TEXT_BASE 0x3f408000 +#define CONFIG_BOARD_SIZE_LIMIT 524288 #define DEFAULT_BOOTCOMMAND \ "run ubiboot; run nfsboot" @@ -118,13 +125,13 @@ "run setup; " \ "setenv bootargs ${defargs} ${mmcargs} ${mtdparts} ${setupargs}; " \ "echo Booting from MMC/SD card...; " \ - "mmc part 0; fatload mmc 0:1 ${kernel_addr_r} uImage && bootm" + "load mmc 0:2 ${kernel_addr_r} /boot/zImage && bootz ${kernel_addr_r}" #define NFS_BOOTCMD \ "run setup; " \ "setenv bootargs ${defargs} ${nfsargs} ${mtdparts} ${setupargs}; " \ "echo Booting from NFS...; " \ - "dhcp && bootm" + "dhcp ${kernel_addr_r} && bootz" #define UBI_LOADCMD \ "ubi part ubi && ubifsmount ubi0:rootfs && " \ @@ -223,4 +230,4 @@ #define CONFIG_SYS_NO_FLASH -#endif +#endif /* __CONFIG_H */ |