diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-01-13 12:07:42 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-01-19 17:17:50 +1100 |
| commit | ca610c931e2b0004c44f748cb813580b09c60489 (patch) | |
| tree | cf17ebaa02078827068b534bb95d4540bd848678 /board-qemu | |
| parent | adde61dfebe5ba4c519b120e8b33f1f8a3c93151 (diff) | |
| download | SLOF-ca610c931e2b0004c44f748cb813580b09c60489.zip SLOF-ca610c931e2b0004c44f748cb813580b09c60489.tar.gz SLOF-ca610c931e2b0004c44f748cb813580b09c60489.tar.bz2 | |
Move virtio to a separate library
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'board-qemu')
| -rw-r--r-- | board-qemu/Makefile | 2 | ||||
| -rw-r--r-- | board-qemu/slof/Makefile | 4 | ||||
| -rw-r--r-- | board-qemu/virtio-net/Makefile | 7 | ||||
| -rw-r--r-- | board-qemu/virtio-net/module_entry.c | 1 |
4 files changed, 9 insertions, 5 deletions
diff --git a/board-qemu/Makefile b/board-qemu/Makefile index f2a382c..6072a86 100644 --- a/board-qemu/Makefile +++ b/board-qemu/Makefile @@ -14,7 +14,7 @@ BOARD_TARGETS = tools_build romfs_build clients_build netdrivers stage1 subdirs SUBDIRS = slof veth virtio-net -COMMON_LIBS = libc libbootmsg libbases libnvram libelf libhvcall +COMMON_LIBS = libc libbootmsg libbases libnvram libelf libhvcall libvirtio all: $(BOARD_TARGETS) $(MAKE) boot_rom.bin diff --git a/board-qemu/slof/Makefile b/board-qemu/slof/Makefile index e230db3..f7c1892 100644 --- a/board-qemu/slof/Makefile +++ b/board-qemu/slof/Makefile @@ -20,14 +20,16 @@ include $(TOPCMNDIR)/make.rules all: Makefile.dep OF.ffs paflof $(SLOFCMNDIR)/xvect.bin CPPFLAGS = -I$(LIBCMNDIR)/libbootmsg -I$(LIBCMNDIR)/libhvcall \ - -I$(LIBCMNDIR)/libnvram + -I$(LIBCMNDIR)/libvirtio -I$(LIBCMNDIR)/libnvram SLOF_LIBS = \ $(LIBCMNDIR)/libbootmsg.a \ $(LIBCMNDIR)/libelf.a \ $(LIBCMNDIR)/libhvcall.a \ + $(LIBCMNDIR)/libvirtio.a \ $(LIBCMNDIR)/libnvram.a BOARD_SLOF_IN = \ $(LIBCMNDIR)/libhvcall/hvcall.in \ + $(LIBCMNDIR)/libvirtio/virtio.in \ $(LIBCMNDIR)/libbootmsg/bootmsg.in \ $(LIBCMNDIR)/libelf/libelf.in \ $(LIBCMNDIR)/libnvram/libnvram.in \ diff --git a/board-qemu/virtio-net/Makefile b/board-qemu/virtio-net/Makefile index 765044e..009e10f 100644 --- a/board-qemu/virtio-net/Makefile +++ b/board-qemu/virtio-net/Makefile @@ -17,7 +17,10 @@ endif include $(TOP)/make.rules CPPFLAGS = -I./ -I$(TOP)/clients/net-snk/include/ -I$(TOP)/lib/libc/include/ \ - -I$(TOP)/lib/libhvcall -I$(INCLCMNDIR) -I$(INCLCMNDIR)/$(CPUARCH) + -I$(TOP)/lib/libhvcall -I$(TOP)/lib/libvirtio -I$(INCLCMNDIR) \ + -I$(INCLCMNDIR)/$(CPUARCH) + +LIBS = $(TOP)/lib/libc.a $(TOP)/lib/libhvcall.a $(TOP)/lib/libvirtio.a SRCS = module_entry.c virtio-net.c vn-pci.c @@ -25,7 +28,7 @@ OBJS = $(SRCS:%.c=%.o) all: net_virtio.elf -net_virtio.elf: $(OBJS) $(TOP)/lib/libc.a $(TOP)/lib/libhvcall.a +net_virtio.elf: $(OBJS) $(LIBS) $(LD) $(LDFLAGS) $^ -o $@ -T virtio-net.lds -N -q $(STRIP) --strip-unneeded $@ diff --git a/board-qemu/virtio-net/module_entry.c b/board-qemu/virtio-net/module_entry.c index 9e6ceda..2d2ca94 100644 --- a/board-qemu/virtio-net/module_entry.c +++ b/board-qemu/virtio-net/module_entry.c @@ -12,7 +12,6 @@ #include <string.h> #include <netdriver_int.h> -#include <libhvcall.h> #include "virtio-net.h" extern char __module_start[]; |