From 16800971d03a1b57339cd9ebdb5cee7711078c51 Mon Sep 17 00:00:00 2001
From: Lisa Hsu <hsul@eecs.umich.edu>
Date: Tue, 11 May 2004 22:42:45 -0400
Subject: successful merge, linux still builds and runs as far it used to,
 network device still transmit ARP packet.

arch/alpha/alpha_memory.cc:
    change to the main m5 tree convention for naming
base/traceflags.py:
    add ide and pciconfigall traceflags
kern/linux/linux_system.cc:
kern/linux/linux_system.hh:
    kill some old binning styled stuff

--HG--
extra : convert_revision : 0558878906817975a714b1c7c08f9ee405468535
---
 base/traceflags.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'base')

diff --git a/base/traceflags.py b/base/traceflags.py
index b7b7fa777..a378ae722 100644
--- a/base/traceflags.py
+++ b/base/traceflags.py
@@ -57,6 +57,7 @@ baseFlags = [
     'Mbox',
     'PCIA',
     'PCIDEV',
+    'PciConfigAll',
     'ISP',
     'BADADDR',
     'Console',
@@ -103,7 +104,11 @@ baseFlags = [
     'Context',
     'Config',
     'Sampler',
-    'WriteBarrier'
+    'WriteBarrier',
+    'IdeCtrl',
+    'IdeDisk',
+    'Tsunami',
+    'TsunamiUart'
     ]
 
 #
@@ -118,7 +123,8 @@ compoundFlagMap = {
     'GDBAll' : [ 'GDBMisc', 'GDBAcc', 'GDBRead', 'GDBWrite', 'GDBSend', 'GDBRecv', 'GDBExtra' ],
     'ScsiAll' : [ 'ScsiDisk', 'ScsiCtrl', 'ScsiNone' ],
     'DiskImageAll' : [ 'DiskImage', 'DiskImageRead', 'DiskImageWrite' ],
-    'EthernetAll' : [ 'Ethernet', 'EthernetPIO', 'EthernetDMA', 'EthernetData' ]
+    'EthernetAll' : [ 'Ethernet', 'EthernetPIO', 'EthernetDMA', 'EthernetData' ],
+    'IdeAll' : [ 'IdeCtrl', 'IdeDisk' ]
 }
 
 #############################################################
-- 
cgit v1.2.3