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

Conflicts:

	Makefile
	board/eukrea/cpu9260/cpu9260.c
	board/samsung/smdkc100/Makefile
	board/samsung/smdkc100/lowlevel_init.S
	board/samsung/smdkc100/mem_setup.S
	board/samsung/smdkc100/onenand.c
	board/samsung/smdkc100/smdkc100.c
	cpu/arm_cortexa8/s5pc1xx/Makefile
	cpu/arm_cortexa8/s5pc1xx/clock.c
	cpu/arm_cortexa8/start.S
	drivers/serial/serial_s5pc1xx.c
	include/asm-arm/arch-s5pc1xx/clk.h
	include/asm-arm/arch-s5pc1xx/clock.h
	include/asm-arm/arch-s5pc1xx/gpio.h
	include/asm-arm/arch-s5pc1xx/power.h
	include/configs/cpu9260.h
	include/configs/cpuat91.h
	include/configs/davinci_dm355evm.h
	include/configs/smdkc100.h
	include/linux/mtd/onenand.h
	include/linux/mtd/onenand_regs.h

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>

diff --cc Makefile
index 00fb3d6,a69e6d5..d2562c5
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -3144,17 -3168,8 +3168,17 @@@ omap3_zoom1_config :  unconfi
  omap3_zoom2_config :  unconfig
        @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 zoom2 logicpd omap3
  
- s5pc1xx_universal_config:     unconfig
+ smdkc100_config:      unconfig
 +      @echo "#define CONFIG_ONENAND_U_BOOT" > $(obj)include/config.h
-       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 universal samsung s5pc1xx
+       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 smdkc100 samsung s5pc1xx
 +      @echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk
 +      @echo "ONENAND_BIN = $(obj)onenand_ipl/onenand-ipl-16k.bin" >> $(obj)include/config.mk
 +
- smdkc100_config:      unconfig
++s5pc1xx_universal_config:     unconfig
 +      @echo "#define CONFIG_ONENAND_U_BOOT" > $(obj)include/config.h
-       @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 smdkc100 samsung s5pc1xx
++      @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 universal samsung s5pc1xx
 +      @echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk
 +      @echo "ONENAND_BIN = $(obj)onenand_ipl/onenand-ipl-16k.bin" >> $(obj)include/config.mk
  
  #########################################################################
  ## XScale Systems

diff --cc common/Makefile
Simple merge

diff --cc cpu/arm_cortexa8/s5pc1xx/Makefile
index 7549fa1,e08d9d8..a245f09
--- 1/cpu/arm_cortexa8/s5pc1xx/Makefile
--- 2/cpu/arm_cortexa8/s5pc1xx/Makefile
+++ b/cpu/arm_cortexa8/s5pc1xx/Makefile
@@@ -29,18 -29,14 +29,17 @@@ include $(TOPDIR)/config.m
  LIB   = $(obj)lib$(SOC).a
  
  SOBJS = reset.o
- SOBJS += cache.o
- 
- COBJS-y       += clock.o
- COBJS-y       += cpu_info.o
- COBJS-y       += gpio.o
- COBJS-y       += timer.o
- COBJS-$(CONFIG_S5PC110)       += sleep.o
- COBJS-$(CONFIG_SOFT_I2C) += i2c-gpio.o
- COBJS-$(CONFIG_CMD_USBDOWN) += usb-hs-otg.o usb_downloader.o
+ 
 -COBJS += cache.o
 -COBJS += clock.o
 -COBJS += cpu_info.o
 -COBJS += timer.o
++COBJS-y               += cache.o
++COBJS-y               += clock.o
++COBJS-y               += cpu_info.o
++COBJS-y               += gpio.o
++COBJS-y               += timer.o
++COBJS-$(CONFIG_SOFT_I2C)      += i2c-gpio.o
++COBJS-$(CONFIG_CMD_USBDOWN)   += usb-hs-otg.o usb_downloader.o
  
  SRCS  := $(SOBJS:.o=.S) $(COBJS:.o=.c)
 -OBJS  := $(addprefix $(obj),$(COBJS) $(SOBJS))
 +OBJS  := $(addprefix $(obj),$(COBJS-y) $(SOBJS))
  
  all:   $(obj).depend $(LIB)
  

diff --cc cpu/arm_cortexa8/s5pc1xx/clock.c
index 35b6c5c,a9e78dd..aa23994
--- 1/cpu/arm_cortexa8/s5pc1xx/clock.c
--- 2/cpu/arm_cortexa8/s5pc1xx/clock.c
+++ b/cpu/arm_cortexa8/s5pc1xx/clock.c
@@@ -24,9 -24,18 +24,12 @@@
  
  #include <common.h>
  #include <asm/io.h>
- #include <asm/arch/clk.h>
  #include <asm/arch/clock.h>
  
 -#define APLL  0
 -#define MPLL  1
 -#define EPLL  2
 -#define HPLL  3
 -#define VPLL  4
 -
+ #define CLK_M 0
+ #define CLK_D 1
+ #define CLK_P 2
+ 
  #ifndef CONFIG_SYS_CLK_FREQ_C100
  #define CONFIG_SYS_CLK_FREQ_C100      12000000
  #endif

diff --cc drivers/net/smc911x.c
Simple merge

diff --cc include/asm-arm/arch-omap3/sys_proto.h
Simple merge

diff --cc include/asm-arm/arch-s5pc1xx/clock.h
index a8eaa00,7b4eb89..23c5f84
--- 1/include/asm-arm/arch-s5pc1xx/clock.h
--- 2/include/asm-arm/arch-s5pc1xx/clock.h
+++ b/include/asm-arm/arch-s5pc1xx/clock.h
@@@ -23,6 -23,6 +23,12 @@@
  #ifndef __ASM_ARM_ARCH_CLOCK_H_
  #define __ASM_ARM_ARCH_CLOCK_H_
  
++#define APLL  0
++#define MPLL  1
++#define EPLL  2
++#define HPLL  3
++#define VPLL  4
++
  #ifndef __ASSEMBLY__
  struct s5pc100_clock {
        unsigned int    apll_lock;

diff --cc include/configs/smdkc100.h
index e91fdd5,8c472af..f032d94
--- 1/include/configs/smdkc100.h
--- 2/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@@ -229,24 -226,17 +226,24 @@@
  #endif
  
  /*-----------------------------------------------------------------------
-  * Boot configuration (define only one of next 3)
+  * Boot configuration
   */
  #define CONFIG_ENV_IS_IN_ONENAND      1
- #define CONFIG_ENV_SIZE                       SZ_128K         /* 128KB, 0x20000 */
- #define CONFIG_ENV_ADDR                       SZ_256K         /* 256KB, 0x40000 */
- #define CONFIG_ENV_OFFSET             SZ_256K         /* 256KB, 0x40000 */
+ #define CONFIG_ENV_SIZE                       (128 << 10)     /* 128KiB, 0x20000 */
+ #define CONFIG_ENV_ADDR                       (256 << 10)     /* 256KiB, 0x40000 */
+ #define CONFIG_ENV_OFFSET             (256 << 10)     /* 256KiB, 0x40000 */
  
  #define CONFIG_USE_ONENAND_BOARD_INIT
+ #define CONFIG_SAMSUNG_ONENAND                1
  #define CONFIG_SYS_ONENAND_BASE               0xE7100000
  
- #define CONFIG_DOS_PARTITION  1
+ #define CONFIG_DOS_PARTITION          1
  
- 
 +/* USB Downloader */
 +#define CONFIG_CMD_USBDOWN
 +#define CONFIG_SAMSUNG_USB
 +#define CONFIG_OTG_CLK_OSCC
 +#define CONFIG_SYS_DOWN_ADDR  CONFIG_SYS_SDRAM_BASE
 +#define CONFIG_RAMDISK_ADDR   0x33000000
 +
  #endif        /* __CONFIG_H */