From: Ali Saidi <saidi@eecs.umich.edu>
Date: Sun, 5 Jun 2005 05:22:33 +0000 (-0400)
Subject: Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5-clean
X-Git-Tag: m5_1.0_tutorial~28^2~1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3011a7ed0b58c5db117c1718c345d8e00c5160de;p=gem5.git

Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5-clean

--HG--
extra : convert_revision : 0c339eb7574f59665690f7e8457eff0b21e3c4c9
---

3011a7ed0b58c5db117c1718c345d8e00c5160de
diff --cc SConscript
index b7ca89305,0efb3e1e5..bb50f1872
--- a/SConscript
+++ b/SConscript
@@@ -280,23 -293,9 +280,25 @@@ full_system_sources = Split(''
  	dev/tsunami_io.cc
  	dev/tsunami_pchip.cc
  	dev/uart.cc
+ 	dev/uart8530.cc
+ 	dev/uart8250.cc
  
 +	encumbered/dev/dma.cc
 +	encumbered/dev/etherdev.cc
 +	encumbered/dev/scsi.cc
 +	encumbered/dev/scsi_ctrl.cc
 +	encumbered/dev/scsi_disk.cc
 +	encumbered/dev/scsi_none.cc
 +	encumbered/dev/tlaser_clock.cc
 +	encumbered/dev/tlaser_ipi.cc
 +	encumbered/dev/tlaser_mbox.cc
 +	encumbered/dev/tlaser_mc146818.cc
 +	encumbered/dev/tlaser_node.cc
 +	encumbered/dev/tlaser_pcia.cc
 +	encumbered/dev/tlaser_pcidev.cc
 +	encumbered/dev/tlaser_serial.cc
 +	encumbered/dev/turbolaser.cc
 +
  	kern/kernel_binning.cc
  	kern/kernel_stats.cc
  	kern/system_events.cc