Merge branch 'next' of ../next

diff --combined Makefile
index f06a97cf3e361dc321784be94a8922545c8e5ad0,75b2c1e4583ff2cc1e0a6b5f9731231f716691e7..536ccb3e32fc33cd3d47d8e16d7cb92c6f9cc1ae
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -24,7 -24,7 +24,7 @@@
  VERSION = 2009
  PATCHLEVEL = 11
  SUBLEVEL =
 -EXTRAVERSION = -rc2
 +EXTRAVERSION =
  ifneq "$(SUBLEVEL)" ""
  U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
  else
@@@ -606,6 -606,9 +606,9 @@@ jupiter_config:    unconfi
  inka4x0_config:       unconfig
        @$(MKCONFIG) inka4x0 ppc mpc5xxx inka4x0
  
+ ipek01_config: unconfig
+       @$(MKCONFIG) -a ipek01 ppc mpc5xxx ipek01
+ 
  lite5200b_config      \
  lite5200b_PM_config   \
  lite5200b_LOWBOOT_config:     unconfig
@@@ -2693,6 -2696,9 +2696,9 @@@ shannon_config  :       unconfi
  ## ARM92xT Systems
  #########################################################################
  
+ a320evb_config        :       unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm920t a320evb faraday a320
+ 
  #########################################################################
  ## Atmel AT91RM9200 Systems
  #########################################################################
@@@ -2927,6 -2933,9 +2933,9 @@@ cp922_XA10_config       
  cp1026_config: unconfig
        @board/armltd/integrator/split_by_variant.sh cp $@
  
+ da830evm_config:      unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs da830evm davinci davinci
+ 
  davinci_dvevm_config :        unconfig
        @$(MKCONFIG) $(@:_config=) arm arm926ejs dvevm davinci davinci
  

diff --combined drivers/mtd/nand/nand_util.c
index 61bf7e6847fc3a50b7636bc87b770f028b8a9a60,df7f1400f3aa3f49c663f89497c5fadb56581cfe..29c42f73b1cc4c3c2131a332e68763937ed49585
--- 1/drivers/mtd/nand/nand_util.c
--- 2/drivers/mtd/nand/nand_util.c
+++ b/drivers/mtd/nand/nand_util.c
@@@ -41,10 -41,6 +41,6 @@@
  #include <nand.h>
  #include <jffs2/jffs2.h>
  
- #if !defined(CONFIG_SYS_64BIT_VSPRINTF)
- #warning Please define CONFIG_SYS_64BIT_VSPRINTF for correct output!
- #endif
- 
  typedef struct erase_info erase_info_t;
  typedef struct mtd_info         mtd_info_t;
  
@@@ -490,7 -486,7 +486,7 @@@ int nand_write_skip_bad(nand_info_t *na
  
        len_incl_bad = get_len_incl_bad (nand, offset, *length);
  
 -      if ((offset + len_incl_bad) >= nand->size) {
 +      if ((offset + len_incl_bad) > nand->size) {
                printf ("Attempt to write outside the flash area\n");
                return -EINVAL;
        }
@@@ -562,7 -558,7 +558,7 @@@ int nand_read_skip_bad(nand_info_t *nan
  
        len_incl_bad = get_len_incl_bad (nand, offset, *length);
  
 -      if ((offset + len_incl_bad) >= nand->size) {
 +      if ((offset + len_incl_bad) > nand->size) {
                printf ("Attempt to read outside the flash area\n");
                return -EINVAL;
        }

diff --combined include/configs/imx27lite.h
index c639e5b6da7d57f18957e2aed1bcc63e3e1b75e7,e219cccc95b435a3c6fcfbc0e622d6d67208ce8c..ee749ecd2f62938073e2c7001eec82516d2eab44
--- 1/include/configs/imx27lite.h
--- 2/include/configs/imx27lite.h
+++ b/include/configs/imx27lite.h
@@@ -145,7 -145,6 +145,7 @@@
  /*
   * MTD
   */
 +#define CONFIG_FLASH_CFI_MTD
  #define CONFIG_MTD_DEVICE
  
  /*
@@@ -157,6 -156,7 +157,7 @@@
  #define CONFIG_SYS_NAND_BASE          0xd8000000
  #define CONFIG_JFFS2_NAND
  #define CONFIG_MXC_NAND_HWECC
+ #define CONFIG_SYS_64BIT_VSPRINTF     /* needed for nand_util.c */
  
  /*
   * SD/MMC