summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2011-02-16 00:34:02 -0600
committerNathan Binkert <nate@binkert.org>2011-02-16 00:34:02 -0600
commitdfd4f6ad9395650f39057ceff8a6bf4d92408bfc (patch)
treeeaaf61215c4d82e5b21ed476c04774f9eca3203e
parent99e7e5e7efc7b0cac3229e1b16fb41350cdccd6b (diff)
downloadgem5-dfd4f6ad9395650f39057ceff8a6bf4d92408bfc.tar.xz
Cleanup system directory to fit into modern M5 tree
-rw-r--r--system/alpha/console/Makefile12
-rw-r--r--system/alpha/palcode/osfpal.nh0
2 files changed, 5 insertions, 7 deletions
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
--- a/system/alpha/palcode/osfpal.nh
+++ /dev/null