#
412665b4 |
| 26-Mar-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
|
#
0ce033d2 |
| 18-Mar-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-arm Albert's rework of the linker scripts conflicted with Simon's making everyone use __bss_end. We also had a minor conflict over
Merge branch 'master' of git://git.denx.de/u-boot-arm Albert's rework of the linker scripts conflicted with Simon's making everyone use __bss_end. We also had a minor conflict over README.scrapyard being added to in mainline and enhanced in u-boot-arm/master with proper formatting. Conflicts: arch/arm/cpu/ixp/u-boot.lds arch/arm/cpu/u-boot.lds arch/arm/lib/Makefile board/actux1/u-boot.lds board/actux2/u-boot.lds board/actux3/u-boot.lds board/dvlhost/u-boot.lds board/freescale/mx31ads/u-boot.lds doc/README.scrapyard include/configs/tegra-common.h Build tested for all of ARM and run-time tested on am335x_evm. Signed-off-by: Tom Rini <trini@ti.com>
show more ...
|
#
e424c15c |
| 11-Mar-2013 |
Simon Glass <sjg@chromium.org> |
x86: Enable generic board support This enables generic board support so that x86 boards can define CONFIG_SYS_GENERIC_BOARD. Signed-off-by: Simon Glass <sjg@chromium.org>
|
#
612404c2 |
| 09-Jan-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge 'u-boot-atmel/master' into 'u-boot-arm/master'
|
#
79f38777 |
| 08-Jan-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master' This required manual merging drivers/mtd/nand/Makefile and adding am335x_evm support for CONFIG_SPL_NAND_DRIVERS
|
#
96764df1 |
| 22-Dec-2012 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge samsung, imx, tegra into u-boot-arm/master This commit merges branches from samsung, imx and tegra meant to fix merge issues between u-boot/master and u-boot-arm/master, as wel
Merge samsung, imx, tegra into u-boot-arm/master 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.
show more ...
|
#
a098cf41 |
| 19-Dec-2012 |
Allen Martin <amartin@nvidia.com> |
Merge remote-tracking branch 'u-boot/master' into u-boot-arm-merged Conflicts: README arch/arm/cpu/armv7/exynos/clock.c board/samsung/universal_c210/unive
Merge remote-tracking branch 'u-boot/master' into u-boot-arm-merged 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
show more ...
|
#
2c601c72 |
| 09-Dec-2012 |
Minkyu Kang <mk7.kang@samsung.com> |
Merge branch 'master' of git://git.denx.de/u-boot into resolve Conflicts: README board/samsung/universal_c210/universal.c drivers/misc/Makefile
Merge branch 'master' of git://git.denx.de/u-boot into resolve 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
show more ...
|
#
05a860c2 |
| 08-Dec-2012 |
Stefano Babic <sbabic@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot into master Conflicts: drivers/power/power_fsl.c include/configs/mx35pdk.h include/configs/mx53loco.h
Merge branch 'master' of git://git.denx.de/u-boot into master 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>
show more ...
|
#
b8715d8d |
| 29-Nov-2012 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-fdt
|
#
e57d9d15 |
| 28-Nov-2012 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://www.denx.de/git/u-boot-x86
|
#
c953fbee |
| 10-Oct-2012 |
Gabe Black <gabeblack@chromium.org> |
x86: Add some missing includes I suspect these includes were usually available because something else included them earlier or because they were brought in transitively. Change-
x86: Add some missing includes I suspect these includes were usually available because something else included them earlier or because they were brought in transitively. Change-Id: I6aae2ac94dc792eac6febb4345e8125f69f70988 Signed-off-by: Gabe Black <gabeblack@chromium.org> Signed-off-by: Simon Glass <sjg@chromium.org>
show more ...
|
#
2ab5be7a |
| 20-May-2012 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-usb * 'master' of git://git.denx.de/u-boot-usb: USB: S5P: Add ehci support usb:udc:samsung Add functions for storing private gad
Merge branch 'master' of git://git.denx.de/u-boot-usb * 'master' of git://git.denx.de/u-boot-usb: USB: S5P: Add ehci support usb:udc:samsung Add functions for storing private gadget data in UDC driver usb:gadget:composite: Support for composite at gadget.h usb:gadget:composite USB composite gadget support usb:udc:samsung:cleanup Replace DEBUG_* macros with debug_cond() calls usb:udc: Remove duplicated USB definitions from include/linux/usb/ch9.h file USB: Document the QH and qTD antics in EHCI-HCD USB: Drop cache flush bloat in EHCI-HCD USB: Drop ehci_alloc/ehci_free in ehci-hcd USB: Align buffers at cacheline usb: use noinline define
show more ...
|
#
8fa3d2b8 |
| 20-May-2012 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash * 'master' of git://git.denx.de/u-boot-nand-flash: NAND: Remove ONFI detection message to from bootup log driver/mtd:
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash * 'master' of git://git.denx.de/u-boot-nand-flash: NAND: Remove ONFI detection message to from bootup log driver/mtd:IFC: Fix possible memory leak driver/mtd: IFC NAND: Add support of ONFI NAND flash mtd, nand: move some printfs to debug output. nand_util: correct YAFFS image write function powerpc/85xx: fix NAND boot linker scripts for -fpic nand: extend .raw accesses to work on multiple pages
show more ...
|
#
8bd07c9a |
| 20-May-2012 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-net * 'master' of git://git.denx.de/u-boot-net: net: move bootfile init into eth_initialize net: punt bd->bi_ip_addr net:
Merge branch 'master' of git://git.denx.de/u-boot-net * 'master' of git://git.denx.de/u-boot-net: net: move bootfile init into eth_initialize net: punt bd->bi_ip_addr net: cosmetic: netconsole.c checkpatch compliance net: cosmetic: tftp.* checkpatch compliance net: cosmetic: sntp.* checkpatch compliance net: cosmetic: rarp.* checkpatch compliance net: cosmetic: nfs.* checkpatch compliance net: cosmetic: net.c checkpatch compliance net: cosmetic: eth.c checkpatch compliance net: cosmetic: bootp.* checkpatch compliance net: cosmetic: net.h checkpatch compliance net: Remove volatile from net API
show more ...
|
#
50a47d05 |
| 04-Apr-2012 |
Mike Frysinger <vapier@gentoo.org> |
net: punt bd->bi_ip_addr This field gets read in one place (by "bdinfo"), and we can replace that with getenv("ipaddr"). After all, the bi_ip_addr field is kept up-to-date implicitl
net: punt bd->bi_ip_addr This field gets read in one place (by "bdinfo"), and we can replace that with getenv("ipaddr"). After all, the bi_ip_addr field is kept up-to-date implicitly with the value of the ipaddr env var. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
show more ...
|
#
476af299 |
| 03-Oct-2011 |
Mike Frysinger <vapier@gentoo.org> |
image: push default arch values to arch headers This pushes the ugly duplicated arch ifdef lists we maintain in various image related files out to the arch headers themselves. A
image: push default arch values to arch headers This pushes the ugly duplicated arch ifdef lists we maintain in various image related files out to the arch headers themselves. Acked-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Tested-by: Thomas Chou <thomas@wytron.com.tw> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
show more ...
|
#
909e9bf3 |
| 10-May-2011 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
|
#
9dd5dad8 |
| 20-Apr-2011 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'misc' of git://git.denx.de/u-boot-blackfin
|
#
4f27f0ab |
| 20-Apr-2011 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-mmc
|
#
f16b608a |
| 13-Apr-2011 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'sf' of git://git.denx.de/u-boot-blackfin
|
#
107b56bd |
| 13-Apr-2011 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-x86
|
#
880c80d0 |
| 13-Apr-2011 |
Graeme Russ <graeme.russ@gmail.com> |
Merge branch 'master' of git://git.denx.de/u-boot-x86
|
#
fea25720 |
| 13-Apr-2011 |
Graeme Russ <graeme.russ@gmail.com> |
x86: Rename i386 to x86 Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
|