Merge branch 'arm/master' into arm/next

Conflicts:
	board/AtmarkTechno/suzaku/Makefile
	board/amcc/acadia/acadia.c
	board/amcc/katmai/katmai.c
	board/amcc/luan/luan.c
	board/amcc/ocotea/ocotea.c
	board/cm-bf537u/Makefile
	board/cray/L1/L1.c
	board/csb272/csb272.c
	board/csb472/csb472.c
	board/eric/eric.c
	board/eric/init.S
	board/eukrea/cpuat91/Makefile
	board/exbitgen/exbitgen.c
	board/exbitgen/init.S
	board/freescale/mpc8536ds/config.mk
	board/g2000/g2000.c
	board/jse/sdram.c
	board/mpl/mip405/mip405.c
	board/mpl/pip405/pip405.c
	board/netstal/hcu5/hcu5.c
	board/netstal/mcu25/mcu25.c
	board/sc3/sc3.c
	board/w7o/init.S
	board/w7o/w7o.c
	common/cmd_reginfo.c
	cpu/ppc4xx/40x_spd_sdram.c
	cpu/ppc4xx/44x_spd_ddr.c
	doc/README.sbc8548
	drivers/misc/fsl_law.c
	fs/ubifs/ubifs.c
	include/asm-ppc/immap_85xx.h

Signed-off-by: Tom Rix <Tom.Rix@windriver.com>

diff --combined MAKEALL
index c15c811bad16910eee8da1339225fc1e17613cb3,8ff6987a2c1898d5b0d794c7c8a4bcf8b0b0f47b..38cd0768dcb1f2b75df0b46d06ed87027df704a1
--- 1/MAKEALL
--- 2/MAKEALL
+++ b/MAKEALL
@@@ -387,6 -387,9 +387,9 @@@ LIST_83xx="                
  LIST_85xx="           \
        ATUM8548        \
        MPC8536DS       \
+       MPC8536DS_NAND  \
+       MPC8536DS_SDCARD        \
+       MPC8536DS_SPIFLASH      \
        MPC8540ADS      \
        MPC8540EVAL     \
        MPC8541CDS      \
@@@ -546,7 -549,6 +549,7 @@@ LIST_ARM9="                        
        omap1610inn             \
        omap5912osk             \
        omap730p2               \
 +      openrd_base             \
        rd6281a                 \
        sbc2410x                \
        scb9328                 \
@@@ -616,14 -618,11 +619,14 @@@ LIST_at91="                     
        at91sam9260ek           \
        at91sam9261ek           \
        at91sam9263ek           \
 -      at91sam9g10ek   \
 +      at91sam9g10ek           \
        at91sam9g20ek           \
        at91sam9m10g45ek        \
        at91sam9rlek            \
        cmc_pu2                 \
 +      CPUAT91                 \
 +      CPU9260                 \
 +      CPU9G20                 \
        csb637                  \
        kb9202                  \
        meesc                   \

diff --combined Makefile
index 4249d5008639d487e4b77f16d7f6b9723333ca1d,5857b5252db172d4eff9becfeede41ee2d35b9b9..9637643cd5b00b22fe4dbdb2575a864a8cac23a4
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -285,6 -285,7 +285,7 @@@ endi
  ifeq ($(CONFIG_ONENAND_U_BOOT),y)
  ONENAND_IPL = onenand_ipl
  U_BOOT_ONENAND = $(obj)u-boot-onenand.bin
+ ONENAND_BIN ?= $(obj)onenand_ipl/onenand-ipl-2k.bin
  endif
  
  __OBJS := $(subst $(obj),,$(OBJS))
@@@ -378,8 -379,7 +379,7 @@@ $(ONENAND_IPL):    $(TIMESTAMP_FILE) $(VER
                $(MAKE) -C onenand_ipl/board/$(BOARDDIR) all
  
  $(U_BOOT_ONENAND):    $(ONENAND_IPL) $(obj)u-boot.bin
-               cat $(obj)onenand_ipl/onenand-ipl-2k.bin $(obj)u-boot.bin > $(obj)u-boot-onenand.bin
-               cat $(obj)onenand_ipl/onenand-ipl-4k.bin $(obj)u-boot.bin > $(obj)u-boot-flexonenand.bin
+               cat $(ONENAND_BIN) $(obj)u-boot.bin > $(obj)u-boot-onenand.bin
  
  $(VERSION_FILE):
                @( printf '#define U_BOOT_VERSION "U-Boot %s%s"\n' "$(U_BOOT_VERSION)" \
@@@ -2403,20 -2403,7 +2403,7 @@@ MVBLM7_config: unconfi
  sbc8349_config \
  sbc8349_PCI_33_config \
  sbc8349_PCI_66_config: unconfig
-       @mkdir -p $(obj)include
-       @if [ "$(findstring _PCI_,$@)" ] ; then \
-               $(XECHO) -n "... PCI HOST at " ; \
-               echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
-       fi ; \
-       if [ "$(findstring _33_,$@)" ] ; then \
-               $(XECHO) -n "33MHz... " ; \
-               echo "#define PCI_33M" >>$(obj)include/config.h ; \
-       fi ; \
-       if [ "$(findstring _66_,$@)" ] ; then \
-               $(XECHO) -n "66MHz... " ; \
-               echo "#define PCI_66M" >>$(obj)include/config.h ; \
-       fi ;
-       @$(MKCONFIG) -a sbc8349 ppc mpc83xx sbc8349
+       @$(MKCONFIG) -t $(@:_config=) sbc8349 ppc mpc83xx sbc8349
  
  SIMPC8313_LP_config \
  SIMPC8313_SP_config: unconfig
@@@ -2446,6 -2433,9 +2433,9 @@@ vme8349_config:         unconfi
  ATUM8548_config:      unconfig
        @$(MKCONFIG) $(@:_config=) ppc mpc85xx atum8548
  
+ MPC8536DS_NAND_config \
+ MPC8536DS_SDCARD_config \
+ MPC8536DS_SPIFLASH_config \
  MPC8536DS_36BIT_config \
  MPC8536DS_config:       unconfig
        @$(MKCONFIG) -t $(@:_config=) MPC8536DS ppc mpc85xx mpc8536ds freescale
@@@ -2701,12 -2691,6 +2691,12 @@@ at91rm9200ek_config   :       unconfi
  cmc_pu2_config        :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t cmc_pu2 NULL at91rm9200
  
 +CPUAT91_RAM_config \
 +CPUAT91_config        :       unconfig
 +      @mkdir -p $(obj)include
 +      @echo "#define CONFIG_$(@:_config=) 1"  >$(obj)include/config.h
 +      @$(MKCONFIG) -a cpuat91 arm arm920t cpuat91 eukrea at91rm9200
 +
  csb637_config :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t csb637 NULL at91rm9200
  
@@@ -2837,14 -2821,6 +2827,14 @@@ at91sam9rlek_config   :       unconfi
        fi;
        @$(MKCONFIG) -a at91sam9rlek arm arm926ejs at91sam9rlek atmel at91
  
 +CPU9G20_128M_config \
 +CPU9G20_config \
 +CPU9260_128M_config \
 +CPU9260_config        :       unconfig
 +      @mkdir -p $(obj)include
 +      @echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h
 +      @$(MKCONFIG) -a cpu9260 arm arm926ejs cpu9260 eukrea at91
 +
  meesc_config  :       unconfig
        @$(MKCONFIG) $(@:_config=) arm arm926ejs meesc esd at91
  
@@@ -3000,9 -2976,6 +2990,9 @@@ omap1610h2_cs_autoboot_config:  unconfi
  omap5912osk_config :  unconfig
        @$(MKCONFIG) $(@:_config=) arm arm926ejs omap5912osk ti omap
  
 +openrd_base_config: unconfig
 +      @$(MKCONFIG) $(@:_config=) arm arm926ejs $(@:_config=) Marvell kirkwood
 +
  xtract_omap730p2 = $(subst _cs0boot,,$(subst _cs3boot,, $(subst _config,,$1)))
  
  omap730p2_config \
@@@ -3240,8 -3213,6 +3230,6 @@@ zylonite_config 
  #########################################################################
  
  apollon_config                : unconfig
-       @mkdir -p $(obj)include
-       @mkdir -p $(obj)onenand_ipl/board/apollon
        @echo "#define CONFIG_ONENAND_U_BOOT" > $(obj)include/config.h
        @$(MKCONFIG) $(@:_config=) arm arm1136 apollon NULL omap24xx
        @echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk
@@@ -3723,7 -3694,8 +3711,8 @@@ clean
               $(obj)cpu/blackfin/bootrom-asm-offsets.[chs]
        @rm -f $(obj)include/bmp_logo.h
        @rm -f $(obj)nand_spl/{u-boot.lds,u-boot-spl,u-boot-spl.map,System.map}
-       @rm -f $(obj)onenand_ipl/onenand-{ipl,ipl.bin,ipl-2k.bin,ipl-4k.bin,ipl.map}
+       @rm -f $(obj)onenand_ipl/onenand-{ipl,ipl.bin,ipl.map}
+       @rm -f $(ONENAND_BIN)
        @rm -f $(obj)onenand_ipl/u-boot.lds
        @rm -f $(TIMESTAMP_FILE) $(VERSION_FILE)
        @find $(OBJTREE) -type f \