Merge branch 'iu-boot/master' into 'u-boot-arm/master'

Conflicts:
	arch/arm/cpu/arm926ejs/mxs/Makefile
	board/compulab/cm_t35/Makefile
	board/corscience/tricorder/Makefile
	board/ppcag/bg0900/Makefile
	drivers/bootcount/Makefile
	include/configs/omap4_common.h
	include/configs/pdnb3.h

Makefile conflicts are due to additions/removals of
object files on the ARM branch vs KBuild introduction
on the main branch. Resolution consists in adjusting
the list of object files in the main branch version.
This also applies to two files which are not listed
as conflicting but had to be modified:

	board/compulab/common/Makefile
	board/udoo/Makefile

include/configs/omap4_common.h conflicts are due to
the OMAP4 conversion to ti_armv7_common.h on the ARM
side, and CONFIG_SYS_HZ removal on the main side.
Resolution is to convert as this icludes removal of
CONFIG_SYS_HZ.

include/configs/pdnb3.h is due to a removal on ARM side.
Trivial resolution is to remove the file.

Note: 'git show' will also list two files just because
they are new:

	include/configs/am335x_igep0033.h
	include/configs/omap3_igep00x0.h

diff --cc arch/arm/cpu/arm926ejs/mxs/Makefile
index 13b5a5452263abfc6fa090c4ea74f32d986eeaf8,ea397c7f2a0378cd077d55619c632571cd0cf289..152546eb417a321031559c809b5827827026f9ca
--- 1/arch/arm/cpu/arm926ejs/mxs/Makefile
--- 2/arch/arm/cpu/arm926ejs/mxs/Makefile
+++ b/arch/arm/cpu/arm926ejs/mxs/Makefile
@@@ -5,20 -5,41 +5,20 @@@
  # SPDX-License-Identifier:    GPL-2.0+
  #
  
 -include $(TOPDIR)/config.mk
 +extra-$(CONFIG_SPL_BUILD) := start.o
  
 -LIB   = $(obj)lib$(SOC).o
 -
 -COBJS = clock.o mxs.o iomux.o timer.o
 +obj-y = clock.o mxs.o iomux.o timer.o
  
  ifdef CONFIG_SPL_BUILD
 -COBJS += spl_boot.o spl_lradc_init.o spl_mem_init.o spl_power_init.o
 +obj-y += spl_boot.o spl_lradc_init.o spl_mem_init.o spl_power_init.o
  endif
  
 -SRCS  := $(START:.o=.S) $(COBJS:.o=.c)
 -OBJS  := $(addprefix $(obj),$(COBJS))
 -START := $(addprefix $(obj),$(START))
 -
 -all:  $(obj).depend $(LIB)
 -
 -$(LIB):       $(OBJS)
 -      $(call cmd_link_o_target, $(OBJS))
 -
  # Specify the target for use in elftosb call
- ELFTOSB_TARGET-$(CONFIG_MX23) = imx23
- ELFTOSB_TARGET-$(CONFIG_MX28) = imx28
+ MKIMAGE_TARGET-$(CONFIG_MX23) = mx23
+ MKIMAGE_TARGET-$(CONFIG_MX28) = mx28
  
- $(OBJTREE)/u-boot.bd: $(SRCTREE)/$(CPUDIR)/$(SOC)/u-boot-$(ELFTOSB_TARGET-y).bd
+ $(OBJTREE)/mxsimage.cfg: $(SRCTREE)/$(CPUDIR)/$(SOC)/mxsimage.$(MKIMAGE_TARGET-y).cfg
        sed "s@OBJTREE@$(OBJTREE)@g" $^ > $@
  
- $(OBJTREE)/u-boot.sb: $(OBJTREE)/u-boot.bin $(OBJTREE)/spl/u-boot-spl.bin $(OBJTREE)/u-boot.bd
-               elftosb -zf $(ELFTOSB_TARGET-y) -c $(OBJTREE)/u-boot.bd -o $(OBJTREE)/u-boot.sb
+ $(OBJTREE)/u-boot.sb: $(OBJTREE)/u-boot.bin $(OBJTREE)/spl/u-boot-spl.bin $(OBJTREE)/mxsimage.cfg
+       $(OBJTREE)/tools/mkimage -n $(OBJTREE)/mxsimage.cfg -T mxsimage $@
 -
 -
 -#########################################################################
 -
 -# defines $(obj).depend target
 -include $(SRCTREE)/rules.mk
 -
 -sinclude $(obj).depend
 -
 -#########################################################################

diff --cc arch/arm/cpu/armv7/mx6/clock.c
Simple merge

diff --cc board/compulab/cm_t35/Makefile
index 66b264a902d96bae7e56f824c03d73cde9a1fd99,213423ec65e0f81ae99234e5995cf1c3ad16c216..6e2e1cbb6ad72436b8b06d00f2dce036407f6187
--- 1/board/compulab/cm_t35/Makefile
--- 2/board/compulab/cm_t35/Makefile
+++ b/board/compulab/cm_t35/Makefile
@@@ -7,7 -7,23 +7,4 @@@
  # SPDX-License-Identifier:    GPL-2.0+
  #
  
- obj-$(CONFIG_DRIVER_OMAP34XX_I2C) += eeprom.o
- obj-$(CONFIG_LCD) += display.o
 -include $(TOPDIR)/config.mk
 -
 -LIB   = $(obj)lib$(BOARD).o
 -
 -COBJS := cm_t35.o leds.o $(COBJS-y)
 -
 -SRCS  := $(COBJS:.o=.c)
 -OBJS  := $(addprefix $(obj),$(COBJS))
 -
 -$(LIB):       $(obj).depend $(OBJS)
 -      $(call cmd_link_o_target, $(OBJS))
 -
 -#########################################################################
 -
 -# defines $(obj).depend target
 -include $(SRCTREE)/rules.mk
 -
 -sinclude $(obj).depend
--
 -#########################################################################
 +obj-y += cm_t35.o leds.o

diff --cc board/compulab/cm_t35/cm_t35.c
Simple merge

diff --cc board/compulab/common/Makefile
index 0000000000000000000000000000000000000000,b399c8f46b076d5ba3079f56010e31ef32121474..831be2e0e74b631cf9ce70aecb0f203eb07fcb29
mode 000000,100644..100644
--- /dev/null
--- 2/board/compulab/common/Makefile
+++ b/board/compulab/common/Makefile
@@@ -1,0 -1,36 +1,10 @@@
 -include $(TOPDIR)/config.mk
 -
 -ifneq ($(OBJTREE),$(SRCTREE))
 -$(shell mkdir -p $(obj)board/$(VENDOR)/common)
 -endif
 -
 -LIB   = $(obj)lib$(VENDOR).o
 -
 -COBJS-$(CONFIG_DRIVER_OMAP34XX_I2C) += eeprom.o
 -COBJS-$(CONFIG_LCD) += omap3_display.o
 -
 -COBJS := $(COBJS-y)
 -SRCS  := $(SOBJS:.o=.S) $(COBJS:.o=.c)
 -OBJS  := $(addprefix $(obj),$(COBJS))
 -SOBJS := $(addprefix $(obj),$(SOBJS))
 -
 -all:  $(LIB)
 -
 -$(LIB):       $(obj).depend $(OBJS) $(SOBJS)
 -      $(call cmd_link_o_target, $(OBJS) $(SOBJS))
 -
 -#########################################################################
 -# This is for $(obj).depend target
 -include $(SRCTREE)/rules.mk
 -
 -sinclude $(obj).depend
 -
 -#########################################################################
+ #
+ # (C) Copyright 2011 - 2013 CompuLab, Ltd. <www.compulab.co.il>
+ #
+ # Author: Igor Grinberg <grinberg@compulab.co.il>
+ #
+ # SPDX-License-Identifier:    GPL-2.0+
+ #
+ 
++obj-$(CONFIG_DRIVER_OMAP34XX_I2C) += eeprom.o
++obj-$(CONFIG_LCD) += omap3_display.o

diff --cc board/corscience/tricorder/Makefile
index d5316f8d38842e1b9329d0c4b70faae9326407d6,8a7f15c79564dcbe10834ed0758c1e9a2f31cad4..266432dd2de2bb68c0a8d75e23aa886d6b0ea7cf
--- 1/board/corscience/tricorder/Makefile
--- 2/board/corscience/tricorder/Makefile
+++ b/board/corscience/tricorder/Makefile
@@@ -8,4 -8,23 +8,4 @@@
  # SPDX-License-Identifier:    GPL-2.0+
  #
  
- obj-y := tricorder.o
 -include $(TOPDIR)/config.mk
 -
 -LIB   = $(obj)lib$(BOARD).o
 -
 -COBJS := tricorder.o tricorder-eeprom.o led.o
 -
 -SRCS  := $(COBJS:.o=.c)
 -OBJS  := $(addprefix $(obj),$(COBJS))
 -
 -$(LIB):       $(obj).depend $(OBJS)
 -      $(call cmd_link_o_target, $(OBJS))
 -
 -#########################################################################
 -
 -# defines $(obj).depend target
 -include $(SRCTREE)/rules.mk
 -
 -sinclude $(obj).depend
 -
 -#########################################################################
++obj-y := tricorder.o tricorder-eeprom.o led.o

diff --cc board/ppcag/bg0900/Makefile
index 06120f3a846c1366f8fafbd338a07cbec184501e,e17c0a5991b6a30436c68e1e122f04395168725d..74c6db5b1524b39f62003bd46185753a7f381a1a
--- 1/board/prodrive/pdnb3/Makefile
--- 2/board/ppcag/bg0900/Makefile
+++ b/board/ppcag/bg0900/Makefile
@@@ -5,4 -5,27 +5,8 @@@
  # SPDX-License-Identifier:    GPL-2.0+
  #
  
- obj-y := flash.o pdnb3.o nand.o
 -include $(TOPDIR)/config.mk
 -
 -LIB   = $(obj)lib$(BOARD).o
 -
+ ifndef        CONFIG_SPL_BUILD
 -COBJS := bg0900.o
++obj-y := bg0900.o
+ else
 -COBJS := spl_boot.o
++obj-y := spl_boot.o
+ endif
 -
 -SRCS  := $(COBJS:.o=.c)
 -OBJS  := $(addprefix $(obj),$(COBJS))
 -
 -$(LIB):       $(obj).depend $(OBJS)
 -      $(call cmd_link_o_target, $(OBJS))
 -
 -#########################################################################
 -
 -# defines $(obj).depend target
 -include $(SRCTREE)/rules.mk
 -
 -sinclude $(obj).depend
 -
 -#########################################################################

diff --cc board/udoo/Makefile
index 0000000000000000000000000000000000000000,1f0f6c760fa9737aa38f29560af8b670a32cdde5..80efadaf0da661d0806c87983e9ebd8a53dab14c
mode 000000,100644..100644
--- /dev/null
--- 2/board/udoo/Makefile
+++ b/board/udoo/Makefile
@@@ -1,0 -1,26 +1,7 @@@
 -include $(TOPDIR)/config.mk
 -
 -LIB    = $(obj)lib$(BOARD).o
 -
 -COBJS  := udoo.o
 -
 -SRCS   := $(COBJS:.o=.c)
 -OBJS   := $(addprefix $(obj),$(COBJS))
 -
 -$(LIB):        $(obj).depend $(OBJS)
 -      $(call cmd_link_o_target, $(OBJS))
 -
 -#########################################################################
 -
 -# defines $(obj).depend target
 -include $(SRCTREE)/rules.mk
 -
 -sinclude $(obj).depend
 -
 -#########################################################################
+ #
+ # (C) Copyright 2013 Freescale Semiconductor, Inc.
+ #
+ # SPDX-License-Identifier:    GPL-2.0+
+ #
+ 
++obj-y  := udoo.o

diff --cc boards.cfg
Simple merge

diff --cc doc/README.scrapyard
Simple merge

diff --cc drivers/bootcount/Makefile
index 012acef9ddd2daad27f2f76e89d5014b8c7d49a3,352a0a16d9b178b41372503cf550def026a53f78..8256ed0f46b290e1037a1de768e6e16edb4f1a06
--- 1/drivers/bootcount/Makefile
--- 2/drivers/bootcount/Makefile
+++ b/drivers/bootcount/Makefile
@@@ -2,8 -2,29 +2,9 @@@
  # SPDX-License-Identifier:    GPL-2.0+
  #
  
 -include $(TOPDIR)/config.mk
 -
 -LIB   := $(obj)libbootcount.o
 -
 -COBJS-y                               += bootcount.o
 -COBJS-$(CONFIG_AT91SAM9XE)    += bootcount_at91.o
 -COBJS-$(CONFIG_BLACKFIN)      += bootcount_blackfin.o
 -COBJS-$(CONFIG_SOC_DA8XX)     += bootcount_davinci.o
 -COBJS-$(CONFIG_AM33XX)                += bootcount_davinci.o
 -COBJS-$(CONFIG_BOOTCOUNT_RAM) += bootcount_ram.o
 -
 -COBJS := $(COBJS-y)
 -SRCS  := $(COBJS:.o=.c)
 -OBJS  := $(addprefix $(obj),$(COBJS))
 -
 -$(LIB):       $(obj).depend $(OBJS)
 -      $(call cmd_link_o_target, $(OBJS))
 -
 -#########################################################################
 -
 -# defines $(obj).depend target
 -include $(SRCTREE)/rules.mk
 -
 -sinclude $(obj).depend
 -
 -########################################################################
 +obj-y                         += bootcount.o
 +obj-$(CONFIG_AT91SAM9XE)      += bootcount_at91.o
 +obj-$(CONFIG_BLACKFIN)                += bootcount_blackfin.o
 +obj-$(CONFIG_SOC_DA8XX)               += bootcount_davinci.o
++obj-$(CONFIG_AM33XX)          += bootcount_davinci.o
 +obj-$(CONFIG_BOOTCOUNT_RAM)   += bootcount_ram.o

diff --cc include/configs/afeb9260.h
Simple merge

diff --cc include/configs/am335x_igep0033.h
Simple merge

diff --cc include/configs/at91rm9200ek.h
Simple merge

diff --cc include/configs/at91sam9260ek.h
Simple merge

diff --cc include/configs/at91sam9261ek.h
Simple merge

diff --cc include/configs/at91sam9263ek.h
Simple merge

diff --cc include/configs/at91sam9n12ek.h
Simple merge

diff --cc include/configs/at91sam9x5ek.h
Simple merge

diff --cc include/configs/cm_t35.h
Simple merge

diff --cc include/configs/cpu9260.h
Simple merge

diff --cc include/configs/cpuat91.h
Simple merge

diff --cc include/configs/dra7xx_evm.h
Simple merge

diff --cc include/configs/eb_cpux9k2.h
Simple merge

diff --cc include/configs/ethernut5.h
Simple merge

diff --cc include/configs/ipam390.h
Simple merge

diff --cc include/configs/meesc.h
Simple merge

diff --cc include/configs/omap3_igep00x0.h
Simple merge

diff --cc include/configs/otc570.h
Simple merge

diff --cc include/configs/pm9261.h
Simple merge

diff --cc include/configs/pm9263.h
Simple merge

diff --cc include/configs/pm9g45.h
Simple merge

diff --cc include/configs/sama5d3xek.h
Simple merge

diff --cc include/configs/sbc35_a9g20.h
Simple merge

diff --cc include/configs/snapper9260.h
Simple merge

diff --cc include/configs/stamp9g20.h
Simple merge

diff --cc include/configs/ti_armv7_common.h
Simple merge

diff --cc include/configs/top9000.h
Simple merge

diff --cc include/configs/tricorder.h
Simple merge

diff --cc include/configs/vl_ma2sc.h
Simple merge