upstream u-boot with additional patches for our devices/boards: https://lists.denx.de/pipermail/u-boot/2017-March/282789.html (AXP crashes) ; Gbit ethernet patch for some LIME2 revisions ; with SPI flash support

You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Stefano Babic 05a860c228 Merge branch 'master' of git://git.denx.de/u-boot into master ... Conflicts: drivers/power/power_fsl.c include/configs/mx35pdk.h include/configs/mx53loco.h include/configs/woodburn_common.h board/woodburn/woodburn.c These boards still use the old old PMIC framework, so they do not merge properly after the power framework was merged into mainline. Fix all conflicts and update woodburn to use Power Framework. Signed-off-by: Stefano Babic <sbabic@denx.de>		12 years ago
..
cpu	Merge branch 'master' of git://git.denx.de/u-boot into master	12 years ago
dts	tegra: fdt: Add NAND controller binding and definitions	12 years ago
imx-common	imx-common: cpu: add imx_ddr_size	12 years ago
include/asm	Merge branch 'master' of git://git.denx.de/u-boot into master	12 years ago
lib	pmic: Introduce power_init_board() method at ./lib/board.c file	12 years ago
config.mk	arm: work around assembler bug	12 years ago