#
a19b0dd6 |
| 30-May-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot/master' into 'u-boot-arm/master' Conflicts: common/cmd_fpga.c drivers/usb/host/ohci-at91.c
|
#
805fa87f |
| 14-May-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin into powerpc-eldk53-warning-fixes
|
#
a661b99d |
| 13-May-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-x86
|
#
dfdedd9c |
| 17-Apr-2013 |
Simon Glass <sjg@chromium.org> |
x86: Remove unused bios/pci code Graeme Russ pointed out that this code is no longer used. Remove it. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Graeme Russ <graeme
x86: Remove unused bios/pci code Graeme Russ pointed out that this code is no longer used. Remove it. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Graeme Russ <graeme.russ@gmail.com>
show more ...
|
#
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
|
#
452f50f7 |
| 10-Oct-2012 |
Gabe Black <gabeblack@chromium.org> |
x86: coreboot: Tell u-boot about PCI bus 0 when initializing U-boot needs a host controller or "hose" to interact with the PCI busses behind them. This change installs a host controller
x86: coreboot: Tell u-boot about PCI bus 0 when initializing U-boot needs a host controller or "hose" to interact with the PCI busses behind them. This change installs a host controller during initialization of the coreboot "board" which implements some of X86's basic PCI semantics. This relies on some existing generic code, but also duplicates a little bit of code from the sc520 implementation. Ideally we'd eliminate that duplication at some point. It looks like in order to scan buses beyond bus 0, we'll need to tell u-boot's generic PCI configuration code what to do if it encounters a bridge, specifically to scan the bus on the other side of it. Signed-off-by: Gabe Black <gabeblack@chromium.org> Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Graeme Russ <graeme.russ@gmail.com>
show more ...
|
#
1086c5d6 |
| 07-Dec-2011 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx * 'master' of git://git.denx.de/u-boot-mpc83xx: powerpc/83xx: fix sdram initialization for keymile boards powerpc/mpc83x
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx * 'master' of git://git.denx.de/u-boot-mpc83xx: powerpc/83xx: fix sdram initialization for keymile boards powerpc/mpc83xx: cleanup makefile for mpc83xx
show more ...
|
#
4ebbba44 |
| 01-Dec-2011 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'sr@denx.de' of git://git.denx.de/u-boot-staging * 'sr@denx.de' of git://git.denx.de/u-boot-staging: image: Don't detect XIP images as overlapping. image: Implement
Merge branch 'sr@denx.de' of git://git.denx.de/u-boot-staging * 'sr@denx.de' of git://git.denx.de/u-boot-staging: image: Don't detect XIP images as overlapping. image: Implement IH_TYPE_KERNEL_NOLOAD
show more ...
|
#
797449a1 |
| 01-Dec-2011 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx * 'master' of git://git.denx.de/u-boot-ppc4xx: ppc4xx: Add Io64 board support ppc4xx: fix PMC440 painit command ppc
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx * 'master' of git://git.denx.de/u-boot-ppc4xx: ppc4xx: Add Io64 board support ppc4xx: fix PMC440 painit command ppc4xx: remove invalid access to PCI_BRDGOPT2 register ppc4xx: use CONFIG_PCI_BOOTDELAY instead of private implementation
show more ...
|
#
d51e6d6d |
| 01-Dec-2011 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx * 'master' of git://git.denx.de/u-boot-mpc85xx: mpc85xx: support for Freescale COM Express P2020 arch/powerpc/cpu/mpc8xx
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx * 'master' of git://git.denx.de/u-boot-mpc85xx: mpc85xx: support for Freescale COM Express P2020 arch/powerpc/cpu/mpc8xxx/ddr/interactive.c: Fix GCC 4.6 build warning mpc85xx: support board-specific reset function powerpc/85xx: verify the localbus device tree address before booting the OS mpc8xxx: update module_type values from JEDEC DDR3 SPD Specification powerpc/p3060qds: Add board related support for P3060QDS platform powerpc/85xx: clean up and document the QE/FMAN microcode macros powerpc/85xx: always implement the work-around for Erratum SATA_A001 powerpc/85xx: CONFIG_FSL_SATA_V2 should be defined in config_mpc85xx.h powerpc/85xx: Add workaround for erratum A-003474 powerpc/85xx: fixup flexcan device tree clock-frequency powerpc/85xx: Add workaround for erratum CPU-A003999
show more ...
|
#
1cfcf037 |
| 07-Nov-2011 |
Graeme Russ <graeme.russ@gmail.com> |
x86: Misc PCI touchups Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
|
#
83088afb |
| 07-Nov-2011 |
Graeme Russ <graeme.russ@gmail.com> |
cosmetic: checkpatch cleanup of arch/x86/lib/*.c Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
|
#
fa82f871 |
| 04-Aug-2011 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Convert ISO-8859 files to UTF-8 There was a mix of UTF-8 and ISO-8859 files in the U-Boot source tree, which could cause issues with the patchwork review system. This commit converts
Convert ISO-8859 files to UTF-8 There was a mix of UTF-8 and ISO-8859 files in the U-Boot source tree, which could cause issues with the patchwork review system. This commit converts all ISO-8859 files to UTF-8. Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
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
|