Merge branch 'master' of /home/wd/git/u-boot/custodians

diff --combined Makefile
index c53de17eccf35d49433fd731388e0c6146349d05,0d607cad54986377426a5e529045c818bf740e67..b1d4607e81ee7469968aae0b3e1332e59dd9bbd0
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -352,7 -352,7 +352,7 @@@ GEN_UBOOT = 
  $(obj)u-boot:         depend $(SUBDIRS) $(OBJS) $(LIBBOARD) $(LIBS) $(LDSCRIPT)
                $(GEN_UBOOT)
  ifeq ($(CONFIG_KALLSYMS),y)
 -              smap=`$(call SYSTEM_MAP,u-boot) | awk '$$2 ~ /[tTwW]/ {printf $$1 $$3 "\\0"}'` ; \
 +              smap=`$(call SYSTEM_MAP,u-boot) | awk '$$2 ~ /[tTwW]/ {printf $$1 $$3 "\\\\000"}'` ; \
                $(CC) $(CFLAGS) -DSYSTEM_MAP="\"$${smap}\"" -c common/system_map.c -o $(obj)common/system_map.o
                $(GEN_UBOOT) $(obj)common/system_map.o
  endif
@@@ -3529,18 -3529,14 +3529,14 @@@ sh7763rdp_config  :   unconfi
  xtract_sh7785lcr = $(subst _32bit,,$(subst _config,,$1))
  sh7785lcr_32bit_config \
  sh7785lcr_config  :   unconfig
-       @ >include/config.h
-       @echo "#define CONFIG_SH7785LCR 1" >> include/config.h
+       @mkdir -p $(obj)include
+       @mkdir -p $(obj)board/renesas/sh7785lcr
+       @echo "#define CONFIG_SH7785LCR 1" > $(obj)include/config.h
        @if [ "$(findstring 32bit, $@)" ] ; then \
                echo "#define CONFIG_SH_32BIT 1" >> $(obj)include/config.h ; \
-               cp $(obj)board/renesas/sh7785lcr/u-boot_32bit \
-                       $(obj)board/renesas/sh7785lcr/u-boot.lds ; \
                echo "TEXT_BASE = 0x8ff80000" > \
                        $(obj)board/renesas/sh7785lcr/config.tmp ; \
                  $(XECHO) " ... enable 32-Bit Address Extended Mode" ; \
-       else \
-               cp $(obj)board/renesas/sh7785lcr/u-boot_29bit \
-                       $(obj)board/renesas/sh7785lcr/u-boot.lds ; \
        fi
        @$(MKCONFIG) -a $(call xtract_sh7785lcr,$@) sh sh4 sh7785lcr renesas
  
@@@ -3549,6 -3545,11 +3545,11 @@@ ap325rxa_config  :   unconfi
        @echo "#define CONFIG_AP325RXA 1" > $(obj)include/config.h
        @$(MKCONFIG) -a $(@:_config=) sh sh4 ap325rxa renesas
  
+ espt_config  :   unconfig
+       @mkdir -p $(obj)include
+       @echo "#define CONFIG_ESPT 1" > $(obj)include/config.h
+       @$(MKCONFIG) -a $(@:_config=) sh sh4 espt
+ 
  #========================================================================
  # SPARC
  #========================================================================
@@@ -3627,6 -3628,7 +3628,6 @@@ clobber:        clea
        @rm -f $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
        @[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -name "*" -type l -print | xargs rm -f
        @[ ! -d $(obj)onenand_ipl ] || find $(obj)onenand_ipl -name "*" -type l -print | xargs rm -f
 -      @[ ! -d $(obj)api_examples ] || find $(obj)api_examples -name "*" -type l -print | xargs rm -f
  
  ifeq ($(OBJTREE),$(SRCTREE))
  mrproper \

diff --combined include/configs/r2dplus.h
index 37d4fff9b1cf67c887068ef0931941aa8b00e436,25f50125e7b6ac99ddf0bbaea4fb5229e2770d23..8931b974aa24a8b36e310b50fe8acac334a0b9ea
--- 1/include/configs/r2dplus.h
--- 2/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@@ -80,8 -80,8 +80,8 @@@
   * SuperH Clock setting
   */
  #define CONFIG_SYS_CLK_FREQ   60000000
- #define TMU_CLK_DIVIDER               4
- #define CONFIG_SYS_HZ                 (CONFIG_SYS_CLK_FREQ / TMU_CLK_DIVIDER)
+ #define CONFIG_SYS_TMU_CLK_DIV                4
+ #define CONFIG_SYS_HZ         1000
  #define       CONFIG_SYS_PLL_SETTLING_TIME    100/* in us */
  
  /*
@@@ -123,5 -123,7 +123,5 @@@
   */
  #define CONFIG_NET_MULTI
  #define CONFIG_RTL8139
 -#define _IO_BASE              0x00000000
 -#define KSEG1ADDR(x)          (x)
  
  #endif /* __CONFIG_H */