leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge git://git.denx.de/u-boot-marvell

Browse Source
This commit is contained in:
Tom Rini
2015-02-16 08:44:03 -05:00
parent 9577639185 43730ba72c
commit 5745f8c4fd
2 changed files with 164 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
include/configs/lsxl.h
View File

@@ -56,6 +56,7 @@
* Commands configuration
*/
#include <config_cmd_default.h>
#define CONFIG_CMD_BOOTZ
#define CONFIG_CMD_DHCP
#define CONFIG_CMD_ELF
#define CONFIG_CMD_ENV
@@ -78,6 +79,9 @@
*/
#include "mv-common.h"
/* loading initramfs images without uimage header */
#define CONFIG_SUPPORT_RAW_INITRD
/* ST M25P40 */
#undef CONFIG_SPI_FLASH_MACRONIX
#define CONFIG_SPI_FLASH_STMICRO
@@ -125,27 +129,31 @@
"hdpart=0:1\0" \
"kernel_addr=0x00800000\0" \
"ramdisk_addr=0x01000000\0" \
"fdt_addr=0x01ff0000\0" \
"fdt_addr=0x00ff0000\0" \
"bootcmd_legacy=ide reset " \
"&& load ide ${hdpart} 0x00100000 /uImage.buffalo " \
"&& load ide ${hdpart} 0x00800000 /initrd.buffalo " \
"&& bootm 0x00100000 0x00800000\0" \
"bootcmd_net=bootp ${kernel_addr} uImage " \
"&& tftpboot ${ramdisk_addr} uInitrd " \
"&& load ide ${hdpart} ${kernel_addr} /uImage.buffalo " \
"&& load ide ${hdpart} ${ramdisk_addr} /initrd.buffalo "\
"&& bootm ${kernel_addr} ${ramdisk_addr}\0" \
"bootcmd_net=bootp ${kernel_addr} vmlinuz " \
"&& tftpboot ${ramdisk_addr} initrd.img " \
"&& setenv ramdisk_len ${filesize} " \
"&& tftpboot ${fdt_addr} " CONFIG_FDTFILE " " \
"&& bootm ${kernel_addr} ${ramdisk_addr} ${fdt_addr}\0" \
"&& bootz ${kernel_addr} " \
"${ramdisk_addr}:${ramdisk_len} ${fdt_addr}\0" \
"bootcmd_hdd=ide reset " \
"&& load ide ${hdpart} ${kernel_addr} /uImage " \
"&& load ide ${hdpart} ${ramdisk_addr} /uInitrd " \
"&& load ide ${hdpart} ${fdt_addr} " \
"/" CONFIG_FDTFILE " " \
"&& bootm ${kernel_addr} ${ramdisk_addr} ${fdt_addr}\0" \
"&& load ide ${hdpart} ${kernel_addr} /vmlinuz " \
"&& load ide ${hdpart} ${ramdisk_addr} /initrd.img " \
"&& setenv ramdisk_len ${filesize} " \
"&& load ide ${hdpart} ${fdt_addr} /dtb " \
"&& bootz ${kernel_addr} " \
"${ramdisk_addr}:${ramdisk_len} ${fdt_addr}\0" \
"bootcmd_usb=usb start " \
"&& load usb 0:1 ${kernel_addr} /uImage " \
"&& load usb 0:1 ${ramdisk_addr} /uInitrd " \
"&& load usb 0:1 ${fdt_addr} " \
"/" CONFIG_FDTFILE " " \
"&& bootm ${kernel_addr} ${ramdisk_addr} ${fdt_addr}\0" \
"&& load usb 0:1 ${kernel_addr} /vmlinuz " \
"&& load usb 0:1 ${ramdisk_addr} /initrd.img " \
"&& setenv ramdisk_len ${filesize} " \
"&& load usb 0:1 ${fdt_addr} " CONFIG_FDTFILE " " \
"&& bootz ${kernel_addr} " \
"${ramdisk_addr}:${ramdisk_len} ${fdt_addr}\0" \
"bootcmd_rescue=run config_nc_dhcp; run nc\0" \
"eraseenv=sf probe 0 " \
"&& sf erase " __stringify(CONFIG_ENV_OFFSET) \