From 941db36a67baeff563ea0eb9d66dad0b41c51200 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Tue, 28 Jun 2005 01:13:20 -0400 Subject: pass the location of the m5 backdoor via the m5AlphaAccess variable only compile one console console/Makefile: Now that the location of the m5 backdoor is passed into the console via the m5AlphaAccess variable, we only need to compile one console, and don't need to define TLASER or TSUNAMI console/console.c: Don't hardcode the location of the AlphaAccess structure, but rely on m5 to pass in the correct value. Setup "volatile struct AlphaAccess *m5AlphaAccess" for use and get rid of the hardcoded usage. --- system/alpha/console/Makefile | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) (limited to 'system/alpha/console/Makefile') diff --git a/system/alpha/console/Makefile b/system/alpha/console/Makefile index 728ab7a8d..e29c02b1a 100644 --- a/system/alpha/console/Makefile +++ b/system/alpha/console/Makefile @@ -36,34 +36,23 @@ LD=$(CROSS_COMPILE)ld DBMENTRY= fffffc0000010000 CFLAGS=-I . -I ../h -I$(M5)/dev -fno-builtin -Wa,-m21164 -OBJS=dbmentry.o printf.o paljtokern.o paljtoslave.o -TLOBJS+=$(OBJS) console_tl.o -TSOBJS+=$(OBJS) console_ts.o +OBJS=dbmentry.o printf.o paljtokern.o paljtoslave.o console.o ### Make sure that the M5 variable is set ### ifndef M5 $(error The M5 variable must be set) endif -all: console_tl console_ts +all: console %.o: %.S $(CC) $(CFLAGS) -nostdinc -o $@ -c $< -console_ts.o: console.c - $(CC) -g3 $(CFLAGS) -D TSUNAMI -o $@ -c $< - -console_tl.o: console.c - $(CC) -g3 $(CFLAGS) -D TLASER -o $@ -c $< - -printf.o: printf.c +%.o: %.c $(CC) -g3 $(CFLAGS) -o $@ -c $< -console_ts: $(TSOBJS) - $(LD) -o console_ts -N -Ttext $(DBMENTRY) -non_shared $(TSOBJS) -lc - -console_tl: $(TLOBJS) - $(LD) -o console_tl -N -Ttext $(DBMENTRY) -non_shared $(TLOBJS) -lc +console: $(OBJS) + $(LD) -o console -N -Ttext $(DBMENTRY) -non_shared $(OBJS) -lc clean: - rm -f *.o console_t? + rm -f *.o console -- cgit v1.2.3