From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M6sql-0004v3-OJ for qemu-devel@nongnu.org; Wed, 20 May 2009 16:57:19 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M6sqd-0004qo-Uc for qemu-devel@nongnu.org; Wed, 20 May 2009 16:57:16 -0400 Received: from [199.232.76.173] (port=43654 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M6sqd-0004qV-PY for qemu-devel@nongnu.org; Wed, 20 May 2009 16:57:11 -0400 Received: from mail-fx0-f219.google.com ([209.85.220.219]:44012) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1M6sqd-0003BC-7B for qemu-devel@nongnu.org; Wed, 20 May 2009 16:57:11 -0400 Received: by mail-fx0-f219.google.com with SMTP id 19so631463fxm.34 for ; Wed, 20 May 2009 13:57:10 -0700 (PDT) From: "Edgar E. Iglesias" Date: Wed, 20 May 2009 22:56:15 +0200 Message-Id: <1242852975-31043-13-git-send-email-edgar.iglesias@gmail.com> In-Reply-To: <1242852975-31043-12-git-send-email-edgar.iglesias@gmail.com> References: <1242852975-31043-1-git-send-email-edgar.iglesias@gmail.com> <1242852975-31043-2-git-send-email-edgar.iglesias@gmail.com> <1242852975-31043-3-git-send-email-edgar.iglesias@gmail.com> <1242852975-31043-4-git-send-email-edgar.iglesias@gmail.com> <1242852975-31043-5-git-send-email-edgar.iglesias@gmail.com> <1242852975-31043-6-git-send-email-edgar.iglesias@gmail.com> <1242852975-31043-7-git-send-email-edgar.iglesias@gmail.com> <1242852975-31043-8-git-send-email-edgar.iglesias@gmail.com> <1242852975-31043-9-git-send-email-edgar.iglesias@gmail.com> <1242852975-31043-10-git-send-email-edgar.iglesias@gmail.com> <1242852975-31043-11-git-send-email-edgar.iglesias@gmail.com> <1242852975-31043-12-git-send-email-edgar.iglesias@gmail.com> Subject: [Qemu-devel] [PATCH 13/13] microblaze: Hook into the build-system. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Edgar E. Iglesias" Signed-off-by: Edgar E. Iglesias --- Makefile.target | 21 +++++++++++++++++++++ configure | 21 ++++++++++++++++++++- 2 files changed, 41 insertions(+), 1 deletions(-) diff --git a/Makefile.target b/Makefile.target index 60dcf30..85f6883 100644 --- a/Makefile.target +++ b/Makefile.target @@ -183,6 +183,12 @@ endif ifeq ($(findstring ppc, $(TARGET_BASE_ARCH) $(ARCH)),ppc) LIBOBJS+=ppc-dis.o endif +ifeq ($(findstring microblaze, $(TARGET_BASE_ARCH) $(ARCH)),microblaze) +LIBOBJS+=microblaze-dis.o +ifndef CONFIG_USER_ONLY +LIBOBJS+= mmu.o +endif +endif ifeq ($(findstring mips, $(TARGET_BASE_ARCH) $(ARCH)),mips) LIBOBJS+=mips-dis.o endif @@ -610,6 +616,21 @@ OBJS+= pflash_cfi01.o OBJS+= vmware_vga.o CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE endif +ifeq ($(TARGET_BASE_ARCH), microblaze) +OBJS+= petalogix_s3adsp1800_mmu.o + +OBJS+= microblaze_pic_cpu.o +OBJS+= xilinx_intc.o +OBJS+= xilinx_timer.o +OBJS+= xilinx_uartlite.o +OBJS+= xilinx_ethlite.o + +OBJS+= pflash_cfi02.o +ifdef FDT_LIBS +OBJS+= device_tree.o +LIBS+= $(FDT_LIBS) +endif +endif ifeq ($(TARGET_BASE_ARCH), cris) # Boards OBJS+= cris_pic_cpu.o etraxfs.o axis_dev88.o diff --git a/configure b/configure index 8fdbc1c..0a372c2 100755 --- a/configure +++ b/configure @@ -127,6 +127,9 @@ case "$cpu" in m68k) cpu="m68k" ;; + microblaze) + cpu="microblaze" + ;; mips) cpu="mips" ;; @@ -678,6 +681,7 @@ x86_64-softmmu \ arm-softmmu \ cris-softmmu \ m68k-softmmu \ +microblaze-softmmu \ mips-softmmu \ mipsel-softmmu \ mips64-softmmu \ @@ -700,6 +704,7 @@ arm-linux-user \ armeb-linux-user \ cris-linux-user \ m68k-linux-user \ +microblaze-linux-user \ mips-linux-user \ mipsel-linux-user \ ppc-linux-user \ @@ -1429,6 +1434,10 @@ case "$cpu" in echo "ARCH=m68k" >> $config_mak echo "#define HOST_M68K 1" >> $config_h ;; + microblaze) + echo "ARCH=microblaze" >> $config_mak + echo "#define HOST_MICROBLAZE 1" >> $config_h + ;; mips) echo "ARCH=mips" >> $config_mak echo "#define HOST_MIPS 1" >> $config_h @@ -1734,6 +1743,7 @@ target_cpu=`echo $target | cut -d '-' -f 1` target_bigendian="no" [ "$target_cpu" = "armeb" ] && target_bigendian=yes [ "$target_cpu" = "m68k" ] && target_bigendian=yes +[ "$target_cpu" = "microblaze" ] && target_bigendian=yes [ "$target_cpu" = "mips" ] && target_bigendian=yes [ "$target_cpu" = "mipsn32" ] && target_bigendian=yes [ "$target_cpu" = "mips64" ] && target_bigendian=yes @@ -1899,7 +1909,15 @@ case "$target_cpu" in gdb_xml_files="cf-core.xml cf-fp.xml" target_phys_bits=32 ;; - mips|mipsel) + microblaze) + echo "TARGET_ARCH=microblaze" >> $config_mak + echo "#define TARGET_ARCH \"microblaze\"" >> $config_h + echo "#define TARGET_MICROBLAZE 1" >> $config_h + bflt="yes" + target_nptl="yes" + target_phys_bits=32 + ;; + mips|mipsel) echo "TARGET_ARCH=mips" >> $config_mak echo "#define TARGET_ARCH \"mips\"" >> $config_h echo "#define TARGET_MIPS 1" >> $config_h @@ -2036,6 +2054,7 @@ echo "TARGET_XML_FILES=$list" >> $config_mak if test "$target_cpu" = "arm" \ -o "$target_cpu" = "armeb" \ -o "$target_cpu" = "m68k" \ + -o "$target_cpu" = "microblaze" \ -o "$target_cpu" = "mips" \ -o "$target_cpu" = "mipsel" \ -o "$target_cpu" = "mipsn32" \ -- 1.6.0.6