* [Qemu-devel] [PATCH 2/5] Add defines for PCI IDs.
2010-05-07 10:09 [Qemu-devel] [PATCH 1/5] Makefile cleanup Gerd Hoffmann
@ 2010-05-07 10:09 ` Gerd Hoffmann
2010-05-07 15:32 ` Blue Swirl
2010-05-07 10:09 ` [Qemu-devel] [PATCH 3/5] Add qemu stdvga pci bios Gerd Hoffmann
` (4 subsequent siblings)
5 siblings, 1 reply; 11+ messages in thread
From: Gerd Hoffmann @ 2010-05-07 10:09 UTC (permalink / raw)
To: qemu-devel, vgabios-developers; +Cc: Gerd Hoffmann
This patch allows to set PCI vendor and device IDs using defines
(PCI_VID and PCI_DID). Use it for vgabios.bin.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
Makefile | 4 ++--
vbe.c | 6 +++++-
vgabios.c | 5 +++++
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index c3c744c..d440b93 100644
--- a/Makefile
+++ b/Makefile
@@ -31,8 +31,8 @@ VGA_FILES := vgabios.c vgabios.h vgafonts.h vgatables.h
VBE_FILES := vbe.h vbe.c vbetables.h
# build flags
-vgabios.bin : VGAFLAGS := -DVBE
-vgabios.debug.bin : VGAFLAGS := -DVBE -DDEBUG
+vgabios.bin : VGAFLAGS := -DVBE -DPCI_VID=0x1234
+vgabios.debug.bin : VGAFLAGS := -DVBE -DPCI_VID=0x1234 -DDEBUG
vgabios-cirrus.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS
vgabios-cirrus.debug.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS -DCIRRUS_DEBUG
diff --git a/vbe.c b/vbe.c
index f925c35..f9a77f0 100644
--- a/vbe.c
+++ b/vbe.c
@@ -925,7 +925,11 @@ Bit16u *AX;Bit16u CX; Bit16u ES;Bit16u DI;
if (using_lfb) {
info.NumberOfBanks = 1;
}
- lfb_addr = pci_get_lfb_addr(0x1234); // experimental vendor
+#ifdef PCI_VID
+ lfb_addr = pci_get_lfb_addr(PCI_VID);
+#else
+ lfb_addr = 0;
+#endif
if (lfb_addr > 0) {
info.PhysBasePtr = ((Bit32u)lfb_addr << 16);
}
diff --git a/vgabios.c b/vgabios.c
index 3b09c92..a575b7b 100644
--- a/vgabios.c
+++ b/vgabios.c
@@ -210,8 +210,13 @@ vgabios_pci_data:
.word 0x1013
.word 0x00b8 // CLGD5446
#else
+#ifdef PCI_VID
+.word PCI_VID
+.word PCI_DID
+#else
#error "Unknown PCI vendor and device id"
#endif
+#endif
.word 0 // reserved
.word 0x18 // dlen
.byte 0 // revision
--
1.6.6.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [Qemu-devel] [PATCH 2/5] Add defines for PCI IDs.
2010-05-07 10:09 ` [Qemu-devel] [PATCH 2/5] Add defines for PCI IDs Gerd Hoffmann
@ 2010-05-07 15:32 ` Blue Swirl
2010-05-10 7:51 ` Gerd Hoffmann
0 siblings, 1 reply; 11+ messages in thread
From: Blue Swirl @ 2010-05-07 15:32 UTC (permalink / raw)
To: Gerd Hoffmann; +Cc: vgabios-developers, qemu-devel
On 5/7/10, Gerd Hoffmann <kraxel@redhat.com> wrote:
> This patch allows to set PCI vendor and device IDs using defines
> (PCI_VID and PCI_DID). Use it for vgabios.bin.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
> Makefile | 4 ++--
> vbe.c | 6 +++++-
> vgabios.c | 5 +++++
> 3 files changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index c3c744c..d440b93 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -31,8 +31,8 @@ VGA_FILES := vgabios.c vgabios.h vgafonts.h vgatables.h
> VBE_FILES := vbe.h vbe.c vbetables.h
>
> # build flags
> -vgabios.bin : VGAFLAGS := -DVBE
> -vgabios.debug.bin : VGAFLAGS := -DVBE -DDEBUG
> +vgabios.bin : VGAFLAGS := -DVBE -DPCI_VID=0x1234
> +vgabios.debug.bin : VGAFLAGS := -DVBE -DPCI_VID=0x1234 -DDEBUG
-DPCI_DID missing...
> vgabios-cirrus.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS
> vgabios-cirrus.debug.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS -DCIRRUS_DEBUG
>
> diff --git a/vbe.c b/vbe.c
> index f925c35..f9a77f0 100644
> --- a/vbe.c
> +++ b/vbe.c
> @@ -925,7 +925,11 @@ Bit16u *AX;Bit16u CX; Bit16u ES;Bit16u DI;
> if (using_lfb) {
> info.NumberOfBanks = 1;
> }
> - lfb_addr = pci_get_lfb_addr(0x1234); // experimental vendor
> +#ifdef PCI_VID
> + lfb_addr = pci_get_lfb_addr(PCI_VID);
> +#else
> + lfb_addr = 0;
> +#endif
> if (lfb_addr > 0) {
> info.PhysBasePtr = ((Bit32u)lfb_addr << 16);
> }
> diff --git a/vgabios.c b/vgabios.c
> index 3b09c92..a575b7b 100644
> --- a/vgabios.c
> +++ b/vgabios.c
> @@ -210,8 +210,13 @@ vgabios_pci_data:
> .word 0x1013
> .word 0x00b8 // CLGD5446
> #else
> +#ifdef PCI_VID
> +.word PCI_VID
> +.word PCI_DID
... so this generates:
.word 0x1234
.word PCI_DID
I read only this patch, so sorry for the noise if I missed something.
> +#else
> #error "Unknown PCI vendor and device id"
> #endif
> +#endif
> .word 0 // reserved
> .word 0x18 // dlen
> .byte 0 // revision
>
> --
> 1.6.6.1
>
>
>
>
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [Qemu-devel] [PATCH 2/5] Add defines for PCI IDs.
2010-05-07 15:32 ` Blue Swirl
@ 2010-05-10 7:51 ` Gerd Hoffmann
0 siblings, 0 replies; 11+ messages in thread
From: Gerd Hoffmann @ 2010-05-10 7:51 UTC (permalink / raw)
To: Blue Swirl; +Cc: vgabios-developers, qemu-devel
On 05/07/10 17:32, Blue Swirl wrote:
> On 5/7/10, Gerd Hoffmann<kraxel@redhat.com> wrote:
>> This patch allows to set PCI vendor and device IDs using defines
>> (PCI_VID and PCI_DID). Use it for vgabios.bin.
>>
>> Signed-off-by: Gerd Hoffmann<kraxel@redhat.com>
>> ---
>> Makefile | 4 ++--
>> vbe.c | 6 +++++-
>> vgabios.c | 5 +++++
>> 3 files changed, 12 insertions(+), 3 deletions(-)
>>
>> diff --git a/Makefile b/Makefile
>> index c3c744c..d440b93 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -31,8 +31,8 @@ VGA_FILES := vgabios.c vgabios.h vgafonts.h vgatables.h
>> VBE_FILES := vbe.h vbe.c vbetables.h
>>
>> # build flags
>> -vgabios.bin : VGAFLAGS := -DVBE
>> -vgabios.debug.bin : VGAFLAGS := -DVBE -DDEBUG
>> +vgabios.bin : VGAFLAGS := -DVBE -DPCI_VID=0x1234
>> +vgabios.debug.bin : VGAFLAGS := -DVBE -DPCI_VID=0x1234 -DDEBUG
>
> -DPCI_DID missing...
Not needed here.
>> @@ -210,8 +210,13 @@ vgabios_pci_data:
>> .word 0x1013
>> .word 0x00b8 // CLGD5446
>> #else
>> +#ifdef PCI_VID
>> +.word PCI_VID
>> +.word PCI_DID
>
> ... so this generates:
> .word 0x1234
> .word PCI_DID
The whole construct is wrapped into a #ifdef PCIBIOS (not visible in the
patch as it would have needed more context).
cheers,
Gerd
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Qemu-devel] [PATCH 3/5] Add qemu stdvga pci bios
2010-05-07 10:09 [Qemu-devel] [PATCH 1/5] Makefile cleanup Gerd Hoffmann
2010-05-07 10:09 ` [Qemu-devel] [PATCH 2/5] Add defines for PCI IDs Gerd Hoffmann
@ 2010-05-07 10:09 ` Gerd Hoffmann
2010-05-07 10:09 ` [Qemu-devel] [PATCH 4/5] update pci_get_lfb_addr for vmware vga Gerd Hoffmann
` (3 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Gerd Hoffmann @ 2010-05-07 10:09 UTC (permalink / raw)
To: qemu-devel, vgabios-developers; +Cc: Gerd Hoffmann
Add PCI vgabios for the qemu standard vga (1234:1111).
Name it vgabios-stdvga.bin.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
Makefile | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index d440b93..58f064e 100644
--- a/Makefile
+++ b/Makefile
@@ -14,12 +14,14 @@ RELVERS = `pwd | sed "s-.*/--" | sed "s/vgabios//" | sed "s/-//"`
VGABIOS_DATE = "-DVGABIOS_DATE=\"$(RELDATE)\""
-all: bios cirrus-bios
+all: bios cirrus-bios stdvga-bios
bios: vgabios.bin vgabios.debug.bin
cirrus-bios: vgabios-cirrus.bin vgabios-cirrus.debug.bin
+stdvga-bios: vgabios-stdvga.bin vgabios-stdvga.debug.bin
+
clean:
/bin/rm -f biossums vbetables-gen vbetables.h *.o *.s *.ld86 \
temp.awk.* vgabios*.orig _vgabios_* _vgabios-debug_* core vgabios*.bin vgabios*.txt $(RELEASE).bin *.bak
@@ -35,18 +37,24 @@ vgabios.bin : VGAFLAGS := -DVBE -DPCI_VID=0x1234
vgabios.debug.bin : VGAFLAGS := -DVBE -DPCI_VID=0x1234 -DDEBUG
vgabios-cirrus.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS
vgabios-cirrus.debug.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS -DCIRRUS_DEBUG
+vgabios-stdvga.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x1234 -DPCI_DID=0x1111
+vgabios-stdvga.debug.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x1234 -DPCI_DID=0x1111 -DDEBUG
# dist names
vgabios.bin : DISTNAME := VGABIOS-lgpl-latest.bin
vgabios.debug.bin : DISTNAME := VGABIOS-lgpl-latest.debug.bin
vgabios-cirrus.bin : DISTNAME := VGABIOS-lgpl-latest.cirrus.bin
vgabios-cirrus.debug.bin : DISTNAME := VGABIOS-lgpl-latest.cirrus.debug.bin
+vgabios-stdvga.bin : DISTNAME := VGABIOS-lgpl-latest.stdvga.bin
+vgabios-stdvga.debug.bin : DISTNAME := VGABIOS-lgpl-latest.stdvga.debug.bin
# dependencies
vgabios.bin : $(VGA_FILES) $(VBE_FILES) biossums
vgabios.debug.bin : $(VGA_FILES) $(VBE_FILES) biossums
vgabios-cirrus.bin : $(VGA_FILES) clext.c biossums
vgabios-cirrus.debug.bin : $(VGA_FILES) clext.c biossums
+vgabios-stdvga.bin : $(VGA_FILES) $(VBE_FILES) biossums
+vgabios-stdvga.debug.bin : $(VGA_FILES) $(VBE_FILES) biossums
# build rule
%.bin:
--
1.6.6.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Qemu-devel] [PATCH 4/5] update pci_get_lfb_addr for vmware vga
2010-05-07 10:09 [Qemu-devel] [PATCH 1/5] Makefile cleanup Gerd Hoffmann
2010-05-07 10:09 ` [Qemu-devel] [PATCH 2/5] Add defines for PCI IDs Gerd Hoffmann
2010-05-07 10:09 ` [Qemu-devel] [PATCH 3/5] Add qemu stdvga pci bios Gerd Hoffmann
@ 2010-05-07 10:09 ` Gerd Hoffmann
2010-05-07 10:09 ` [Qemu-devel] [PATCH 5/5] Add qemu vmware vga pci bios Gerd Hoffmann
` (2 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Gerd Hoffmann @ 2010-05-07 10:09 UTC (permalink / raw)
To: qemu-devel, vgabios-developers; +Cc: Gerd Hoffmann
vmware vga has the framebuffer at pci region 1 not 0. This patch makes
pci_get_lfb_addr check region 1 too. It also gives names to the
numbered labels to make the code more readable.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
vgabios.c | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/vgabios.c b/vgabios.c
index a575b7b..ed89334 100644
--- a/vgabios.c
+++ b/vgabios.c
@@ -3852,26 +3852,31 @@ _pci_get_lfb_addr:
mov dl, #0x00
call pci_read_reg
cmp ax, #0xffff
- jz pci_get_lfb_addr_5
- pci_get_lfb_addr_3:
+ jz pci_get_lfb_addr_fail
+ pci_get_lfb_addr_next_dev:
mov dl, #0x00
call pci_read_reg
cmp ax, bx ;; check vendor
- jz pci_get_lfb_addr_4
+ jz pci_get_lfb_addr_found
add cx, #0x8
cmp cx, #0x200 ;; search bus #0 and #1
- jb pci_get_lfb_addr_3
- pci_get_lfb_addr_5:
+ jb pci_get_lfb_addr_next_dev
+ pci_get_lfb_addr_fail:
xor dx, dx ;; no LFB
- jmp pci_get_lfb_addr_6
- pci_get_lfb_addr_4:
+ jmp pci_get_lfb_addr_return
+ pci_get_lfb_addr_found:
mov dl, #0x10 ;; I/O space #0
call pci_read_reg
test ax, #0xfff1
- jnz pci_get_lfb_addr_5
+ jz pci_get_lfb_addr_success
+ mov dl, #0x14 ;; I/O space #1
+ call pci_read_reg
+ test ax, #0xfff1
+ jnz pci_get_lfb_addr_fail
+ pci_get_lfb_addr_success:
shr eax, #16
mov dx, ax ;; LFB address
- pci_get_lfb_addr_6:
+ pci_get_lfb_addr_return:
pop eax
mov ax, dx
pop dx
--
1.6.6.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Qemu-devel] [PATCH 5/5] Add qemu vmware vga pci bios
2010-05-07 10:09 [Qemu-devel] [PATCH 1/5] Makefile cleanup Gerd Hoffmann
` (2 preceding siblings ...)
2010-05-07 10:09 ` [Qemu-devel] [PATCH 4/5] update pci_get_lfb_addr for vmware vga Gerd Hoffmann
@ 2010-05-07 10:09 ` Gerd Hoffmann
2010-05-07 14:38 ` [Qemu-devel] [PATCH 1/5] Makefile cleanup Isaku Yamahata
2010-05-20 12:57 ` [Qemu-devel] vgabios plans ( Re: [PATCH 1/5] Makefile cleanup) Gerd Hoffmann
5 siblings, 0 replies; 11+ messages in thread
From: Gerd Hoffmann @ 2010-05-07 10:09 UTC (permalink / raw)
To: qemu-devel, vgabios-developers; +Cc: Gerd Hoffmann
Add PCI vgabios for the qemu vmeare vga (15ad:0405).
Name it vgabios-vmware.bin.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
Makefile | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 58f064e..2a093e8 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ RELVERS = `pwd | sed "s-.*/--" | sed "s/vgabios//" | sed "s/-//"`
VGABIOS_DATE = "-DVGABIOS_DATE=\"$(RELDATE)\""
-all: bios cirrus-bios stdvga-bios
+all: bios cirrus-bios stdvga-bios vmware-bios
bios: vgabios.bin vgabios.debug.bin
@@ -22,6 +22,8 @@ cirrus-bios: vgabios-cirrus.bin vgabios-cirrus.debug.bin
stdvga-bios: vgabios-stdvga.bin vgabios-stdvga.debug.bin
+vmware-bios: vgabios-vmware.bin vgabios-vmware.debug.bin
+
clean:
/bin/rm -f biossums vbetables-gen vbetables.h *.o *.s *.ld86 \
temp.awk.* vgabios*.orig _vgabios_* _vgabios-debug_* core vgabios*.bin vgabios*.txt $(RELEASE).bin *.bak
@@ -39,6 +41,8 @@ vgabios-cirrus.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS
vgabios-cirrus.debug.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS -DCIRRUS_DEBUG
vgabios-stdvga.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x1234 -DPCI_DID=0x1111
vgabios-stdvga.debug.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x1234 -DPCI_DID=0x1111 -DDEBUG
+vgabios-vmware.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x15ad -DPCI_DID=0x0405
+vgabios-vmware.debug.bin : VGAFLAGS := -DVBE -DPCIBIOS -DPCI_VID=0x15ad -DPCI_DID=0x0405 -DDEBUG
# dist names
vgabios.bin : DISTNAME := VGABIOS-lgpl-latest.bin
@@ -47,6 +51,8 @@ vgabios-cirrus.bin : DISTNAME := VGABIOS-lgpl-latest.cirrus.bin
vgabios-cirrus.debug.bin : DISTNAME := VGABIOS-lgpl-latest.cirrus.debug.bin
vgabios-stdvga.bin : DISTNAME := VGABIOS-lgpl-latest.stdvga.bin
vgabios-stdvga.debug.bin : DISTNAME := VGABIOS-lgpl-latest.stdvga.debug.bin
+vgabios-vmware.bin : DISTNAME := VGABIOS-lgpl-latest.vmware.bin
+vgabios-vmware.debug.bin : DISTNAME := VGABIOS-lgpl-latest.vmware.debug.bin
# dependencies
vgabios.bin : $(VGA_FILES) $(VBE_FILES) biossums
@@ -55,6 +61,8 @@ vgabios-cirrus.bin : $(VGA_FILES) clext.c biossums
vgabios-cirrus.debug.bin : $(VGA_FILES) clext.c biossums
vgabios-stdvga.bin : $(VGA_FILES) $(VBE_FILES) biossums
vgabios-stdvga.debug.bin : $(VGA_FILES) $(VBE_FILES) biossums
+vgabios-vmware.bin : $(VGA_FILES) $(VBE_FILES) biossums
+vgabios-vmware.debug.bin : $(VGA_FILES) $(VBE_FILES) biossums
# build rule
%.bin:
--
1.6.6.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [Qemu-devel] [PATCH 1/5] Makefile cleanup
2010-05-07 10:09 [Qemu-devel] [PATCH 1/5] Makefile cleanup Gerd Hoffmann
` (3 preceding siblings ...)
2010-05-07 10:09 ` [Qemu-devel] [PATCH 5/5] Add qemu vmware vga pci bios Gerd Hoffmann
@ 2010-05-07 14:38 ` Isaku Yamahata
2010-05-20 12:57 ` [Qemu-devel] vgabios plans ( Re: [PATCH 1/5] Makefile cleanup) Gerd Hoffmann
5 siblings, 0 replies; 11+ messages in thread
From: Isaku Yamahata @ 2010-05-07 14:38 UTC (permalink / raw)
To: Gerd Hoffmann; +Cc: vgabios-developers, qemu-devel
Hi. If gmake extension is allowed, nasty rm in the rule can be removed
by using intermediate file which is removed after build.
We can combine your cleanup with mine.
[PATCH] vgabios: Makefile: clean up using gmake extension.
clean up nasty rule by using gmake extension
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
---
Makefile | 92 +++++++++++++++++++++++++++++--------------------------------
1 files changed, 44 insertions(+), 48 deletions(-)
diff --git a/Makefile b/Makefile
index 00e8c66..4ead342 100644
--- a/Makefile
+++ b/Makefile
@@ -17,13 +17,14 @@ VGABIOS_DATE = "-DVGABIOS_DATE=\"$(RELDATE)\""
all: bios cirrus-bios
-bios: biossums vgabios.bin vgabios.debug.bin
+bios: biossums VGABIOS-lgpl-latest.bin VGABIOS-lgpl-latest.debug.bin
-cirrus-bios: vgabios-cirrus.bin vgabios-cirrus.debug.bin
+cirrus-bios: VGABIOS-lgpl-latest.cirrus.bin VGABIOS-lgpl-latest.cirrus.debug.bin
clean:
/bin/rm -f biossums vbetables-gen vbetables.h *.o *.s *.ld86 \
- temp.awk.* vgabios*.orig _vgabios_* _vgabios-debug_* core vgabios*.bin vgabios*.txt $(RELEASE).bin *.bak
+ temp.awk.* vgabios*.orig _vgabios_* _vgabios.*_* core \
+ VGABIOS-lgpl-latest*.bin vgabios*.bin vgabios*.txt $(RELEASE).bin *.bak
dist-clean: clean
@@ -37,51 +38,46 @@ release:
cp VGABIOS-lgpl-latest.cirrus.debug.bin ../$(RELEASE).cirrus.debug.bin
tar czvf ../$(RELEASE).tgz --exclude CVS -C .. $(RELEASE)/
-vgabios.bin: vgabios.c vgabios.h vgafonts.h vgatables.h vbe.h vbe.c vbetables.h
- $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DVBE $(VGABIOS_DATE) > _vgabios_.c
- $(BCC) -o vgabios.s -C-c -D__i86__ -S -0 _vgabios_.c
- sed -e 's/^\.text//' -e 's/^\.data//' vgabios.s > _vgabios_.s
- $(AS86) _vgabios_.s -b vgabios.bin -u -w- -g -0 -j -O -l vgabios.txt
- rm -f _vgabios_.s _vgabios_.c vgabios.s
- mv vgabios.bin VGABIOS-lgpl-latest.bin
- ./biossums VGABIOS-lgpl-latest.bin
- ls -l VGABIOS-lgpl-latest.bin
-
-vgabios.debug.bin: vgabios.c vgabios.h vgafonts.h vgatables.h vbe.h vbe.c vbetables.h
- $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DVBE -DDEBUG $(VGABIOS_DATE) > _vgabios-debug_.c
- $(BCC) -o vgabios-debug.s -C-c -D__i86__ -S -0 _vgabios-debug_.c
- sed -e 's/^\.text//' -e 's/^\.data//' vgabios-debug.s > _vgabios-debug_.s
- $(AS86) _vgabios-debug_.s -b vgabios.debug.bin -u -w- -g -0 -j -O -l vgabios.debug.txt
- rm -f _vgabios-debug_.s _vgabios-debug_.c vgabios-debug.s
- mv vgabios.debug.bin VGABIOS-lgpl-latest.debug.bin
- ./biossums VGABIOS-lgpl-latest.debug.bin
- ls -l VGABIOS-lgpl-latest.debug.bin
-
-vgabios-cirrus.bin: vgabios.c vgabios.h vgafonts.h vgatables.h clext.c
- $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS -DPCIBIOS $(VGABIOS_DATE) > _vgabios-cirrus_.c
- $(BCC) -o vgabios-cirrus.s -C-c -D__i86__ -S -0 _vgabios-cirrus_.c
- sed -e 's/^\.text//' -e 's/^\.data//' vgabios-cirrus.s > _vgabios-cirrus_.s
- $(AS86) _vgabios-cirrus_.s -b vgabios-cirrus.bin -u -w- -g -0 -j -O -l vgabios.cirrus.txt
- rm -f _vgabios-cirrus_.s _vgabios-cirrus_.c vgabios-cirrus.s
- mv vgabios-cirrus.bin VGABIOS-lgpl-latest.cirrus.bin
- ./biossums VGABIOS-lgpl-latest.cirrus.bin
- ls -l VGABIOS-lgpl-latest.cirrus.bin
-
-vgabios-cirrus.debug.bin: vgabios.c vgabios.h vgafonts.h vgatables.h clext.c
- $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS -DCIRRUS_DEBUG -DPCIBIOS $(VGABIOS_DATE) > _vgabios-cirrus-debug_.c
- $(BCC) -o vgabios-cirrus-debug.s -C-c -D__i86__ -S -0 _vgabios-cirrus-debug_.c
- sed -e 's/^\.text//' -e 's/^\.data//' vgabios-cirrus-debug.s > _vgabios-cirrus-debug_.s
- $(AS86) _vgabios-cirrus-debug_.s -b vgabios.cirrus.debug.bin -u -w- -g -0 -j -O -l vgabios.cirrus.debug.txt
- rm -f _vgabios-cirrus-debug_.s _vgabios-cirrus-debug_.c vgabios-cirrus-debug.s
- mv vgabios.cirrus.debug.bin VGABIOS-lgpl-latest.cirrus.debug.bin
- ./biossums VGABIOS-lgpl-latest.cirrus.debug.bin
- ls -l VGABIOS-lgpl-latest.cirrus.debug.bin
-
-biossums: biossums.c
- $(CC) -o biossums biossums.c
-
-vbetables-gen: vbetables-gen.c
- $(CC) -o vbetables-gen vbetables-gen.c
+define gcc-e-p
+ $(GCC) -E -P $< $(VGABIOS_VERS) $(EXTRA_DEFINES) $(VGABIOS_DATE) > $@
+endef
+
+_vgabios_.c: EXTRA_DEFINES = -DVBE
+_vgabios_.c: vgabios.c vgabios.h vgafonts.h vgatables.h vbe.h vbe.c vbetables.h
+ $(gcc-e-p)
+
+_vgabios.debug_.c: EXTRA_DEFINES = -DVBE -DDEBUG
+_vgabios.debug_.c: vgabios.c vgabios.h vgafonts.h vgatables.h vbe.h vbe.c vbetables.h
+ $(gcc-e-p)
+
+_vgabios.cirrus_.c: EXTRA_DEFINES = -DCIRRUS -DPCIBIOS
+_vgabios.cirrus_.c: vgabios.c vgabios.h vgafonts.h vgatables.h clext.c
+ $(gcc-e-p)
+
+_vgabios.cirrus.debug_.c: EXTRA_DEFINES = -DCIRRUS -DCIRRUS_DEBUG -DPCIBIOS
+_vgabios.cirrus.debug_.c: vgabios.c vgabios.h vgafonts.h vgatables.h clext.c
+ $(gcc-e-p)
+
+.INTERMEDIATE: _vgabios_.c _vgabios.debug_.c _vgabios.cirrus_.c _vgabios.cirrus.debug_.c
+
+
+%.s: _%_.c
+ $(BCC) -o $@ -C-c -D__i86__ -S -0 $<
+
+_%_.s: %.s
+ sed -e 's/^\.text//' -e 's/^\.data//' $< > $@
+
+%.bin %.txt: _%_.s
+ $(AS86) $< -b $*.bin -u -w- -g -0 -j -O -l $*.txt
+
+VGABIOS-lgpl-latest%bin: vgabios%bin
+ mv $< $@
+ ./biossums $@
+ ls -l $@
+
+# for biossums and vbetables-gen
+%: %.c
+ $(CC) -o $@ $<
vbetables.h: vbetables-gen
./vbetables-gen > $@
--
1.6.6.1
On Fri, May 07, 2010 at 12:09:43PM +0200, Gerd Hoffmann wrote:
> Use a single rule for building bios binaries.
> Use target specific variables to set compile flags.
>
> This makes it more obvious what the differences between the versions
> are. It also makes it easier to add new bios binaries with slightly
> different settings.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
> Makefile | 76 +++++++++++++++++++++++++++----------------------------------
> 1 files changed, 34 insertions(+), 42 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 00e8c66..c3c744c 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -16,8 +16,7 @@ VGABIOS_DATE = "-DVGABIOS_DATE=\"$(RELDATE)\""
>
> all: bios cirrus-bios
>
> -
> -bios: biossums vgabios.bin vgabios.debug.bin
> +bios: vgabios.bin vgabios.debug.bin
>
> cirrus-bios: vgabios-cirrus.bin vgabios-cirrus.debug.bin
>
> @@ -27,6 +26,39 @@ clean:
>
> dist-clean: clean
>
> +# source files
> +VGA_FILES := vgabios.c vgabios.h vgafonts.h vgatables.h
> +VBE_FILES := vbe.h vbe.c vbetables.h
> +
> +# build flags
> +vgabios.bin : VGAFLAGS := -DVBE
> +vgabios.debug.bin : VGAFLAGS := -DVBE -DDEBUG
> +vgabios-cirrus.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS
> +vgabios-cirrus.debug.bin : VGAFLAGS := -DCIRRUS -DPCIBIOS -DCIRRUS_DEBUG
> +
> +# dist names
> +vgabios.bin : DISTNAME := VGABIOS-lgpl-latest.bin
> +vgabios.debug.bin : DISTNAME := VGABIOS-lgpl-latest.debug.bin
> +vgabios-cirrus.bin : DISTNAME := VGABIOS-lgpl-latest.cirrus.bin
> +vgabios-cirrus.debug.bin : DISTNAME := VGABIOS-lgpl-latest.cirrus.debug.bin
> +
> +# dependencies
> +vgabios.bin : $(VGA_FILES) $(VBE_FILES) biossums
> +vgabios.debug.bin : $(VGA_FILES) $(VBE_FILES) biossums
> +vgabios-cirrus.bin : $(VGA_FILES) clext.c biossums
> +vgabios-cirrus.debug.bin : $(VGA_FILES) clext.c biossums
> +
> +# build rule
> +%.bin:
> + $(GCC) -E -P vgabios.c $(VGABIOS_VERS) $(VGAFLAGS) $(VGABIOS_DATE) > _$*_.c
> + $(BCC) -o $*.s -C-c -D__i86__ -S -0 _$*_.c
> + sed -e 's/^\.text//' -e 's/^\.data//' $*.s > _$*_.s
> + $(AS86) _$*_.s -b $*.bin -u -w- -g -0 -j -O -l $*.txt
> + rm -f _$*_.s _$*_.c $*.s
> + mv $*.bin $(DISTNAME)
> + ./biossums $(DISTNAME)
> + ls -l $(DISTNAME)
> +
> release:
> VGABIOS_VERS=\"-DVGABIOS_VERS=\\\"$(RELVERS)\\\"\" make bios cirrus-bios
> /bin/rm -f *.o *.s *.ld86 \
> @@ -37,46 +69,6 @@ release:
> cp VGABIOS-lgpl-latest.cirrus.debug.bin ../$(RELEASE).cirrus.debug.bin
> tar czvf ../$(RELEASE).tgz --exclude CVS -C .. $(RELEASE)/
>
> -vgabios.bin: vgabios.c vgabios.h vgafonts.h vgatables.h vbe.h vbe.c vbetables.h
> - $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DVBE $(VGABIOS_DATE) > _vgabios_.c
> - $(BCC) -o vgabios.s -C-c -D__i86__ -S -0 _vgabios_.c
> - sed -e 's/^\.text//' -e 's/^\.data//' vgabios.s > _vgabios_.s
> - $(AS86) _vgabios_.s -b vgabios.bin -u -w- -g -0 -j -O -l vgabios.txt
> - rm -f _vgabios_.s _vgabios_.c vgabios.s
> - mv vgabios.bin VGABIOS-lgpl-latest.bin
> - ./biossums VGABIOS-lgpl-latest.bin
> - ls -l VGABIOS-lgpl-latest.bin
> -
> -vgabios.debug.bin: vgabios.c vgabios.h vgafonts.h vgatables.h vbe.h vbe.c vbetables.h
> - $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DVBE -DDEBUG $(VGABIOS_DATE) > _vgabios-debug_.c
> - $(BCC) -o vgabios-debug.s -C-c -D__i86__ -S -0 _vgabios-debug_.c
> - sed -e 's/^\.text//' -e 's/^\.data//' vgabios-debug.s > _vgabios-debug_.s
> - $(AS86) _vgabios-debug_.s -b vgabios.debug.bin -u -w- -g -0 -j -O -l vgabios.debug.txt
> - rm -f _vgabios-debug_.s _vgabios-debug_.c vgabios-debug.s
> - mv vgabios.debug.bin VGABIOS-lgpl-latest.debug.bin
> - ./biossums VGABIOS-lgpl-latest.debug.bin
> - ls -l VGABIOS-lgpl-latest.debug.bin
> -
> -vgabios-cirrus.bin: vgabios.c vgabios.h vgafonts.h vgatables.h clext.c
> - $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS -DPCIBIOS $(VGABIOS_DATE) > _vgabios-cirrus_.c
> - $(BCC) -o vgabios-cirrus.s -C-c -D__i86__ -S -0 _vgabios-cirrus_.c
> - sed -e 's/^\.text//' -e 's/^\.data//' vgabios-cirrus.s > _vgabios-cirrus_.s
> - $(AS86) _vgabios-cirrus_.s -b vgabios-cirrus.bin -u -w- -g -0 -j -O -l vgabios.cirrus.txt
> - rm -f _vgabios-cirrus_.s _vgabios-cirrus_.c vgabios-cirrus.s
> - mv vgabios-cirrus.bin VGABIOS-lgpl-latest.cirrus.bin
> - ./biossums VGABIOS-lgpl-latest.cirrus.bin
> - ls -l VGABIOS-lgpl-latest.cirrus.bin
> -
> -vgabios-cirrus.debug.bin: vgabios.c vgabios.h vgafonts.h vgatables.h clext.c
> - $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS -DCIRRUS_DEBUG -DPCIBIOS $(VGABIOS_DATE) > _vgabios-cirrus-debug_.c
> - $(BCC) -o vgabios-cirrus-debug.s -C-c -D__i86__ -S -0 _vgabios-cirrus-debug_.c
> - sed -e 's/^\.text//' -e 's/^\.data//' vgabios-cirrus-debug.s > _vgabios-cirrus-debug_.s
> - $(AS86) _vgabios-cirrus-debug_.s -b vgabios.cirrus.debug.bin -u -w- -g -0 -j -O -l vgabios.cirrus.debug.txt
> - rm -f _vgabios-cirrus-debug_.s _vgabios-cirrus-debug_.c vgabios-cirrus-debug.s
> - mv vgabios.cirrus.debug.bin VGABIOS-lgpl-latest.cirrus.debug.bin
> - ./biossums VGABIOS-lgpl-latest.cirrus.debug.bin
> - ls -l VGABIOS-lgpl-latest.cirrus.debug.bin
> -
> biossums: biossums.c
> $(CC) -o biossums biossums.c
>
> --
> 1.6.6.1
>
>
>
--
yamahata
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Qemu-devel] vgabios plans ( Re: [PATCH 1/5] Makefile cleanup)
2010-05-07 10:09 [Qemu-devel] [PATCH 1/5] Makefile cleanup Gerd Hoffmann
` (4 preceding siblings ...)
2010-05-07 14:38 ` [Qemu-devel] [PATCH 1/5] Makefile cleanup Isaku Yamahata
@ 2010-05-20 12:57 ` Gerd Hoffmann
2010-05-20 13:04 ` [Qemu-devel] " Anthony Liguori
5 siblings, 1 reply; 11+ messages in thread
From: Gerd Hoffmann @ 2010-05-20 12:57 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel@nongnu.org
On 05/07/10 12:09, Gerd Hoffmann wrote:
> Use a single rule for building bios binaries.
> Use target specific variables to set compile flags.
>
> This makes it more obvious what the differences between the versions
> are. It also makes it easier to add new bios binaries with slightly
> different settings.
Hmm. No response for weeks from vgabios folks on this patch series.
How to go forward best with vgabios bits? Just upgrade
http://git.qemu.org/vgabios.git/ to 0.6c, then apply patches there?
cheers,
Gerd
^ permalink raw reply [flat|nested] 11+ messages in thread* [Qemu-devel] Re: vgabios plans ( Re: [PATCH 1/5] Makefile cleanup)
2010-05-20 12:57 ` [Qemu-devel] vgabios plans ( Re: [PATCH 1/5] Makefile cleanup) Gerd Hoffmann
@ 2010-05-20 13:04 ` Anthony Liguori
2010-05-21 13:29 ` Gerd Hoffmann
0 siblings, 1 reply; 11+ messages in thread
From: Anthony Liguori @ 2010-05-20 13:04 UTC (permalink / raw)
To: Gerd Hoffmann; +Cc: qemu-devel@nongnu.org
On 05/20/2010 07:57 AM, Gerd Hoffmann wrote:
> On 05/07/10 12:09, Gerd Hoffmann wrote:
>> Use a single rule for building bios binaries.
>> Use target specific variables to set compile flags.
>>
>> This makes it more obvious what the differences between the versions
>> are. It also makes it easier to add new bios binaries with slightly
>> different settings.
>
> Hmm. No response for weeks from vgabios folks on this patch series.
> How to go forward best with vgabios bits? Just upgrade
> http://git.qemu.org/vgabios.git/ to 0.6c, then apply patches there?
Yeah, I think the long term goal should be to move to SeaBIOS's vgabios
fork but for now, I guess we'll have to do it.
Regards,
Anthony Liguori
> cheers,
> Gerd
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Qemu-devel] Re: vgabios plans ( Re: [PATCH 1/5] Makefile cleanup)
2010-05-20 13:04 ` [Qemu-devel] " Anthony Liguori
@ 2010-05-21 13:29 ` Gerd Hoffmann
0 siblings, 0 replies; 11+ messages in thread
From: Gerd Hoffmann @ 2010-05-21 13:29 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel@nongnu.org
On 05/20/10 15:04, Anthony Liguori wrote:
>> Hmm. No response for weeks from vgabios folks on this patch series.
>> How to go forward best with vgabios bits? Just upgrade
>> http://git.qemu.org/vgabios.git/ to 0.6c, then apply patches there?
>
> Yeah, I think the long term goal should be to move to SeaBIOS's vgabios
Isn't *that* trivial though as it has no vbe support ...
> fork but for now, I guess we'll have to do it.
Ok.
The vgabios git tree doesn't look like a straight "git cvsimport". It
has fancy author names, no *.bin commits and different hashes than my
self-created cvsimport. It is probably easiest if you just pull 0.6c
version into the repo and I'll rebase my patches to that then.
We might also cherry-pick af92284bec7ddbd76ddd105c40718627dda3407e into
stable-0.12 to reduce the chance of unpleasant surprises in case someone
combines the latest vgabios with stable.
cheers,
Gerd
^ permalink raw reply [flat|nested] 11+ messages in thread