summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '3c547d7bb7889182d5bcecbb3edea4c71774c6a3' into stable-0.12-mergeAvi Kivity2009-12-201-12/+8
|\
| * Fix thinko in linuxboot.SPaolo Bonzini2009-12-191-12/+8
* | vapic: fix alignmentAvi Kivity2009-12-131-1/+5
* | Merge commit 'd08d6f04d6eeedce5090ff66d0676162d7d8d788' into upstream-mergeAvi Kivity2009-12-072-6/+9
|\|
| * multiboot: Fix module loading and setting of mmap.Adam Lackorzynski2009-12-031-1/+4
| * Make -kernel for linux work with bochsbiosAlexander Graf2009-12-031-5/+5
* | Merge commit 'dd4239d6574ca41c94fc0d0f77ddc728510ffc57' into upstream-mergeAvi Kivity2009-11-221-1/+4
|\|
| * Allow build of linuxboot.S with old assemblersJuergen Lock2009-11-211-1/+4
* | Merge commit '57a46d0579951d7abbcbe86766f73afa93a5d370' into upstream-mergeAvi Kivity2009-11-224-70/+289
|\|
| * Convert linux bootrom to external rom and fw_cfgAlexander Graf2009-11-172-1/+141
| * Move common option rom code to header fileAlexander Graf2009-11-172-76/+110
| * Convert multiboot to fw_cfg backed data storageAlexander Graf2009-11-171-17/+60
* | Merge commit '93db66850d99fd9885edeff6af5679be51e1c610' into upstream-mergeMark McLoughlin2009-10-281-0/+3
|\|
| * multiboot.S patch for old as(1) (was: Re: [Qemu-devel] Some OpenBSD/amd64 bui...Juergen Lock2009-10-271-0/+3
* | Make vapic.S into optional romGleb Natapov2009-10-262-1/+312
* | Merge commit '1215c6e7615897e4a0bfd6867b762a47fc34f37f' into upstream-mergeMarcelo Tosatti2009-10-141-1/+2
|\|
| * optionrom: create .PHONY variableJuan Quintela2009-10-061-0/+1
| * optionrom: remove use of implicit RM variableJuan Quintela2009-10-061-1/+1
* | Merge commit '07caea315a85ebfe90851f9c2e4ef3fdd24117b5' into upstream-mergeAvi Kivity2009-10-061-2/+2
|\|
| * restore CFLAGS check for conflict and fix recursive CFLAGS issueThomas Monjalon2009-10-051-2/+2
* | Merge commit 'e09a5267adf0af25b55d2abaf06e288b2d9537ea' into upstream-mergeAvi Kivity2009-09-101-2/+3
|\|
| * optionrom: make clean should remove raw and .dJuan Quintela2009-09-091-1/+1
| * otionrom: Use local CFLAGS no global oneJuan Quintela2009-09-091-0/+1
| * Remove CFLAGS parameter in cc-optionJuan Quintela2009-09-091-1/+1
* | Merge commit 'a558ee17761c3c9ef22792bd5097880ab92f1bf5' into upstream-mergeAvi Kivity2009-08-111-3/+3
|\|
| * Rename CPPFLAGS to QEMU_CFLAGSJuan Quintela2009-08-101-3/+3
* | Merge commit 'a36abbbbfbe32f3beb649d3cddd7304137f44780' into upstream-mergeAvi Kivity2009-08-111-1/+2
|\|
| * Fix checksum writing in signboot.shAlexander Graf2009-08-101-1/+2
* | Merge commit '7282a0331f11edd021efa3687dc2ec7fd557ace9' into upstream-mergeAvi Kivity2009-08-111-1/+1
|\|
| * Do not try to invoke shebang scripts directly (NFS issues)malc2009-08-101-1/+1
* | Merge branch 'master' of git://git.sv.gnu.org/qemuAvi Kivity2009-08-041-0/+2
|\|
| * Option rom makefile fixesPaul Brook2009-07-311-0/+2
* | Merge commit '4c955388572068c57bb8cd205b61fa5dfa1a84f1' into upstream-mergeAvi Kivity2009-07-291-29/+7
|\|
| * Fix out of tree build broken by 791e08c753a9f9be3c3880b4ea83b6dfa4b6ccadBlue Swirl2009-07-271-1/+1
| * use cc-option for optionromJuan Quintela2009-07-271-21/+1
| * Use quiet-command for building optionromJuan Quintela2009-07-271-9/+7
* | Merge commit 'f07918fdff76ace82b1ca3e53bbcddef069eb314' into upstream-mergeAvi Kivity2009-07-281-2/+3
|\|
| * signrom.sh: portability fixChristoph Egger2009-07-221-2/+3
* | Merge commit '0ba99fc6a188988f11361cb41eba7c1afce346d4' into upstream-mergeAvi Kivity2009-07-283-8/+7
|\|
| * Update to a hopefully more future proof FSF addressBlue Swirl2009-07-162-4/+2
| * Don't copy multiboot.bin into pc-bios after builtAnthony Liguori2009-07-161-1/+0
| * Fix multiboot.bin build on mingw32Anthony Liguori2009-07-161-3/+5
* | Merge commit '9a3e12c8a48ef96bf0f3effc21a4ce98d35992f9' into upstream-mergeAvi Kivity2009-07-123-85/+48
|\|
| * Replace signrom with shell script v3Alexander Graf2009-07-093-85/+48
* | Move extboot to other optionromsJan Kiszka2009-07-082-1/+696
|/
* Work around Solaris gas problemBlue Swirl2009-07-031-1/+1
* Multiboot build system v4Alexander Graf2009-06-292-0/+127
* Multiboot support v5Alexander Graf2009-06-291-0/+209