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

diff --combined MAINTAINERS
index 00e06b7,7f688c3..5cbc845
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -194,6 -194,10 +194,10 @@@ Niklaus Giger <niklaus.giger@netstal.co
        MCU25           PPC405GPr
        HCU5            PPC440EPx
  
+ Siddarth Gore <gores@marvell.com>
+ 
+       guruplug        ARM926EJS (Kirkwood SoC)
+ 
  Frank Gottschling <fgottschling@eltec.de>
  
        MHPC            MPC8xx
@@@ -368,7 -372,6 +372,7 @@@ Stefan Roese <sr@denx.de
        ebony           PPC440GP
        glacier         PPC460GT
        haleakala       PPC405EXr
 +      icon            PPC440SPe
        katmai          PPC440SPe
        kilauea         PPC405EX
        lwmon5          PPC440EPx
@@@ -739,6 -742,10 +743,10 @@@ Jens Scharsig <esw@bus-elektronik.de
  
        eb_cpux9k2      ARM920T (AT91RM9200 SoC)
  
+ Heiko Schocher <hs@denx.de>
+ 
+       magnesium       i.MX27
+ 
  Robert Schwebel <r.schwebel@pengutronix.de>
  
        csb226          xscale

diff --combined MAKEALL
index 71ae618,326bde0..bb09627
--- 1/MAKEALL
--- 2/MAKEALL
+++ b/MAKEALL
@@@ -186,7 -186,6 +186,7 @@@ LIST_4xx="         
        ADCIOP          \
        alpr            \
        AP1000          \
 +      APC405          \
        AR405           \
        arches          \
        ASH405          \
@@@ -224,7 -223,6 +224,7 @@@
        hcu5            \
        HH405           \
        HUB405          \
 +      icon            \
        intip           \
        JSE             \
        KAREF           \
@@@ -569,8 -567,10 +569,10 @@@ LIST_ARM9="                      
        edb9312                 \
        edb9315                 \
        edb9315a                \
+       guruplug                \
        imx27lite               \
        lpd7a400                \
+       magnesium               \
        mv88f6281gtw_ge         \
        mx1ads                  \
        mx1fs2                  \

diff --combined Makefile
index 5fcbbb2,e49def3..2d96574
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1357,9 -1357,6 +1357,9 @@@ HH405_config:   unconfi
  HUB405_config:        unconfig
        @$(MKCONFIG) $(@:_config=) powerpc ppc4xx hub405 esd
  
 +icon_config:  unconfig
 +      @$(MKCONFIG) $(@:_config=) powerpc ppc4xx icon mosaixtech
 +
  # Compact-Center(codename intip) & DevCon-Center use different U-Boot images
  intip_config \
  devconcenter_config:  unconfig
@@@ -2943,6 -2940,10 +2943,10 @@@ davinci_dm365evm_config :     unconfi
  davinci_dm6467evm_config :    unconfig
        @$(MKCONFIG) $(@:_config=) arm arm926ejs dm6467evm davinci davinci
  
+ guruplug_config: unconfig
+       @$(MKCONFIG) $(@:_config=) arm arm926ejs $(@:_config=) Marvell kirkwood
+ 
+ magnesium_config      \
  imx27lite_config:     unconfig
        @$(MKCONFIG) $(@:_config=) arm arm926ejs imx27lite logicpd mx27
  

diff --combined include/configs/qong.h
index 61acb04,baf8481..1d63b33
--- 1/include/configs/qong.h
--- 2/include/configs/qong.h
+++ b/include/configs/qong.h
@@@ -41,7 -41,7 +41,7 @@@
  /*
   * Size of malloc() pool
   */
- #define CONFIG_SYS_MALLOC_LEN         (CONFIG_ENV_SIZE + 128 * 1024)
+ #define CONFIG_SYS_MALLOC_LEN         (CONFIG_ENV_SIZE + 1024 * 1024)
  /* size in bytes reserved for initial data */
  #define CONFIG_SYS_GBL_DATA_SIZE      128
  
@@@ -52,6 -52,8 +52,8 @@@
  #define CONFIG_MXC_UART       1
  #define CONFIG_SYS_MX31_UART1 1
  
+ #define CONFIG_MX31_GPIO
+ 
  /* FPGA */
  #define CONFIG_QONG_FPGA      1
  #define CONFIG_FPGA_BASE      (CS1_BASE)
@@@ -95,7 -97,7 +97,7 @@@
  #define CONFIG_CMD_DHCP
  #define CONFIG_CMD_NET
  #define CONFIG_CMD_MII
- #define CONFIG_CMD_JFFS2
+ #define CONFIG_CMD_NAND
  
  /*
   * You can compile in a MAC address and your custom net settings by using
@@@ -127,9 -129,9 +129,9 @@@
                " console=ttymxc0,${baudrate}\0"                        \
        "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0"              \
        "addmisc=setenv bootargs ${bootargs}\0"                         \
 -      "uboot_addr=a0000000\0"                                         \
 -      "kernel_addr=a0080000\0"                                        \
 -      "ramdisk_addr=a0300000\0"                                       \
 +      "uboot_addr=A0000000\0"                                         \
 +      "kernel_addr=A00A0000\0"                                        \
 +      "ramdisk_addr=A0300000\0"                                       \
        "u-boot=qong/u-boot.bin\0"                                      \
        "kernel_addr_r=80800000\0"                                      \
        "hostname=qong\0"                                               \
@@@ -172,10 -174,6 +174,10 @@@
  #define CONFIG_SYS_HZ                 1000
  
  #define CONFIG_CMDLINE_EDITING        1
 +#define CONFIG_SYS_HUSH_PARSER                1       /* Use the HUSH parser          */
 +#ifdef        CONFIG_SYS_HUSH_PARSER
 +#define       CONFIG_SYS_PROMPT_HUSH_PS2      "> "
 +#endif
  
  #define CONFIG_MISC_INIT_R    1
  /*-----------------------------------------------------------------------
@@@ -192,6 -190,30 +194,30 @@@
  #define PHYS_SDRAM_1          CSD0_BASE
  #define PHYS_SDRAM_1_SIZE     0x10000000      /* 256 MB */
  
+ /*
+  * NAND driver
+  */
+ 
+ #ifndef __ASSEMBLY__
+ extern void qong_nand_plat_init(void *chip);
+ extern int qong_nand_rdy(void *chip);
+ #endif
+ #define CONFIG_NAND_PLAT
+ #define CONFIG_SYS_MAX_NAND_DEVICE     1
+ #define CONFIG_SYS_NAND_BASE  CS3_BASE
+ #define NAND_PLAT_INIT() qong_nand_plat_init(nand)
+ 
+ #define QONG_NAND_CLE(chip) ((unsigned long)(chip)->IO_ADDR_W | (1 << 24))
+ #define QONG_NAND_ALE(chip) ((unsigned long)(chip)->IO_ADDR_W | (1 << 23))
+ #define QONG_NAND_WRITE(addr, cmd) \
+       do { \
+               __REG8(addr) = cmd; \
+       } while (0)
+ 
+ #define NAND_PLAT_WRITE_CMD(chip, cmd) QONG_NAND_WRITE(QONG_NAND_CLE(chip), cmd)
+ #define NAND_PLAT_WRITE_ADR(chip, cmd) QONG_NAND_WRITE(QONG_NAND_ALE(chip), cmd)
+ #define NAND_PLAT_DEV_READY(chip)      (qong_nand_rdy(chip))
+ 
  /*-----------------------------------------------------------------------
   * FLASH and environment organization
   */
@@@ -206,7 -228,7 +232,7 @@@
  #define       CONFIG_ENV_IS_IN_FLASH  1
  #define CONFIG_ENV_SECT_SIZE  0x20000
  #define CONFIG_ENV_SIZE               CONFIG_ENV_SECT_SIZE
- #define CONFIG_ENV_ADDR               (CONFIG_SYS_FLASH_BASE + 0x40000)
+ #define CONFIG_ENV_ADDR               (CONFIG_SYS_FLASH_BASE + 0x60000)
  
  /* Address and size of Redundant Environment Sector   */
  #define CONFIG_ENV_OFFSET_REDUND      (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
@@@ -225,14 -247,20 +251,20 @@@
  #define CONFIG_SYS_FLASH_PROTECTION           1
  
  /*
-  * JFFS2 partitions
+  * Filesystem
   */
+ #define CONFIG_CMD_JFFS2
+ #define CONFIG_CMD_UBI
+ #define CONFIG_CMD_UBIFS
+ #define CONFIG_RBTREE
+ #define CONFIG_MTD_PARTITIONS
  #define CONFIG_CMD_MTDPARTS
+ #define CONFIG_LZO
  #define CONFIG_MTD_DEVICE             /* needed for mtdparts commands */
  #define CONFIG_FLASH_CFI_MTD
  #define MTDIDS_DEFAULT                "nor0=physmap-flash.0"
  #define MTDPARTS_DEFAULT      \
 -      "mtdparts=physmap-flash.0:256k(U-Boot),128k(env1),"     \
 -      "128k(env2),2560k(kernel),13m(ramdisk),-(user)"
 +      "mtdparts=physmap-flash.0:384k(U-Boot),128k(env1),"     \
 +      "128k(env2),2432k(kernel),13m(ramdisk),-(user)"
  
  #endif /* __CONFIG_H */