Merge git://www.denx.de/git/u-boot

Conflicts:

	drivers/Makefile

diff --combined Makefile
index 86bc753,ac4b430..fd973f8
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,5 -1,5 +1,5 @@@
  #
- # (C) Copyright 2000-2006
+ # (C) Copyright 2000-2007
  # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  #
  # See file CREDITS for list of people who contributed to this
@@@ -24,7 -24,7 +24,7 @@@
  VERSION = 1
  PATCHLEVEL = 3
  SUBLEVEL = 0
- EXTRAVERSION = -rc2
+ EXTRAVERSION =
  U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
  VERSION_FILE = $(obj)include/version_autogenerated.h
  
@@@ -152,9 -152,6 +152,9 @@@ endi
  ifeq ($(ARCH),avr32)
  CROSS_COMPILE = avr32-linux-
  endif
 +ifeq ($(ARCH),sh)
 +CROSS_COMPILE = sh4-linux-
 +endif
  endif
  endif
  
@@@ -214,6 -211,7 +214,7 @@@ LIBS += drivers/libdrivers.
  LIBS += drivers/bios_emulator/libatibiosemu.a
  LIBS += drivers/nand/libnand.a
  LIBS += drivers/nand_legacy/libnand_legacy.a
+ LIBS += drivers/onenand/libonenand.a
  LIBS += drivers/net/libnet.a
  ifeq ($(CPU),mpc83xx)
  LIBS += drivers/qe/qe.a
@@@ -395,7 -393,7 +396,7 @@@ BC3450_config:     unconfi
  cpci5200_config:  unconfig
        @$(MKCONFIG) -a cpci5200  ppc mpc5xxx cpci5200 esd
  
- hmi1001_config:         unconfig
+ hmi1001_config:       unconfig
        @$(MKCONFIG) hmi1001 ppc mpc5xxx hmi1001
  
  Lite5200_config                               \
@@@ -437,7 -435,7 +438,7 @@@ icecube_5100_config:                       unconfi
                }
        @$(MKCONFIG) -a IceCube ppc mpc5xxx icecube
  
- jupiter_config:         unconfig
+ jupiter_config:       unconfig
        @$(MKCONFIG) jupiter ppc mpc5xxx jupiter
  
  v38b_config: unconfig
@@@ -642,9 -640,9 +643,9 @@@ TQM5200_STK100_config:     unconfi
                { echo "TEXT_BASE = 0xFFF00000" >$(obj)board/tqm5200/config.tmp ; \
                }
        @$(MKCONFIG) -n $@ -a TQM5200 ppc mpc5xxx tqm5200
- uc101_config:         unconfig
+ uc101_config:         unconfig
        @$(MKCONFIG) uc101 ppc mpc5xxx uc101
- motionpro_config:         unconfig
+ motionpro_config:     unconfig
        @$(MKCONFIG) motionpro ppc mpc5xxx motionpro
  
  
@@@ -932,7 -930,7 +933,7 @@@ RPXlite_DW_NVRAM_config            
  RPXlite_DW_NVRAM_64_config      \
  RPXlite_DW_NVRAM_LCD_config   \
  RPXlite_DW_NVRAM_64_LCD_config  \
- RPXlite_DW_config:         unconfig
+ RPXlite_DW_config:    unconfig
        @mkdir -p $(obj)include
        @ >$(obj)include/config.h
        @[ -z "$(findstring _64,$@)" ] || \
@@@ -1735,9 -1733,13 +1736,13 @@@ M54455EVB_i66_config :        unconfi
        >include/config.h ; \
        if [ "$${FLASH}" == "INTEL" ] ; then \
                echo "#undef CFG_ATMEL_BOOT" >> $(obj)include/config.h ; \
+               echo "TEXT_BASE = 0x00000000" > $(obj)board/freescale/m54455evb/config.tmp ; \
+               cp $(obj)board/freescale/m54455evb/u-boot.int $(obj)board/freescale/m54455evb/u-boot.lds ; \
                echo "... with INTEL boot..." ; \
        else \
                echo "#define CFG_ATMEL_BOOT"   >> $(obj)include/config.h ; \
+               echo "TEXT_BASE = 0x04000000" > $(obj)board/freescale/m54455evb/config.tmp ; \
+               cp $(obj)board/freescale/m54455evb/u-boot.atm $(obj)board/freescale/m54455evb/u-boot.lds ; \
                echo "... with ATMEL boot..." ; \
        fi; \
        echo "#define CFG_INPUT_CLKSRC $${FREQ}" >> $(obj)include/config.h ; \
@@@ -1768,7 -1770,8 +1773,8 @@@ MPC8323ERDB_config:     unconfi
  MPC832XEMDS_config \
  MPC832XEMDS_HOST_33_config \
  MPC832XEMDS_HOST_66_config \
- MPC832XEMDS_SLAVE_config:     unconfig
+ MPC832XEMDS_SLAVE_config \
+ MPC832XEMDS_ATM_config:       unconfig
        @mkdir -p $(obj)include
        @echo "" >$(obj)include/config.h ; \
        if [ "$(findstring _HOST_,$@)" ] ; then \
@@@ -1783,10 -1786,17 +1789,17 @@@
        if [ "$(findstring _33_,$@)" ] ; then \
                echo -n "...33M ..." ; \
                echo "#define PCI_33M" >>$(obj)include/config.h ; \
+               echo "#define CONFIG_PQ_MDS_PIB 1" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _66_,$@)" ] ; then \
                echo -n "...66M..." ; \
                echo "#define PCI_66M" >>$(obj)include/config.h ; \
+               echo "#define CONFIG_PQ_MDS_PIB 1" >>$(obj)include/config.h ; \
+       fi ; \
+       if [ "$(findstring _ATM_,$@)" ] ; then \
+               echo -n "...ATM..." ; \
+               echo "#define CONFIG_PQ_MDS_PIB 1" >>$(obj)include/config.h ; \
+               echo "#define CONFIG_PQ_MDS_PIB_ATM     1" >>$(obj)include/config.h ; \
        fi ;
        @$(MKCONFIG) -a MPC832XEMDS ppc mpc83xx mpc832xemds freescale
  
@@@ -1810,7 -1820,8 +1823,8 @@@ MPC8349ITXGP_config:    unconfi
  MPC8360EMDS_config \
  MPC8360EMDS_HOST_33_config \
  MPC8360EMDS_HOST_66_config \
- MPC8360EMDS_SLAVE_config:     unconfig
+ MPC8360EMDS_SLAVE_config \
+ MPC8360EMDS_ATM_config: unconfig
        @mkdir -p $(obj)include
        @echo "" >$(obj)include/config.h ; \
        if [ "$(findstring _HOST_,$@)" ] ; then \
@@@ -1825,10 -1836,17 +1839,17 @@@
        if [ "$(findstring _33_,$@)" ] ; then \
                echo -n "...33M ..." ; \
                echo "#define PCI_33M" >>$(obj)include/config.h ; \
+               echo "#define CONFIG_PQ_MDS_PIB 1" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _66_,$@)" ] ; then \
                echo -n "...66M..." ; \
                echo "#define PCI_66M" >>$(obj)include/config.h ; \
+               echo "#define CONFIG_PQ_MDS_PIB 1" >>$(obj)include/config.h ; \
+       fi ; \
+       if [ "$(findstring _ATM_,$@)" ] ; then \
+               echo -n "...ATM..." ; \
+               echo "#define CONFIG_PQ_MDS_PIB 1" >>$(obj)include/config.h ; \
+               echo "#define CONFIG_PQ_MDS_PIB_ATM     1" >>$(obj)include/config.h ; \
        fi ;
        @$(MKCONFIG) -a MPC8360EMDS ppc mpc83xx mpc8360emds freescale
  
@@@ -1987,13 -2005,13 +2008,13 @@@ AmigaOneG3SE_config: unconfi
  BAB7xx_config: unconfig
        @$(MKCONFIG) $(@:_config=) ppc 74xx_7xx bab7xx eltec
  
- CPCI750_config:        unconfig
+ CPCI750_config:       unconfig
        @$(MKCONFIG) CPCI750 ppc 74xx_7xx cpci750 esd
  
- DB64360_config:  unconfig
+ DB64360_config:       unconfig
        @$(MKCONFIG) DB64360 ppc 74xx_7xx db64360 Marvell
  
- DB64460_config:  unconfig
+ DB64460_config:       unconfig
        @$(MKCONFIG) DB64460 ppc 74xx_7xx db64460 Marvell
  
  ELPPC_config: unconfig
@@@ -2595,23 -2613,6 +2616,23 @@@ atstk1002_config      :       unconfi
  #########################################################################
  #########################################################################
  
 +#########################################################################
 +## sh4 (Renesas SuperH)
 +#########################################################################
 +ms7750se_config: unconfig
 +      @ >include/config.h
 +      @echo "#define CONFIG_MS7750SE 1" >> include/config.h
 +      @./mkconfig -a $(@:_config=) sh sh4 ms7750se
 +
 +ms7722se_config :       unconfig
 +      @ >include/config.h
 +      @echo "#define CONFIG_MS7722SE 1" >> include/config.h
 +      @./mkconfig -a $(@:_config=) sh sh4 ms7722se
 +
 +#########################################################################
 +#########################################################################
 +#########################################################################
 +
  clean:
        find $(OBJTREE) -type f \
                \( -name 'core' -o -name '*.bak' -o -name '*~' \

diff --combined common/cmd_bootm.c
index 2fa906b,d816349..9546729
--- 1/common/cmd_bootm.c
--- 2/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@@ -260,8 -260,6 +260,8 @@@ int do_bootm (cmd_tbl_t *cmdtp, int fla
        if (hdr->ih_arch != IH_CPU_NIOS2)
  #elif defined(__PPC__)
        if (hdr->ih_arch != IH_CPU_PPC)
 +#elif defined(__sh__)
 +      if (hdr->ih_arch != IH_CPU_SH)
  #else
  # error Unknown CPU type
  #endif
@@@ -468,7 -466,7 +468,7 @@@ U_BOOT_CMD
        "\t'arg' can be the address of an initrd image\n"
  #if defined(CONFIG_OF_FLAT_TREE) || defined(CONFIG_OF_LIBFDT)
        "\tWhen booting a Linux kernel which requires a flat device-tree\n"
-       "\ta third argument is required which is the address of the of the\n"
+       "\ta third argument is required which is the address of the\n"
        "\tdevice-tree blob. To boot that kernel without an initrd image,\n"
        "\tuse a '-' for the second argument. If you do not pass a third\n"
        "\ta bd_info struct will be passed instead\n"

diff --combined common/cmd_ide.c
index 456640a,2202009..2e45b70
--- 1/common/cmd_ide.c
--- 2/common/cmd_ide.c
+++ b/common/cmd_ide.c
@@@ -54,10 -54,6 +54,6 @@@
  
  #ifndef __PPC__
  #include <asm/io.h>
- #ifdef __MIPS__
- /* Macros depend on this variable */
- unsigned long mips_io_port_base = 0;
- #endif
  #endif
  
  #ifdef CONFIG_IDE_8xx_DIRECT
@@@ -892,7 -888,7 +888,7 @@@ input_swap_data(int dev, ulong *sect_bu
  #endif        /* __LITTLE_ENDIAN || CONFIG_AU1X00 */
  
  
 -#if defined(__PPC__) || defined(CONFIG_PXA_PCMCIA)
 +#if defined(__PPC__) || defined(CONFIG_PXA_PCMCIA) || defined(CONFIG_SH)
  static void
  output_data(int dev, ulong *sect_buf, int words)
  {
@@@ -944,7 -940,7 +940,7 @@@ output_data(int dev, ulong *sect_buf, i
  }
  #endif        /* __PPC__ */
  
 -#if defined(__PPC__) || defined(CONFIG_PXA_PCMCIA)
 +#if defined(__PPC__) || defined(CONFIG_PXA_PCMCIA) || defined(CONFIG_SH)
  static void
  input_data(int dev, ulong *sect_buf, int words)
  {
@@@ -1136,9 -1132,9 +1132,9 @@@ static void ide_ident (block_dev_desc_
  
        input_swap_data (device, iobuf, ATA_SECTORWORDS);
  
-       ident_cpy (dev_desc->revision, iop->fw_rev, sizeof(dev_desc->revision));
-       ident_cpy (dev_desc->vendor, iop->model, sizeof(dev_desc->vendor));
-       ident_cpy (dev_desc->product, iop->serial_no, sizeof(dev_desc->product));
+       ident_cpy ((unsigned char*)dev_desc->revision, iop->fw_rev, sizeof(dev_desc->revision));
+       ident_cpy ((unsigned char*)dev_desc->vendor, iop->model, sizeof(dev_desc->vendor));
+       ident_cpy ((unsigned char*)dev_desc->product, iop->serial_no, sizeof(dev_desc->product));
  #ifdef __LITTLE_ENDIAN
        /*
         * firmware revision and model number have Big Endian Byte
@@@ -1953,9 -1949,9 +1949,9 @@@ static void     atapi_inquiry(block_dev_des
                return;
  
        /* copy device ident strings */
-       ident_cpy(dev_desc->vendor,&iobuf[8],8);
-       ident_cpy(dev_desc->product,&iobuf[16],16);
-       ident_cpy(dev_desc->revision,&iobuf[32],5);
+       ident_cpy((unsigned char*)dev_desc->vendor,&iobuf[8],8);
+       ident_cpy((unsigned char*)dev_desc->product,&iobuf[16],16);
+       ident_cpy((unsigned char*)dev_desc->revision,&iobuf[32],5);
  
        dev_desc->lun=0;
        dev_desc->lba=0;