git.kernelconcepts.de Git - karo-tx-uboot.git/commit

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

author	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Sat, 9 Nov 2013 11:51:47 +0000 (12:51 +0100)
committer	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Sat, 9 Nov 2013 21:59:47 +0000 (22:59 +0100)
commit	85b8c5c4bf80025de4632ae6c9a8a606e51508a4
tree	7a89b428296ab5baca8f07c4019e3485e452cf42	tree \| snapshot
parent	15c5cdf5aa6b292145e5e3e220ec1f42b11eff6f	commit \| diff
parent	3285d4ca197928a048d3dda86751b5d26e6e0e86	commit \| diff

arch/arm/cpu/arm926ejs/mxs/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/cpu/armv7/mx6/clock.c	diff1 \|	diff2 \|	blob \| history
board/compulab/cm_t35/Makefile	diff1 \|	diff2 \|	blob \| history
board/compulab/cm_t35/cm_t35.c	diff1 \|	diff2 \|	blob \| history
board/compulab/common/Makefile	\|	diff2 \|	blob \| history
board/corscience/tricorder/Makefile	diff1 \|	diff2 \|	blob \| history
board/ppcag/bg0900/Makefile	diff1 \|	diff2 \|	blob \| history
board/udoo/Makefile	\|	diff2 \|	blob \| history
boards.cfg	diff1 \|	diff2 \|	blob \| history
doc/README.scrapyard	diff1 \|	diff2 \|	blob \| history
drivers/bootcount/Makefile	diff1 \|	diff2 \|	blob \| history
include/configs/afeb9260.h	diff1 \|	diff2 \|	blob \| history
include/configs/am335x_igep0033.h	diff1 \|	diff2 \|	blob \| history
include/configs/at91rm9200ek.h	diff1 \|	diff2 \|	blob \| history
include/configs/at91sam9260ek.h	diff1 \|	diff2 \|	blob \| history
include/configs/at91sam9261ek.h	diff1 \|	diff2 \|	blob \| history
include/configs/at91sam9263ek.h	diff1 \|	diff2 \|	blob \| history
include/configs/at91sam9n12ek.h	diff1 \|	diff2 \|	blob \| history
include/configs/at91sam9x5ek.h	diff1 \|	diff2 \|	blob \| history
include/configs/cm_t35.h	diff1 \|	diff2 \|	blob \| history
include/configs/cpu9260.h	diff1 \|	diff2 \|	blob \| history
include/configs/cpuat91.h	diff1 \|	diff2 \|	blob \| history
include/configs/dra7xx_evm.h	diff1 \|	diff2 \|	blob \| history
include/configs/eb_cpux9k2.h	diff1 \|	diff2 \|	blob \| history
include/configs/ethernut5.h	diff1 \|	diff2 \|	blob \| history
include/configs/ipam390.h	diff1 \|	diff2 \|	blob \| history
include/configs/meesc.h	diff1 \|	diff2 \|	blob \| history
include/configs/omap3_igep00x0.h	diff1 \|	diff2 \|	blob \| history
include/configs/otc570.h	diff1 \|	diff2 \|	blob \| history
include/configs/pm9261.h	diff1 \|	diff2 \|	blob \| history
include/configs/pm9263.h	diff1 \|	diff2 \|	blob \| history
include/configs/pm9g45.h	diff1 \|	diff2 \|	blob \| history
include/configs/sama5d3xek.h	diff1 \|	diff2 \|	blob \| history
include/configs/sbc35_a9g20.h	diff1 \|	diff2 \|	blob \| history
include/configs/snapper9260.h	diff1 \|	diff2 \|	blob \| history
include/configs/stamp9g20.h	diff1 \|	diff2 \|	blob \| history
include/configs/ti_armv7_common.h	diff1 \|	diff2 \|	blob \| history
include/configs/top9000.h	diff1 \|	diff2 \|	blob \| history
include/configs/tricorder.h	diff1 \|	diff2 \|	blob \| history
include/configs/vl_ma2sc.h	diff1 \|	diff2 \|	blob \| history