Merge commit 'ca22a3a3758ee7ab14166058d4ce36bc6cdfdfd8' into upstream-merge

* commit 'ca22a3a3758ee7ab14166058d4ce36bc6cdfdfd8':
  i8254: Fix migration from older versions
  microblaze: Add PetaLogix ml605 MMU little-endian ref design
  xilinx: Add AXIENET & DMA models
  microblaze: Compile uart 16550 serial driver
  win32: implement missing timersub
  simpletrace: Move st_init() error reporting

Conflicts:
	hw/i8254.c

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 3 insertions, 0 deletions

diff --git a/Makefile.target b/Makefile.target
index 95597e7e2..64ac3c8b5 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -293,12 +293,15 @@ obj-mips-y += cirrus_vga.o
 obj-mips-$(CONFIG_FULONG) += bonito.o vt82c686.o mips_fulong2e.o
 
 obj-microblaze-y = petalogix_s3adsp1800_mmu.o
+obj-microblaze-y += petalogix_ml605_mmu.o
 
 obj-microblaze-y += microblaze_pic_cpu.o
 obj-microblaze-y += xilinx_intc.o
 obj-microblaze-y += xilinx_timer.o
 obj-microblaze-y += xilinx_uartlite.o
 obj-microblaze-y += xilinx_ethlite.o
+obj-microblaze-y += xilinx_axidma.o
+obj-microblaze-y += xilinx_axienet.o
 
 obj-microblaze-$(CONFIG_FDT) += device_tree.o