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.

Albert ARIBAUD 85b8c5c4bf 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		12 years ago
..
cpu	Merge branch 'iu-boot/master' into 'u-boot-arm/master'	12 years ago
dts	exynos5: dts: Add device node for XHCI	12 years ago
imx-common	ARM: imx-common: convert makefiles to Kbuild style	12 years ago
include/asm	Merge branch 'iu-boot/master' into 'u-boot-arm/master'	12 years ago
lib	cosmetic: remove empty lines at the top of file	12 years ago
config.mk	Coding Style cleanup: replace leading SPACEs by TABs	12 years ago