| #
bd5053ff |
| 14-Jan-2015 |
Tom Rini <trini@ti.com> |
Merge branch 'buildman' of git://git.denx.de/u-boot-x86
Conflicts:
tools/buildman/control.py
Signed-off-by: Tom Rini <trini@ti.com>
|
| #
e3bf81b1 |
| 16-Dec-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
|
| #
3bfbf32b |
| 16-Dec-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
|
| #
b9206e61 |
| 15-Dec-2014 |
Tom Rini <trini@ti.com> |
Merge git://git.denx.de/u-boot-x86
|
| #
f46f3f35 |
| 10-Dec-2014 |
Simon Glass <sjg@chromium.org> |
bios_emulator: Correct ordering of includes
We should include common.h before other includes. This actually causes
a build error on chromebook_link.
Signed-off-by: Simon Glass <
bios_emulator: Correct ordering of includes
We should include common.h before other includes. This actually causes
a build error on chromebook_link.
Signed-off-by: Simon Glass <sjg@chromium.org>
show more ...
|
| #
fc9b0b80 |
| 11-Dec-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Conflicts:
board/freescale/mx6sxsabresd/mx6sxsabresd.c
Signed-off-by: Tom Rini <trini@ti.com>
|
| #
9b416a9f |
| 10-Dec-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
|
| #
272a1acf |
| 08-Dec-2014 |
Tom Rini <trini@ti.com> |
Merge git://git.denx.de/u-boot-mpc85xx
|
| #
97cdf640 |
| 04-Dec-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'sandbox' of git://git.denx.de/u-boot-x86
|
| #
88342103 |
| 01-Dec-2014 |
Tom Rini <trini@ti.com> |
Merge git://git.denx.de/u-boot-fdt
|
| #
f4e7e2d1 |
| 01-Dec-2014 |
Tom Rini <trini@ti.com> |
Merge git://git.denx.de/u-boot-x86
|
| #
b3521f2e |
| 14-Nov-2014 |
Simon Glass <sjg@chromium.org> |
bios_emulator: Add an option to enable debugging
At present there are DEBUG options spread around the place. If you enable
one and not another you can end up with an emulator that does n
bios_emulator: Add an option to enable debugging
At present there are DEBUG options spread around the place. If you enable
one and not another you can end up with an emulator that does not work,
since each file can have a different view of what the registers look like.
To fix this, create a global CONFIG_X86EMU_DEBUG option that keeps
everything consistent.
Signed-off-by: Simon Glass <sjg@chromium.org>
show more ...
|
| #
4c59f953 |
| 14-Nov-2014 |
Simon Glass <sjg@chromium.org> |
bios_emulator: Add vesa support and allow ROMs to be passed in as data
As well as locating the ROM on the PCI bus, allow the ROM to be supplied to
the emulator. Split the init up a littl
bios_emulator: Add vesa support and allow ROMs to be passed in as data
As well as locating the ROM on the PCI bus, allow the ROM to be supplied to
the emulator. Split the init up a little so that callers can supply their
own interrupt routines. Also allow a vesa mode to be provided, to be
selected once the BIOS run is complete.
Signed-off-by: Simon Glass <sjg@chromium.org>
show more ...
|
| #
ad6edca3 |
| 14-Nov-2014 |
Simon Glass <sjg@chromium.org> |
bios_emulator: Allow x86 to use the emulator
There is an implicit assumption that x86 machines want to use raw I/O in the
BIOS emulator, but this should be selectable. Add an CONFIG_X86E
bios_emulator: Allow x86 to use the emulator
There is an implicit assumption that x86 machines want to use raw I/O in the
BIOS emulator, but this should be selectable. Add an CONFIG_X86EMU_RAW_IO
option to control it instead.
Also fix a few bugs which cause warnings on x86 and adjust the Makefile to
remove the assumption that only PowerPC uses the emulator.
Signed-off-by: Simon Glass <sjg@chromium.org>
show more ...
|
| #
345be0b2 |
| 14-Apr-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
|
| #
8dc16cf9 |
| 14-Apr-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
|
| #
0c669fd1 |
| 13-Apr-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
|
| #
18122019 |
| 12-Apr-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts:
drivers/video/exynos_fb.c
|
| #
bc5fd908 |
| 04-Apr-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash
|
| #
b2da8038 |
| 01-Apr-2013 |
Linus Walleij <linus.walleij@linaro.org> |
biosemu: include <asm/io.h> header
This makes sure we have inline functions such as inb/outb that
are used in these two files by including the arch-specific
<asm/io.h> header. Howeve
biosemu: include <asm/io.h> header
This makes sure we have inline functions such as inb/outb that
are used in these two files by including the arch-specific
<asm/io.h> header. However the ARM version does not provide the
accessors unless the config symbol __io is also defined so add
that in front of the include.
After this the bios emulator will compile on ARM systems.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
show more ...
|
| #
cb32ed1f |
| 04-Aug-2009 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'next' of git://git.denx.de/u-boot-coldfire
|
| #
108f56b0 |
| 29-Jul-2009 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
|
| #
4c2e3da8 |
| 28-Jul-2009 |
Kumar Gala <kumar.gala@freescale.com> |
Update Freescale copyrights to remove "All Rights Reserved"
"All Rights Reserved" conflicts with the GPL.
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
|
| #
156feb90 |
| 23-Feb-2009 |
Haavard Skinnemoen <haavard.skinnemoen@atmel.com> |
Merge branch 'mimc200' into next
Conflicts:
board/mimc/mimc200/mimc200.c
include/configs/mimc200.h
|
| #
be4880eb |
| 21-Jan-2009 |
Kim Phillips <kim.phillips@freescale.com> |
Merge branch 'master' into next
|