diff options
| author | Tom Rini <trini@konsulko.com> | 2016-03-14 19:21:35 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-03-14 19:21:35 -0400 |
| commit | 9f0f432c0aea1e70959a0c06938459d3175a36b0 (patch) | |
| tree | d4defc694c7082dca158535811b09dbfcfda9d16 | |
| parent | 0ea6cc125312ce31dca769a6e118bcceeb320529 (diff) | |
| parent | a807369eded75b34f5184552dab00ff73e7ca3bc (diff) | |
| download | u-boot-imx-9f0f432c0aea1e70959a0c06938459d3175a36b0.zip u-boot-imx-9f0f432c0aea1e70959a0c06938459d3175a36b0.tar.gz u-boot-imx-9f0f432c0aea1e70959a0c06938459d3175a36b0.tar.bz2 | |
Merge git://git.denx.de/u-boot-marvell
| -rw-r--r-- | include/configs/sheevaplug.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index ebc3d64..c529636 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -60,12 +60,12 @@ */ #define CONFIG_BOOTCOMMAND "${x_bootcmd_kernel}; " \ "setenv bootargs ${x_bootargs} ${x_bootargs_root}; " \ - "${x_bootcmd_usb}; bootm 0x6400000;" + "bootm 0x6400000;" #define CONFIG_MTDPARTS \ - "mtdparts=orion_nand:512K(uboot)," \ + "orion_nand:512K(uboot)," \ "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" \ "=ttyS0,115200 mtdparts="CONFIG_MTDPARTS \ |