| Message ID | 1262849506-27132-9-git-send-email-amit.shah@redhat.com |
|---|---|
| State | New |
| Headers | show |
Am 07.01.2010 um 08:31 schrieb Amit Shah: > There's nothing target-dependent in the virtio-serial code so allow it > to be compiled just once for all the targets. > > Signed-off-by: Amit Shah <amit.shah@redhat.com> > --- > Makefile.hw | 2 +- > Makefile.target | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Makefile.hw b/Makefile.hw > index bd252f5..b6323fa 100644 > --- a/Makefile.hw > +++ b/Makefile.hw > @@ -13,7 +13,7 @@ QEMU_CFLAGS+=-I.. -I$(SRC_PATH)/fpu > > obj-y = > obj-y += loader.o > -obj-y += virtio.o > +obj-y += virtio.o virtio-serial.o > obj-y += fw_cfg.o > obj-y += watchdog.o > obj-$(CONFIG_ECC) += ecc.o Needs to be rebased and applied against Makefile.objs now, s/obj-y/hw- obj-y/. Andreas > diff --git a/Makefile.target b/Makefile.target > index d217f07..475362e 100644 > --- a/Makefile.target > +++ b/Makefile.target > @@ -156,7 +156,7 @@ ifdef CONFIG_SOFTMMU > obj-y = vl.o async.o monitor.o pci.o pci_host.o pcie_host.o > machine.o gdbstub.o > # virtio has to be here due to weird dependency between PCI and > virtio-net. > # need to fix this properly > -obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial.o > virtio-serial-bus.o virtio-pci.o > +obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-pci.o > virtio-serial-bus.o > obj-$(CONFIG_KVM) += kvm.o kvm-all.o > obj-$(CONFIG_ISA_MMIO) += isa_mmio.o > LIBS+=-lz > -- > 1.6.2.5 > > >
On (Fri) Jan 08 2010 [01:41:48], Andreas Färber wrote: > > Am 07.01.2010 um 08:31 schrieb Amit Shah: > >> There's nothing target-dependent in the virtio-serial code so allow it >> to be compiled just once for all the targets. >> >> Signed-off-by: Amit Shah <amit.shah@redhat.com> >> --- >> Makefile.hw | 2 +- >> Makefile.target | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/Makefile.hw b/Makefile.hw >> index bd252f5..b6323fa 100644 >> --- a/Makefile.hw >> +++ b/Makefile.hw >> @@ -13,7 +13,7 @@ QEMU_CFLAGS+=-I.. -I$(SRC_PATH)/fpu >> >> obj-y = >> obj-y += loader.o >> -obj-y += virtio.o >> +obj-y += virtio.o virtio-serial.o >> obj-y += fw_cfg.o >> obj-y += watchdog.o >> obj-$(CONFIG_ECC) += ecc.o > > Needs to be rebased and applied against Makefile.objs now, s/obj-y/hw- > obj-y/. OK, thanks for the hint. I've rebased my local branch against master. Amit
diff --git a/Makefile.hw b/Makefile.hw index bd252f5..b6323fa 100644 --- a/Makefile.hw +++ b/Makefile.hw @@ -13,7 +13,7 @@ QEMU_CFLAGS+=-I.. -I$(SRC_PATH)/fpu obj-y = obj-y += loader.o -obj-y += virtio.o +obj-y += virtio.o virtio-serial.o obj-y += fw_cfg.o obj-y += watchdog.o obj-$(CONFIG_ECC) += ecc.o diff --git a/Makefile.target b/Makefile.target index d217f07..475362e 100644 --- a/Makefile.target +++ b/Makefile.target @@ -156,7 +156,7 @@ ifdef CONFIG_SOFTMMU obj-y = vl.o async.o monitor.o pci.o pci_host.o pcie_host.o machine.o gdbstub.o # virtio has to be here due to weird dependency between PCI and virtio-net. # need to fix this properly -obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial.o virtio-serial-bus.o virtio-pci.o +obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-pci.o virtio-serial-bus.o obj-$(CONFIG_KVM) += kvm.o kvm-all.o obj-$(CONFIG_ISA_MMIO) += isa_mmio.o LIBS+=-lz
There's nothing target-dependent in the virtio-serial code so allow it to be compiled just once for all the targets. Signed-off-by: Amit Shah <amit.shah@redhat.com> --- Makefile.hw | 2 +- Makefile.target | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)