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 2016-03-14 19:21:35 -04:00
commit 9f0f432c0a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/configs/sheevaplug.h
View File

@ -60,12 +60,12 @@
*/ */
#define CONFIG_BOOTCOMMAND "${x_bootcmd_kernel}; " \ #define CONFIG_BOOTCOMMAND "${x_bootcmd_kernel}; " \
"setenv bootargs ${x_bootargs} ${x_bootargs_root}; " \ "setenv bootargs ${x_bootargs} ${x_bootargs_root}; " \
"${x_bootcmd_usb}; bootm 0x6400000;" "bootm 0x6400000;"
#define CONFIG_MTDPARTS \ #define CONFIG_MTDPARTS \
"mtdparts=orion_nand:512K(uboot)," \ "orion_nand:512K(uboot)," \
"512K(env),1M(script),6M(kernel)," \ "512K(env),1M(script),6M(kernel)," \
"12M(ramdisk),4M(spare),-(rootfs)" "12M(ramdisk),4M(spare),-(rootfs)\0"
#define CONFIG_EXTRA_ENV_SETTINGS "x_bootargs=console" \ #define CONFIG_EXTRA_ENV_SETTINGS "x_bootargs=console" \
"=ttyS0,115200 mtdparts="CONFIG_MTDPARTS \ "=ttyS0,115200 mtdparts="CONFIG_MTDPARTS \