git.dujemihanovic.xyz Git - u-boot.git/commit

]> git.dujemihanovic.xyz Git - u-boot.git/commit

projects / u-boot.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 96764df 9bd5c1a)

author	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Tue, 8 Jan 2013 12:15:45 +0000 (13:15 +0100)
committer	Albert ARIBAUD <albert.u.boot@aribaud.net>
	Tue, 8 Jan 2013 12:15:45 +0000 (13:15 +0100)
commit	79f38777947ac7685e2cef8bd977f954ab198c0e
tree	6fe053ef751b1c424ec50be338844197b6421d74	tree \| snapshot
parent	96764df1b47ddebfb50fadf5af72530b07b5fc89	commit \| diff
parent	9bd5c1ad0db802c9f8d49d72b443f03431cf6a89	commit \| diff

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

This required manual merging drivers/mtd/nand/Makefile
and adding am335x_evm support for CONFIG_SPL_NAND_DRIVERS

14 files changed:

arch/arm/cpu/armv7/am33xx/board.c	diff1 \|	diff2 \|	blob \| history
arch/arm/cpu/armv7/am33xx/clock.c	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/arch-am33xx/cpu.h	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/arch-am33xx/hardware.h	diff1 \|	diff2 \|	blob \| history
board/ti/am335x/board.c	diff1 \|	diff2 \|	blob \| history
board/ti/beagle/beagle.c	diff1 \|	diff2 \|	blob \| history
drivers/i2c/omap24xx_i2c.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/Makefile	diff1 \|	diff2 \|	blob \| history
include/configs/am335x_evm.h	diff1 \|	diff2 \|	blob \| history
include/configs/igep00x0.h	diff1 \|	diff2 \|	blob \| history
include/configs/mcx.h	diff1 \|	diff2 \|	blob \| history
include/configs/omap3_beagle.h	diff1 \|	diff2 \|	blob \| history
include/configs/tam3517-common.h	diff1 \|	diff2 \|	blob \| history
include/configs/tricorder.h	diff1 \|	diff2 \|	blob \| history

My U-Boot fork