Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

* 'master' of git://git.denx.de/u-boot-mpc85xx:
  powerpc/fsl_pci: Fix device tree fixups for newer platforms

diff --git a/.gitignore b/.gitignore
index 8ec3d06c3ee0092cccdc11aa7dc4d296c010ac2f..34a2ca96fc7599d7863b74b7d71ffe2daa7d7681 100644 (file)
--- 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 950e1e6e2cb8af441c37015cab6392fc794ef77d..a84e7fd35b90df98ba5678787e42a5671fe5fbff 100644 (file)
--- 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 7bd37de78dee9e717f4c521c2eeaa51fe2825de3..44c4d1f89ce2b2e189d275ee297e7090835f5805 100644 (file)
--- 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 980425a8ee8df5d4592cf25a53170dbdd2b8813e..14446a6a5793ce0d37016d7a883445815517d479 100644 (file)
--- 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)