diff options
| -rw-r--r-- | .gitignore | 8 | ||||
| -rw-r--r-- | board/spd8xx/u-boot.lds | 1 | ||||
| -rw-r--r-- | common/cmd_nand.c | 2 | ||||
| -rw-r--r-- | common/env_nand.c | 8 |
4 files changed, 8 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore index 8ec3d06c3e..34a2ca96fc 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ *~ *.swp *.patch +*.bin # # Top-level generic files @@ -23,14 +24,15 @@ /u-boot.hex /u-boot.imx /u-boot.map -/u-boot.bin /u-boot.srec /u-boot.ldr /u-boot.ldr.hex /u-boot.ldr.srec +/u-boot.img +/u-boot.kwb +/u-boot.sha1 +/u-boot.dis /u-boot.lds -/u-boot-onenand.bin -/u-boot-flexonenand.bin # # Generated files diff --git a/board/spd8xx/u-boot.lds b/board/spd8xx/u-boot.lds index 950e1e6e2c..a84e7fd35b 100644 --- a/board/spd8xx/u-boot.lds +++ b/board/spd8xx/u-boot.lds @@ -36,7 +36,6 @@ SECTIONS arch/powerpc/cpu/mpc8xx/traps.o (.text*) net/libnet.o (.text*) arch/powerpc/cpu/mpc8xx/libmpc8xx.o (.text*) - board/spd8xx/libspd8xx.o (.text*) *(.text.v*printf) . = DEFINED(env_offset) ? env_offset : .; diff --git a/common/cmd_nand.c b/common/cmd_nand.c index 7bd37de78d..44c4d1f89c 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -693,7 +693,7 @@ U_BOOT_CMD( " write 'size' bytes starting at offset 'off' with yaffs format\n" " from memory address 'addr', skipping bad blocks.\n" #endif - "nand erase[.spread] [clean] [off [size]] - erase 'size' bytes " + "nand erase[.spread] [clean] off size - erase 'size' bytes " "from offset 'off'\n" " With '.spread', erase enough for given file size, otherwise,\n" " 'size' includes skipped bad blocks.\n" diff --git a/common/env_nand.c b/common/env_nand.c index 980425a8ee..14446a6a57 100644 --- a/common/env_nand.c +++ b/common/env_nand.c @@ -193,10 +193,8 @@ int saveenv(void) int ret = 0; nand_erase_options_t nand_erase_options; + memset(&nand_erase_options, 0, sizeof(nand_erase_options)); nand_erase_options.length = CONFIG_ENV_RANGE; - nand_erase_options.quiet = 0; - nand_erase_options.jffs2 = 0; - nand_erase_options.scrub = 0; if (CONFIG_ENV_RANGE < CONFIG_ENV_SIZE) return 1; @@ -249,10 +247,8 @@ int saveenv(void) char *res; nand_erase_options_t nand_erase_options; + memset(&nand_erase_options, 0, sizeof(nand_erase_options)); nand_erase_options.length = CONFIG_ENV_RANGE; - nand_erase_options.quiet = 0; - nand_erase_options.jffs2 = 0; - nand_erase_options.scrub = 0; nand_erase_options.offset = CONFIG_ENV_OFFSET; if (CONFIG_ENV_RANGE < CONFIG_ENV_SIZE) |