From: Kyungmin Park <kyungmin.park@samsung.com>
Date: Thu, 18 Feb 2010 02:02:21 +0000 (+0900)
Subject: Merge branch 'master' of http://git.denx.de/u-boot
X-Git-Tag: JB12_20100218~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c1afc719439de56f926e58dd08dfa0edb4c004c0;p=kernel%2Fu-boot.git

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

Conflicts:

	cpu/arm_cortexa8/s5pc1xx/Makefile
	cpu/arm_cortexa8/s5pc1xx/cache.c
	lib_ppc/reloc.S
	onenand_ipl/board/samsung/universal/u-boot-onenand.lds

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

c1afc719439de56f926e58dd08dfa0edb4c004c0
diff --cc cpu/arm_cortexa8/s5pc1xx/Makefile
index 8c32f81,4f922e6..9569cce
--- a/cpu/arm_cortexa8/s5pc1xx/Makefile
+++ b/cpu/arm_cortexa8/s5pc1xx/Makefile
@@@ -28,20 -28,15 +28,20 @@@ include $(TOPDIR)/config.m
  
  LIB	= $(obj)lib$(SOC).a
  
- SOBJS	= reset.o
- SOBJS	+= cache.o
+ SOBJS	= cache.o
+ SOBJS	+= reset.o
  
 -COBJS	+= clock.o
 -COBJS	+= cpu_info.o
 -COBJS	+= timer.o
 +COBJS-y		+= clock.o
 +COBJS-y		+= cpu_info.o
 +COBJS-y		+= gpio.o
 +COBJS-y		+= timer.o
 +COBJS-$(CONFIG_CMD_SLEEP)	+= sleep.o
 +COBJS-$(CONFIG_CMD_SLEEP)	+= sleep_asm.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 drivers/i2c/Makefile
index 8b8d85c,29bda85..c024c9c
mode 100644,100755..100755
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@@@ -37,8 -37,8 +37,9 @@@ COBJS-$(CONFIG_PCA9564_I2C) += pca9564_
  COBJS-$(CONFIG_DRIVER_S3C24X0_I2C) += s3c24x0_i2c.o
  COBJS-$(CONFIG_S3C44B0_I2C) += s3c44b0_i2c.o
  COBJS-$(CONFIG_SOFT_I2C) += soft_i2c.o
+ COBJS-$(CONFIG_SPEAR_I2C) += spr_i2c.o
  COBJS-$(CONFIG_TSI108_I2C) += tsi108_i2c.o
 +COBJS-$(CONFIG_DRIVER_S5PC1XX_I2C) += s5pc1xx_i2c.o
  
  COBJS	:= $(COBJS-y)
  SRCS	:= $(COBJS:.o=.c)