u-boot.git/Makefile, branch v2013.07-rc1

Prepare v2013.07-rc1

2013-06-14T15:01:39Z

Signed-off-by: Tom Rini

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

2013-06-08T12:35:10Z

Conflicts: drivers/serial/Makefile

arm: vf610: Add Vybrid VF610 CPU support

2013-06-03T08:56:53Z

This patch adds generic codes to support Freescale's Vybrid VF610 CPU. It aligns Vybrid VF610 platform with i.MX platform. As there are some differences between VF610 and i.MX platforms, the specific codes are in the arch/arm/cpu/armv7/vf610 directory. Signed-off-by: Alison Wang Reviewed-by: Benoît Thébaudeau

tegra: always build u-boot-nodtb-tegra.bin

2013-05-28T19:58:42Z

Even when eventually building u-boot-dtb-tegra.bin, separately building u-boot-nodtb-tegra.bin can be useful, since building it encapsulates the SPL padding step. If you want to tweak u-boot.dtb and regenerate u-boot-dtb-tegra.bin, it is then a simple cat operation. Signed-off-by: Stephen Warren Signed-off-by: Tom Warren

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

2013-05-11T07:25:36Z

Conflicts: drivers/mtd/nand/mxc_nand_spl.c include/configs/m28evk.h

arm: mxs: Preprocess u-boot.bd so they contain full path

2013-05-06T08:37:36Z

The u-boot-imx23.bd and u-boot-imx28.bd need to be preprocessed, otherwise they have issues with out-of-tree build where elftosb tool couldn't sometimes find the u-boot.bin and spl/u-boot-spl.bin . Preprocess these .bd files with sed and insert full path to u-boot.bin and spl/u-boot-spl.bin to prevent this issue. Moreover, to avoid adding more churn into main Makefile, move all this preprocessing and u-boot.sb generation into CPU directory instead. Signed-off-by: Marek Vasut Cc: Fabio Estevam Cc: Stefano Babic Acked-by: Otavio Salvador

Trigger generic board error only when building

2013-05-01T15:17:21Z

At present the generic board error can occur when configuring U-Boot, or during distclean, but this is incorrect. The existing autoconf.mk may come from an earlier U-Boot configuration which is about to be overwritten. Make the error conditional so that it will only be triggered when we are actually building U-Boot. This avoids a problem where the system is being reconfigured to remove CONFIG_SYS_GENERIC_BOARD on an architecture that does not support it. Currently this will print an error and require the manual removal of include/autoconf.mk. Signed-off-by: Simon Glass

imx: Move some i.MX common functions into the imx-common directory

2013-04-22T08:23:42Z

This patch moves the following functions into the imx-common directory: - mxs_wait_mask_set() - mxs_wait_mask_clr() - mxs_reset_block() These are currently used by i.MX28. But the upcoming GPMI NAND port for i.MX6 will also use these functions. So lets move them to a common location to re-use them. Signed-off-by: Stefan Roese Cc: Stefano Babic Cc: Marek Vasut Cc: Fabio Estevam

Makefile: Add target for combined u-boot.img & spl/u-boot.bin

2013-04-22T07:53:53Z

This new make target "u-boot-img-spl-at-end.bin" consists of the the real, full-blown U-Boot image and the U-Boot SPL binary directly attached to it. The full-blown U-Boot image has the mkimage header included, with its load-address and entry-point. This will be used by the upcoming lwmon5 PPC440EPx derivate board port. Signed-off-by: Stefan Roese

Prepare v2013.04

2013-04-19T14:25:43Z

Signed-off-by: Tom Rini