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		11 years ago
..
clock.h	mx6slevk: Add Ethernet support	11 years ago
crm_regs.h	mx6: compute PLL PFD frequencies rather than using defines	11 years ago
gpio.h	Add GPL-2.0+ SPDX-License-Identifier to source files	11 years ago
hab.h	imx: add status reporting for HAB status	11 years ago
imx-regs.h	i.MX6: Correct ANATOP_PFD (Phase Fractional Divider) register declarations	11 years ago
iomux.h	mx6: iomux: add GPR1 defines for use with nitrogen6x	11 years ago
mx6-ddr.h	Add GPL-2.0+ SPDX-License-Identifier to source files	11 years ago
mx6-pins.h	Add GPL-2.0+ SPDX-License-Identifier to source files	11 years ago
mx6dl-ddr.h	Add GPL-2.0+ SPDX-License-Identifier to source files	11 years ago
mx6dl_pins.h	mx6: Remove PAD_CTL_DSE_120ohm from i.MX6DL's IPU1_DI0_PIN4 pin	11 years ago
mx6q-ddr.h	Add GPL-2.0+ SPDX-License-Identifier to source files	11 years ago
mx6q_pins.h	i.MX6DQ/DLS: Add pad MX6_PAD_GPIO_1__USB_OTG_ID	11 years ago
mx6sl_pins.h	mx6slevk: Add Ethernet support	11 years ago
mxc_hdmi.h	Merge git://git.denx.de/u-boot-arm	11 years ago
sys_proto.h	i.MX6: Add convenience macros cpu_type(rev) and is_cpu_type(cpu)	11 years ago