u-boot.git/Makefile, branch v2013.01Unnamed repository; edit this file 'description' to name the repository.http://cgit.235523.xyz/u-boot.git/atom/Makefile?h=v2013.012013-01-15T21:47:42ZPrepare v2013.012013-01-15T21:47:42ZTom Rinitrini@ti.com2013-01-15T21:47:42Zurn:sha1:3a9d879f6f64585b819af728b53be0a05037fe0d
Signed-off-by: Tom Rini <trini@ti.com>
Merge branch 'master' of git://git.denx.de/u-boot-arm2013-01-11T21:38:24ZTom Rinitrini@ti.com2013-01-11T21:38:24Zurn:sha1:7a8e739cd5bc0c48511d343f469af89a88a3294dMakefile: remove MLO.byteswap on clobber2013-01-10T22:09:24ZNishanth Menonnm@ti.com2013-01-02T07:59:24Zurn:sha1:94bcfe524cab9574f799bd2b7df9c7de2b81465a
On clobber, do a cleanup even for SPL build else, we'd have
MLO.byteswap remaining for certain platforms like am33xx SPL builds
Signed-off-by: Nishanth Menon <nm@ti.com>
Prepare v2013.01-rc32013-01-10T21:44:40ZTom Rinitrini@ti.com2013-01-10T21:44:40Zurn:sha1:6fb4d74e59750b43f00d460c569e8a30c67c5bb0
Signed-off-by: Tom Rini <trini@ti.com>
Merge samsung, imx, tegra into u-boot-arm/master2012-12-22T10:59:14ZAlbert ARIBAUDalbert.u.boot@aribaud.net2012-12-22T10:59:14Zurn:sha1:96764df1b47ddebfb50fadf5af72530b07b5fc89
This commit merges branches from samsung, imx and tegra
meant to fix merge issues between u-boot/master and
u-boot-arm/master, as well as a few manual merge fixes.
Merge remote-tracking branch 'u-boot/master' into u-boot-arm-merged2012-12-19T21:02:36ZAllen Martinamartin@nvidia.com2012-12-19T21:02:36Zurn:sha1:a098cf41fdb2a6607c675f7fe4f3164617c9367e
Conflicts:
README
arch/arm/cpu/armv7/exynos/clock.c
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
Prepare v2013.01-rc22012-12-14T21:43:22ZTom Rinitrini@ti.com2012-12-14T21:43:22Zurn:sha1:ebbf0d20aa85f623c49b7ed3349ebfea450c152d
Signed-off-by: Tom Rini <trini@ti.com>
Merge branch 'master' of git://git.denx.de/u-boot into resolve2012-12-10T05:13:27ZMinkyu Kangmk7.kang@samsung.com2012-12-10T04:44:41Zurn:sha1:2c601c7208713ba9b2158c57adcf515f4bdbc212
Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
Merge branch 'master' of git://git.denx.de/u-boot into master2012-12-08T11:02:45ZStefano Babicsbabic@denx.de2012-12-08T11:02:45Zurn:sha1:05a860c228fe6c8f2e7aced8cc8ef88bc1038363
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>
Allow CONFIG_BOARD_SIZE_LIMIT to be specified in hex2012-12-06T20:56:39ZJoe Hershbergerjoe.hershberger@ni.com2012-11-08T10:19:09Zurn:sha1:d060e6f4416e667d718ad60636fdf6cbf5f1f576
Use the printf command to convert the number in any valid format into
the expected decimal format. The resulting errors should be printed to
stderr.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>