Re: [PATCH 06/11] kvm tools, mips: Enable build of mips support

Andreas Herrmann
2014-05-12T10:46:20Z

On Fri, May 09, 2014 at 10:22:15PM +0100, James Hogan wrote:
> Hi Andreas,
>
> On 06/05/14 16:51, Andreas Herrmann wrote:
> > From: David Daney <david.daney@cavium.com>
> >
> > Signed-off-by: David Daney <david.daney@cavium.com>
> > Signed-off-by: Andreas Herrmann <andreas.herrmann@caviumnetworks.com>
> > ---
> > tools/kvm/Makefile | 11 ++++++++++-
> > 1 file changed, 10 insertions(+), 1 deletion(-)
> >
> > diff --git a/tools/kvm/Makefile b/tools/kvm/Makefile
> > index b872651..91286ad 100644
> > --- a/tools/kvm/Makefile
> > +++ b/tools/kvm/Makefile
> > @@ -105,7 +105,7 @@ OBJS += virtio/mmio.o
> >
> > # Translate uname -m into ARCH string
> > ARCH ?= $(shell uname -m | sed -e s/i.86/i386/ -e s/ppc.*/powerpc/ \
> > - -e s/armv7.*/arm/ -e s/aarch64.*/arm64/)
> > + -e s/armv7.*/arm/ -e s/aarch64.*/arm64/ -e s/mips64/mips/)
> >
> > ifeq ($(ARCH),i386)
> > ARCH := x86
> > @@ -184,6 +184,15 @@ ifeq ($(ARCH), arm64)
> > ARCH_WANT_LIBFDT := y
> > endif
> >
> > +ifeq ($(ARCH),mips)
> > + DEFINES += -DCONFIG_MIPS
> > + ARCH_INCLUDE := mips/include
> > + CFLAGS += -I../../arch/mips/include/asm/mach-cavium-octeon
> > + CFLAGS += -I../../arch/mips/include/asm/mach-generic
>
> I can't see any obvious includes from these two directories in the
> previous patch. Are there any?

No, there aren't.
Both lines should be removed.

> > + OBJS += mips/kvm.o
> > + OBJS += mips/kvm-cpu.o
> > + OBJS += mips/irq.o
> > +endif
> > ###
> >
> > ifeq (,$(ARCH_INCLUDE))
> >
>
> Cheers
> James

Thanks,
Andreas