From dfd4f6ad9395650f39057ceff8a6bf4d92408bfc Mon Sep 17 00:00:00 2001
From: Nathan Binkert <nate@binkert.org>
Date: Wed, 16 Feb 2011 00:34:02 -0600
Subject: [PATCH] Cleanup system directory to fit into modern M5 tree

---
 system/alpha/console/Makefile  | 12 +++++-------
 system/alpha/palcode/osfpal.nh |  0
 2 files changed, 5 insertions(+), 7 deletions(-)
 delete mode 100644 system/alpha/palcode/osfpal.nh

diff --git a/system/alpha/console/Makefile b/system/alpha/console/Makefile
index 52efebeb7..9fea133a2 100644
--- a/system/alpha/console/Makefile
+++ b/system/alpha/console/Makefile
@@ -27,6 +27,9 @@
 # Authors: Nathan L. Binkert
 #          Ali G. Saidi
 
+# Point to the M5 diretory so we can get some headers
+M5?=../../..
+
 ### If we are not compiling on an alpha, we must use cross tools ###    
 ifneq ($(shell uname -m), alpha)
 CROSS_COMPILE?=alpha-unknown-linux-gnu-
@@ -36,17 +39,12 @@ AS=$(CROSS_COMPILE)as
 LD=$(CROSS_COMPILE)ld
 
 DBMENTRY= fffffc0000010000
-CFLAGS=-I . -I ../h -I$(M5)/src/dev -I$(M5)/util/m5/ -fno-builtin -Wa,-m21164
+CFLAGS=-I . -I ../h -I$(M5)/src/dev/alpha -I$(M5)/util/m5/ -fno-builtin -Wa,-m21164
 OBJS=dbmentry.o printf.o paljtokern.o paljtoslave.o console.o m5op.o
 
-### Make sure that the M5 variable is set ###
-ifndef M5
-$(error The M5 variable must be set)
-endif
-
 all: console
 
-m5op.o: $(M5)/util/m5/m5op.S
+m5op.o: $(M5)/util/m5/m5op_alpha.S
 	$(CC) $(CFLAGS) -nostdinc -o $@ -c $<
 
 %.o: %.S
diff --git a/system/alpha/palcode/osfpal.nh b/system/alpha/palcode/osfpal.nh
deleted file mode 100644
index e69de29bb..000000000