df2921d326 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream' into memory/batch  
							
							... 
							
							
							
							* upstream: (87 commits)
  target-alpha: Fix compilation errors for 32 bit hosts
  target-alpha: Add high-resolution access to wall clock and an alarm.
  target-alpha: Implement HALT IPR.
  target-alpha: Implement WAIT IPR.
  target-alpha: Add CLIPPER emulation.
  target-alpha: Add custom PALcode image for CLIPPER emulation.
  target-alpha: Honor icount for RPCC instruction.
  tcg/s390: Remove unused tcg_out_addi()
  tcg/ia64: Remove unused tcg_out_addi()
  ARM: fix segfault
  ppc64: Fix linker script
  pseries: Implement set-time-of-day RTAS function
  pseries: Refactor spapr irq allocation
  PPC: Clean up BookE timer code
  PPC: booke timers
  KVM: PPC: Use HIOR setting for -M pseries with PR KVM
  KVM: Update kernel headers
  KVM: Update kernel headers
  PPC: Fix heathrow PIC to use little endian MMIO
  PPC: Fix via-cuda memory registration
  ...
Conflicts:
	hw/milkymist-uart.c
	hw/ppce500_mpc8544ds.c
Signed-off-by: Avi Kivity <avi@redhat.com> 
							
						 
						
							2011-10-09 13:11:50 +02:00  
				
					
						
							
							
								 
						
							
								fcfa339778 
								
							 
						 
						
							
							
								
								milkymist_uart: support new core version  
							
							... 
							
							
							
							The new version of the uart core introduces status and control bits.
Signed-off-by: Michael Walle <michael@walle.cc> 
							
						 
						
							2011-10-03 12:44:22 +02:00  
				
					
						
							
							
								 
						
							
								5adb30d38b 
								
							 
						 
						
							
							
								
								milkymist-uart: convert to memory API  
							
							... 
							
							
							
							Signed-off-by: Michael Walle <michael@walle.cc>
Signed-off-by: Avi Kivity <avi@redhat.com> 
							
						 
						
							2011-10-02 16:14:03 +02:00  
				
					
						
							
							
								 
						
							
								2cc6e0a142 
								
							 
						 
						
							
							
								
								char: rename qemu_chr_write() -> qemu_chr_fe_write()  
							
							... 
							
							
							
							Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> 
							
						 
						
							2011-08-22 10:17:15 -05:00  
				
					
						
							
							
								 
						
							
								883de16b46 
								
							 
						 
						
							
							
								
								lm32: add Milkymist UART support  
							
							... 
							
							
							
							This patch adds support for Milkymist's simple UART.
Signed-off-by: Michael Walle <michael@walle.cc>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com> 
							
						 
						
							2011-04-04 10:26:53 +02:00