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

diff --combined Makefile
index 87ddb1c,2a18a4d..eef51cc
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1666,15 -1666,18 +1666,18 @@@ MPC8313ERDB_66_config: unconfi
        @mkdir -p $(obj)include
        @echo "" >$(obj)include/config.h ; \
        if [ "$(findstring _33_,$@)" ] ; then \
-               echo "...33M ..." ; \
+               echo -n "...33M ..." ; \
                echo "#define CFG_33MHZ" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _66_,$@)" ] ; then \
-               echo "...66M..." ; \
+               echo -n "...66M..." ; \
                echo "#define CFG_66MHZ" >>$(obj)include/config.h ; \
        fi ;
        @$(MKCONFIG) -a MPC8313ERDB ppc mpc83xx mpc8313erdb
  
+ MPC8323ERDB_config:   unconfig
+       @$(MKCONFIG) -a MPC8323ERDB ppc mpc83xx mpc8323erdb freescale
+ 
  MPC832XEMDS_config \
  MPC832XEMDS_HOST_33_config \
  MPC832XEMDS_HOST_66_config \
@@@ -1682,7 -1685,7 +1685,7 @@@ MPC832XEMDS_SLAVE_config:       unconfi
        @mkdir -p $(obj)include
        @echo "" >$(obj)include/config.h ; \
        if [ "$(findstring _HOST_,$@)" ] ; then \
-               echo "... PCI HOST " ; \
+               echo -n "... PCI HOST " ; \
                echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _SLAVE_,$@)" ] ; then \
@@@ -1691,11 -1694,11 +1694,11 @@@
                echo "#define CONFIG_PCISLAVE" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _33_,$@)" ] ; then \
-               echo "...33M ..." ; \
+               echo -n "...33M ..." ; \
                echo "#define PCI_33M" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _66_,$@)" ] ; then \
-               echo "...66M..." ; \
+               echo -n "...66M..." ; \
                echo "#define PCI_66M" >>$(obj)include/config.h ; \
        fi ;
        @$(MKCONFIG) -a MPC832XEMDS ppc mpc83xx mpc832xemds
@@@ -1724,7 -1727,7 +1727,7 @@@ MPC8360EMDS_SLAVE_config:       unconfi
        @mkdir -p $(obj)include
        @echo "" >$(obj)include/config.h ; \
        if [ "$(findstring _HOST_,$@)" ] ; then \
-               echo "... PCI HOST " ; \
+               echo -n "... PCI HOST " ; \
                echo "#define CONFIG_PCI" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _SLAVE_,$@)" ] ; then \
@@@ -1733,11 -1736,11 +1736,11 @@@
                echo "#define CONFIG_PCISLAVE" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _33_,$@)" ] ; then \
-               echo "...33M ..." ; \
+               echo -n "...33M ..." ; \
                echo "#define PCI_33M" >>$(obj)include/config.h ; \
        fi ; \
        if [ "$(findstring _66_,$@)" ] ; then \
-               echo "...66M..." ; \
+               echo -n "...66M..." ; \
                echo "#define PCI_66M" >>$(obj)include/config.h ; \
        fi ;
        @$(MKCONFIG) -a MPC8360EMDS ppc mpc83xx mpc8360emds
@@@ -2018,15 -2021,6 +2021,15 @@@ omap1510inn_config :  unconfi
  omap5912osk_config :  unconfig
        @$(MKCONFIG) $(@:_config=) arm arm926ejs omap5912osk NULL omap
  
 +davinci_dvevm_config :        unconfig
 +      @$(MKCONFIG) $(@:_config=) arm arm926ejs dv-evm davinci davinci
 +
 +davinci_schmoogie_config :    unconfig
 +      @$(MKCONFIG) $(@:_config=) arm arm926ejs schmoogie davinci davinci
 +
 +davinci_sonata_config :       unconfig
 +      @$(MKCONFIG) $(@:_config=) arm arm926ejs sonata davinci davinci
 +
  omap1610inn_config \
  omap1610inn_cs0boot_config \
  omap1610inn_cs3boot_config \

diff --combined include/common.h
index 229e64b,a822d28..27a660a
--- 1/include/common.h
--- 2/include/common.h
+++ b/include/common.h
@@@ -241,9 -241,6 +241,9 @@@ int        saveenv      (void)
  void inline setenv   (char *, char *);
  #else
  void  setenv       (char *, char *);
 +#ifdef CONFIG_HAS_UID
 +void  forceenv     (char *, char *);
 +#endif
  #endif /* CONFIG_PPC */
  #ifdef CONFIG_ARM
  # include <asm/mach-types.h>
@@@ -529,6 -526,8 +529,8 @@@ void       cpu_init_f    (void)
  int   cpu_init_r    (void);
  #if defined(CONFIG_8260)
  int   prt_8260_rsr  (void);
+ #elif defined(CONFIG_MPC83XX)
+ int   prt_83xx_rsr  (void);
  #endif
  
  /* $(CPU)/interrupts.c */