ia64/xen-unstable

changeset 5372:bf014cae2dad

bitkeeper revision 1.1691.1.7 (42a6d8e19C3UPsmlA3u--9L4iY559Q)

Integrate virtual firmware into the tools build system.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Wed Jun 08 11:39:13 2005 +0000 (2005-06-08)
parents d29fe2289a59
children 5cc07785693b 22e42640bcff
files BitKeeper/etc/ignore tools/Makefile tools/firmware/Makefile tools/firmware/vgabios/Makefile
line diff
     1.1 --- a/BitKeeper/etc/ignore	Wed Jun 08 09:19:22 2005 +0000
     1.2 +++ b/BitKeeper/etc/ignore	Wed Jun 08 11:39:13 2005 +0000
     1.3 @@ -92,6 +92,18 @@ tools/blktap/xen/*
     1.4  tools/check/.*
     1.5  tools/cmdline/*
     1.6  tools/cmdline/xen/*
     1.7 +tools/firmware/*.bin
     1.8 +tools/firmware/*.sym
     1.9 +tools/firmware/*bios/*bios*.txt
    1.10 +tools/firmware/*/biossums
    1.11 +tools/firmware/rombios/BIOS-bochs-latest
    1.12 +tools/firmware/rombios/_rombios_.c
    1.13 +tools/firmware/rombios/rombios.s
    1.14 +tools/firmware/vmxassist/gen
    1.15 +tools/firmware/vmxassist/offsets.h
    1.16 +tools/firmware/vmxassist/roms.h
    1.17 +tools/firmware/vmxassist/vmxassist
    1.18 +tools/firmware/vmxassist/vmxloader
    1.19  tools/gdb/gdb-6.2.1-linux-i386-xen/*
    1.20  tools/gdb/gdb-6.2.1/*
    1.21  tools/ioemu/config-host.*
     2.1 --- a/tools/Makefile	Wed Jun 08 09:19:22 2005 +0000
     2.2 +++ b/tools/Makefile	Wed Jun 08 11:39:13 2005 +0000
     2.3 @@ -10,6 +10,7 @@ SUBDIRS += python
     2.4  SUBDIRS += xcs
     2.5  SUBDIRS += xcutils
     2.6  SUBDIRS += pygrub
     2.7 +SUBDIRS += firmware
     2.8  
     2.9  .PHONY: all install clean check check_clean ioemu eioemuinstall ioemuclean
    2.10  
     3.1 --- a/tools/firmware/Makefile	Wed Jun 08 09:19:22 2005 +0000
     3.2 +++ b/tools/firmware/Makefile	Wed Jun 08 11:39:13 2005 +0000
     3.3 @@ -1,6 +1,9 @@
     3.4  XEN_ROOT = ../..
     3.5  include $(XEN_ROOT)/tools/Rules.mk
     3.6  
     3.7 +TARGET      := vmxassist/vmxloader
     3.8 +INSTALL_DIR := $(DESTDIR)/usr/share/xen
     3.9 +
    3.10  SUBDIRS :=
    3.11  SUBDIRS += rombios
    3.12  SUBDIRS += vgabios
    3.13 @@ -8,18 +11,24 @@ SUBDIRS += vmxassist
    3.14  
    3.15  .PHONY: all install clean
    3.16  
    3.17 -all: 
    3.18 -	@set -e; for subdir in $(SUBDIRS); do \
    3.19 +all:
    3.20 +	@set -e; if ! `which bcc 1>/dev/null 2>/dev/null`; then \
    3.21 +	echo "***********************************************************"; \
    3.22 +	echo "WARNING: Install dev86 package to build firmware!"; \
    3.23 +	echo "         (http://www.cix.co.uk/~mayday)"; \
    3.24 +	echo "***********************************************************"; \
    3.25 +	else \
    3.26 +	for subdir in $(SUBDIRS); do \
    3.27  		$(MAKE) -C $$subdir $@; \
    3.28 -	done
    3.29 +	done; \
    3.30 +	fi
    3.31  
    3.32 -install: 
    3.33 -	@set -e; for subdir in $(SUBDIRS); do \
    3.34 -		$(MAKE) -C $$subdir $@; \
    3.35 -	done
    3.36 +
    3.37 +install: all
    3.38 +	[ -d $(INSTALL_DIR) ] || install -d -m0755 $(INSTALL_DIR)
    3.39 +	[ ! -e $(TARGET) ] || install -m0644 $(TARGET) $(INSTALL_DIR)
    3.40  
    3.41  clean: 
    3.42  	@set -e; for subdir in $(SUBDIRS); do \
    3.43  		$(MAKE) -C $$subdir $@; \
    3.44  	done
    3.45 -
     4.1 --- a/tools/firmware/vgabios/Makefile	Wed Jun 08 09:19:22 2005 +0000
     4.2 +++ b/tools/firmware/vgabios/Makefile	Wed Jun 08 11:39:13 2005 +0000
     4.3 @@ -1,5 +1,3 @@
     4.4 -SHELL = /bin/sh
     4.5 -
     4.6  CC      = gcc
     4.7  CFLAGS  = -g -O2 -Wall -Wstrict-prototypes
     4.8  LDFLAGS = 
     4.9 @@ -16,13 +14,12 @@ VGABIOS_DATE = "-DVGABIOS_DATE=\"$(RELDA
    4.10  
    4.11  all: bios cirrus-bios
    4.12  
    4.13 -
    4.14  bios: biossums vgabios.bin vgabios.debug.bin 
    4.15  
    4.16  cirrus-bios: vgabios-cirrus.bin vgabios-cirrus.debug.bin
    4.17  
    4.18  clean:
    4.19 -	/bin/rm -f  biossums *.o *.s *.ld86 \
    4.20 +	rm -f biossums *.o *.s *.ld86 \
    4.21            temp.awk.* vgabios*.orig _vgabios_* _vgabios-debug_* core vgabios*.bin vgabios*.txt $(RELEASE).bin *.bak
    4.22  	rm -f VGABIOS-lgpl-latest*.bin
    4.23  
    4.24 @@ -42,7 +39,7 @@ vgabios.bin: vgabios.c vgabios.h vgafont
    4.25  	sed -e 's/^\.text//' -e 's/^\.data//' vgabios.s > _vgabios_.s
    4.26  	$(AS86) _vgabios_.s -b vgabios.bin -u -w- -g -0 -j -O -l vgabios.txt
    4.27  	rm -f _vgabios_.s _vgabios_.c vgabios.s
    4.28 -	mv vgabios.bin VGABIOS-lgpl-latest.bin
    4.29 +	cp vgabios.bin VGABIOS-lgpl-latest.bin
    4.30  	./biossums VGABIOS-lgpl-latest.bin
    4.31  	ls -l VGABIOS-lgpl-latest.bin
    4.32  
    4.33 @@ -52,7 +49,7 @@ vgabios.debug.bin: vgabios.c vgabios.h v
    4.34  	sed -e 's/^\.text//' -e 's/^\.data//' vgabios-debug.s > _vgabios-debug_.s
    4.35  	$(AS86) _vgabios-debug_.s -b vgabios.debug.bin -u -w- -g -0 -j -O -l vgabios.debug.txt
    4.36  	rm -f _vgabios-debug_.s _vgabios-debug_.c vgabios-debug.s
    4.37 -	mv vgabios.debug.bin VGABIOS-lgpl-latest.debug.bin
    4.38 +	cp vgabios.debug.bin VGABIOS-lgpl-latest.debug.bin
    4.39  	./biossums VGABIOS-lgpl-latest.debug.bin
    4.40  	ls -l VGABIOS-lgpl-latest.debug.bin
    4.41  
    4.42 @@ -60,9 +57,9 @@ vgabios-cirrus.bin: vgabios.c vgabios.h 
    4.43  	$(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS $(VGABIOS_DATE) > _vgabios-cirrus_.c
    4.44  	$(BCC) -o vgabios-cirrus.s -C-c -D__i86__ -S -0 _vgabios-cirrus_.c
    4.45  	sed -e 's/^\.text//' -e 's/^\.data//' vgabios-cirrus.s > _vgabios-cirrus_.s
    4.46 -	$(AS86) _vgabios-cirrus_.s -b vgabios-cirrus.bin -u -w- -g -0 -j -O -l vgabios.cirrus.txt
    4.47 +	$(AS86) _vgabios-cirrus_.s -b vgabios-cirrus.bin -u -w- -g -0 -j -O -l vgabios-cirrus.txt
    4.48  	rm -f _vgabios-cirrus_.s _vgabios-cirrus_.c vgabios-cirrus.s
    4.49 -	mv vgabios-cirrus.bin VGABIOS-lgpl-latest.cirrus.bin
    4.50 +	cp vgabios-cirrus.bin VGABIOS-lgpl-latest.cirrus.bin
    4.51  	./biossums VGABIOS-lgpl-latest.cirrus.bin
    4.52  	ls -l VGABIOS-lgpl-latest.cirrus.bin
    4.53  
    4.54 @@ -70,9 +67,9 @@ vgabios-cirrus.debug.bin: vgabios.c vgab
    4.55  	$(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS -DCIRRUS_DEBUG $(VGABIOS_DATE) > _vgabios-cirrus-debug_.c
    4.56  	$(BCC) -o vgabios-cirrus-debug.s -C-c -D__i86__ -S -0 _vgabios-cirrus-debug_.c
    4.57  	sed -e 's/^\.text//' -e 's/^\.data//' vgabios-cirrus-debug.s > _vgabios-cirrus-debug_.s
    4.58 -	$(AS86) _vgabios-cirrus-debug_.s -b vgabios.cirrus.debug.bin -u -w- -g -0 -j -O -l vgabios.cirrus.debug.txt
    4.59 +	$(AS86) _vgabios-cirrus-debug_.s -b vgabios-cirrus.debug.bin -u -w- -g -0 -j -O -l vgabios-cirrus.debug.txt
    4.60  	rm -f _vgabios-cirrus-debug_.s _vgabios-cirrus-debug_.c vgabios-cirrus-debug.s
    4.61 -	mv vgabios.cirrus.debug.bin VGABIOS-lgpl-latest.cirrus.debug.bin
    4.62 +	cp vgabios-cirrus.debug.bin VGABIOS-lgpl-latest.cirrus.debug.bin
    4.63  	./biossums VGABIOS-lgpl-latest.cirrus.debug.bin
    4.64  	ls -l VGABIOS-lgpl-latest.cirrus.debug.bin
    4.65