sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

arm: ti-armv7-common: Fix NAND and MMC boot command 

When porting the NAND and MMC boot CMD it was developer
error not porting over the contents of the NAND and MMC
boot commands as they existed in the tree.

Therefore need to update the common boot commands to what
was already available for the platforms.

Also removed the NANDARGS from the platform files so that
they do not cause confusion.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
[trini: Add omap5_common.h change]
Signed-off-by: Tom Rini <trini@ti.com>
This commit is contained in:
Dan Murphy 2013-12-11 08:21:00 -06:00 committed by Tom Rini
parent f5d5782636
commit 4c677486ec
5 changed files with 10 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/configs/am335x_evm.h
View File

@ -258,22 +258,6 @@
#define CONFIG_CMD_SPL_WRITE_SIZE 0x2000
#endif
#endif
/* NAND: u-boot configs */
#define NANDARGS \
"mtdids=" MTDIDS_DEFAULT "\0" \
"mtdparts=" MTDPARTS_DEFAULT "\0" \
"nandargs=setenv bootargs console=${console} " \
"${optargs} " \
"root=${nandroot} " \
"rootfstype=${nandrootfstype}\0" \
"dfu_alt_info_nand=" DFU_ALT_INFO_NAND "\0" \
"nandroot=ubi0 rw ubi.mtd=9,2048\0" \
"nandrootfstype=ubifs rootwait=1\0" \
"nandboot=echo Booting from nand ...; " \
"run nandargs; " \
"nand read ${fdtaddr} u-boot-spl-os; " \
"nand read ${loadaddr} kernel; " \
"bootz ${loadaddr} - ${fdtaddr}\0"
#else
#define NANDARGS ""
#endif /* !CONFIG_NAND */

16
include/configs/am43xx_evm.h
View File

@ -319,22 +319,6 @@
#define CONFIG_CMD_SPL_WRITE_SIZE 0x2000
#endif
#endif
/* NAND: u-boot configs */
#define NANDARGS \
"mtdids=" MTDIDS_DEFAULT "\0" \
"mtdparts=" MTDPARTS_DEFAULT "\0" \
"nandargs=setenv bootargs console=${console} " \
"${optargs} " \
"root=${nandroot} " \
"rootfstype=${nandrootfstype}\0" \
"dfu_alt_info_nand=" DFU_ALT_INFO_NAND "\0" \
"nandroot=ubi0 rw ubi.mtd=9,4096\0" \
"nandrootfstype=ubifs rootwait=1\0" \
"nandboot=echo Booting from nand ...; " \
"run nandargs; " \
"nand read ${fdtaddr} u-boot-spl-os; " \
"nand read ${loadaddr} kernel; " \
"bootz ${loadaddr} - ${fdtaddr}\0"
#else
#define NANDARGS ""
#endif /* !CONFIG_NAND */

18
include/configs/dra7xx_evm.h
View File

@ -158,24 +158,6 @@
#define CONFIG_CMD_SPL_WRITE_SIZE 0x2000
#endif
#endif
/* NAND: u-boot configs */
#define NANDARGS \
"mtdids=" MTDIDS_DEFAULT "\0" \
"mtdparts=" MTDPARTS_DEFAULT "\0" \
"nandargs=setenv bootargs console=${console} " \
"${optargs} " \
"root=${nandroot} " \
"rootfstype=${nandrootfstype}\0" \
"dfu_alt_info_nand=" DFU_ALT_INFO_NAND "\0" \
"nandroot=ubi0 rw ubi.mtd=9,2048\0" \
"nandrootfstype=ubifs rootwait=1\0" \
"nandsrcaddr=0x300000\0" \
"nandboot=echo Booting from nand ...; " \
"run nandargs; " \
"nand read ${loadaddr} ${nandsrcaddr} ${nandimgsize}; " \
"bootm ${loadaddr}\0" \
"nandimgsize=0x500000\0"
#else
#define NANDARGS ""
#endif /* !CONFIG_NAND */

1
include/configs/omap5_common.h
View File

@ -125,6 +125,7 @@
FIND_FDT_FILE \
BOOTCMD_COMMON \
BOOTCMD_MMC \
BOOTCMD_NAND \
BOOTCMD_USB
/*

15
include/configs/ti_armv7_common.h
View File

@ -228,7 +228,6 @@
"if load ${devtype} ${devnum}:${rootpart} ${loadaddr} ${bootdir}/${bootfile}; then " \
"run findfdt; " \
"load ${devtype} ${devnum}:${rootpart} ${fdtaddr} ${bootdir}/${fdtfile};" \
"bootz ${loadaddr} - ${fdtaddr}; " \
"fi;\0" \
\
"scan_boot=" \
@ -255,6 +254,7 @@
"if usb dev 0; then " \
"run usbargs;" \
"run scan_boot; " \
"bootz ${loadaddr} - ${fdtaddr}; " \
"fi\0" \
"bootcmd_usb=setenv devnum 0; run usb_boot;\0"
@ -265,6 +265,10 @@
"if mmc dev ${devnum}; then " \
"run mmcargs;" \
"run scan_boot; " \
"run mmcboot;" \
"setenv mmcdev 1; " \
"setenv bootpart 1:2; " \
"run mmcboot;" \
"fi\0" \
"bootcmd_mmc0=setenv devnum 0; setenv rootpart 2; run mmc_boot;\0" \
@ -283,14 +287,13 @@
"root=${nandroot} " \
"rootfstype=${nandrootfstype}\0" \
"dfu_alt_info_nand=" DFU_ALT_INFO_NAND "\0" \
"nandroot=ubi0:rootfs rw ubi.mtd=7,2048\0" \
"nandroot=ubi0:rootfs rw ubi.mtd=9,2048\0" \
"nandrootfstype=ubifs rootwait=1\0" \
"nandsrcaddr=0x280000\0" \
"nandboot=echo Booting from nand ...; " \
"run nandargs; " \
"nand read ${loadaddr} ${nandsrcaddr} ${nandimgsize}; " \
"bootz ${loadaddr}\0" \
"nandimgsize=0x500000\0" \
"nand read ${fdtaddr} u-boot-spl-os; " \
"nand read ${loadaddr} kernel; " \
"bootz ${loadaddr} - ${fdtaddr}\0" \
"bootcmd_nand=run nandboot;\0"
#define CONFIG_BOOTCOMMAND \