diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-04-27 13:03:26 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-04-29 14:12:10 +0200 |
| commit | e654fac2e6914cb27ae2cb855db5484bde38e107 (patch) | |
| tree | a4c8c2b705a1482cb212164e48dd09693ddef362 /arch | |
| parent | 415d386877df49eb051b85ef74fa59a16dc17c7d (diff) | |
| parent | 02b233ecb129d69f8e234f94fd96a012caed880b (diff) | |
| download | u-boot-imx-e654fac2e6914cb27ae2cb855db5484bde38e107.zip u-boot-imx-e654fac2e6914cb27ae2cb855db5484bde38e107.tar.gz u-boot-imx-e654fac2e6914cb27ae2cb855db5484bde38e107.tar.bz2 | |
Merge branch 'marex@denx.de' of git://git.denx.de/u-boot-staging
* 'marex@denx.de' of git://git.denx.de/u-boot-staging:
CMD: CONFIG_CMD_SETECPR -> CONFIG_CMD_SETEXPR on omap3_logic
CMD: Fix CONFIG_CMD_SAVEBP_WRITE_SIZE -> CONFIG_CMD_SPL_WRITE_SIZE
CMD: Fix typo CMD_FSL -> CMD_MFSL in readme
HWW1U1A: Fix CMD_SHA1 -> CMD_SHA1SUM
CMD: Remove CMD_LOG, it's unused
CMD: Fix typo KGBD -> KGDB on debris board
CMD: Drop CONFIG_CMD_EMMC, it's not used
CMD: Drop CONFIG_CMD_DFL, it's not used
CMD: Drop CMD_DCR, it's not used
CMD: Drop CMD_CAN, it's not used
CMD: Remove CMD_AUTOSCRIPT, it's not used
AT91: Drop AT91_SPIMUX command from cmd_all
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/spl_nand.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/spl_nand.c b/arch/arm/cpu/armv7/omap-common/spl_nand.c index 1295e88..8cf55c9 100644 --- a/arch/arm/cpu/armv7/omap-common/spl_nand.c +++ b/arch/arm/cpu/armv7/omap-common/spl_nand.c @@ -54,7 +54,7 @@ void spl_nand_load_image(void) * load parameter image * load to temp position since nand_spl_load_image reads * a whole block which is typically larger than - * CONFIG_CMD_SAVEBP_WRITE_SIZE therefore may overwrite + * CONFIG_CMD_SPL_WRITE_SIZE therefore may overwrite * following sections like BSS */ nand_spl_load_image(CONFIG_CMD_SPL_NAND_OFS, |