u-boot.git/board/boundary, branch v2014.04

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

2014-02-19T11:04:45Z

i.MX6: nitrogen6x: pedantic: BOOT_FROM==spi, not sd

2014-02-19T09:55:14Z

Signed-off-by: Eric Nelson Acked-by: Stefano Babic

usb: mv_udc: Rename to ci_udc

2014-02-06T03:48:15Z

The mv_udc is not marvell-specific anymore. The mv_udc is used to drive generic ChipIdea CI13xxx series OTG cores, so rename the driver to ci_udc instead. Signed-off-by: Marek Vasut Cc: Eric Nelson Cc: Stefano Babic

nitrogen6x: README: Do not refer to MAINTAINERS file

2014-01-26T14:16:49Z

MAINTAINERS file has been removed from the project. Replace its reference with 'boards.cfg' file instead. Signed-off-by: Fabio Estevam Acked-by: Eric Nelson

nitrogen6x: README: Only calling 'make' is enough

2014-01-26T14:16:41Z

No need to pass 'u-boot.imx' as parameter for 'make' because u-boot.imx is built by default. Signed-off-by: Fabio Estevam Acked-by: Eric Nelson

nitrogen6x: Move setup_sata to common part

2013-12-17T17:12:14Z

Move setup_sata function definition from platform file nitrogen6x.c to arch/arm/imx-common/sata.c to avoid code duplication. Signed-off-by: Giuseppe Pagano CC: Stefano Babic CC: Fabio Estevam CC: Eric Nelson

i.MX6DQ/DLS: replace pad names with their Linux kernel equivalents

2013-11-13T09:19:50Z

Signed-off-by: Eric Nelson

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

2013-11-09T21:59:47Z

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

board: arm: convert makefiles to Kbuild style

2013-11-01T15:42:12Z

Signed-off-by: Masahiro Yamada Cc: Albert ARIBAUD Cc: Andreas Bießmann Cc: Stefano Babic Cc: Prafulla Wadaskar Cc: Minkyu Kang Cc: Vipin Kumar Cc: Tom Warren Cc: Tom Rini

i.MX6: nitrogen6x: fix erase size in 6x_upgrade.txt

2013-10-31T16:56:57Z

The 6x_upgrade script is used to upgrade U-Boot in SPI-NOR on Nitrogen6x/SABRE Lite boards using U-Boot's 'sf' command. U-Boot is placed at offset 0x400 in flash, and the script currently only erases 0x50000 bytes. Since the current head is 319k, any additional features enabled in the configuration will exceed the space erased and cause errors re-programming the device. This patch increases the erase size to the full size of the region allocated for the U-Boot binary. Signed-off-by: Eric Nelson Acked-by: Stefano Babic