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

diff --combined Makefile
index 4f1cb1b4d1acc531b5423840a0d1d3286dfabbd8,47f4e7d5ab0b3fd644a8a9d99be58eb681b30ef8..332c79a2bcf55219f0c0df605a67223eae76307d
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -253,6 -253,13 +253,13 @@@ ifeq ($(SOC),omap4
  LIBS += $(CPUDIR)/omap-common/libomap-common.a
  endif
  
+ ifeq ($(SOC),s5pc1xx)
+ LIBS += $(CPUDIR)/s5p-common/libs5p-common.a
+ endif
+ ifeq ($(SOC),s5pc2xx)
+ LIBS += $(CPUDIR)/s5p-common/libs5p-common.a
+ endif
+ 
  LIBS := $(addprefix $(obj),$(LIBS))
  .PHONY : $(LIBS) $(TIMESTAMP_FILE) $(VERSION_FILE)
  
@@@ -1788,7 -1795,6 +1795,7 @@@ P2010RDB_config 
  P2010RDB_NAND_config \
  P2010RDB_SDCARD_config \
  P2010RDB_SPIFLASH_config \
 +P2020DS_DDR2_config \
  P2020RDB_config \
  P2020RDB_NAND_config \
  P2020RDB_SDCARD_config \

diff --combined common/serial.c
index 6718648d4e8b927f0d9e1c170f7c1df025c805c1,9e5759ecf5424b41a84ab9bb7b3772d1b0fd412b..1345c08aefd6d68f9b05e1e926fe4463abd7abf4
--- 1/common/serial.c
--- 2/common/serial.c
+++ b/common/serial.c
@@@ -40,9 -40,9 +40,9 @@@ struct serial_device *__default_serial_
        return &serial_scc_device;
  #elif defined(CONFIG_405GP) || defined(CONFIG_405CR) || defined(CONFIG_440) \
     || defined(CONFIG_405EP) || defined(CONFIG_405EZ) || defined(CONFIG_405EX) \
 -   || defined(CONFIG_MPC5xxx) || defined(CONFIG_MPC83xx) \
 -   || defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) \
 -   || defined(CONFIG_SYS_SC520)
 +   || defined(CONFIG_MB86R0x) || defined(CONFIG_MPC5xxx) \
 +   || defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) \
 +   || defined(CONFIG_MPC86xx) || defined(CONFIG_SYS_SC520)
  #if defined(CONFIG_CONS_INDEX) && defined(CONFIG_SYS_NS16550_SERIAL)
  #if (CONFIG_CONS_INDEX==1)
        return &eserial1_device;
@@@ -78,7 -78,7 +78,7 @@@
  #else
  #error "CONFIG_SERIAL? missing."
  #endif
- #elif defined(CONFIG_S5PC1XX)
+ #elif defined(CONFIG_S5P)
  #if defined(CONFIG_SERIAL0)
        return &s5p_serial0_device;
  #elif defined(CONFIG_SERIAL1)
@@@ -162,7 -162,7 +162,7 @@@ void serial_initialize (void
        serial_register(&s3c24xx_serial1_device);
        serial_register(&s3c24xx_serial2_device);
  #endif
- #if defined(CONFIG_S5PC1XX)
+ #if defined(CONFIG_S5P)
        serial_register(&s5p_serial0_device);
        serial_register(&s5p_serial1_device);
        serial_register(&s5p_serial2_device);

diff --combined include/serial.h
index fc384698196d89d82d95601297d89c5ece5a3e46,9e4a22607f32c11ec81b1dec313f46be09ac3b2c..15ab73c13d99b97345486b5892c7fc41858b8b84
--- 1/include/serial.h
--- 2/include/serial.h
+++ b/include/serial.h
@@@ -25,9 -25,9 +25,9 @@@ extern struct serial_device * default_s
  
  #if defined(CONFIG_405GP) || defined(CONFIG_405CR) || defined(CONFIG_440) || \
      defined(CONFIG_405EP) || defined(CONFIG_405EZ) || defined(CONFIG_405EX) || \
 -    defined(CONFIG_MPC5xxx) || defined(CONFIG_MPC83xx) || \
 -    defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) || \
 -    defined(CONFIG_SYS_SC520)
 +    defined(CONFIG_MB86R0x) || defined(CONFIG_MPC5xxx) || \
 +    defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) || \
 +    defined(CONFIG_MPC86xx) || defined(CONFIG_SYS_SC520)
  extern struct serial_device serial0_device;
  extern struct serial_device serial1_device;
  #if defined(CONFIG_SYS_NS16550_SERIAL)
@@@ -52,7 -52,7 +52,7 @@@ extern struct serial_device s3c24xx_ser
  extern struct serial_device s3c24xx_serial2_device;
  #endif
  
- #if defined(CONFIG_S5PC1XX)
+ #if defined(CONFIG_S5P)
  extern struct serial_device s5p_serial0_device;
  extern struct serial_device s5p_serial1_device;
  extern struct serial_device s5p_serial2_device;