diff options
| -rw-r--r-- | system/alpha/console/Makefile | 19 | ||||
| -rw-r--r-- | system/alpha/console/console.c | 7 |
2 files changed, 19 insertions, 7 deletions
diff --git a/system/alpha/console/Makefile b/system/alpha/console/Makefile index 1020bfb39..c1d783c24 100644 --- a/system/alpha/console/Makefile +++ b/system/alpha/console/Makefile @@ -20,14 +20,17 @@ ifndef M5 $(error The M5 variable must be set) endif -all: console +all: console_tl console_ts dbmentry.o: dbmentry.s g++ -I ../h -I ../palcode -E -P -nostdinc -nostdinc++ -x c++ dbmentry.s | \ $(AS) -m 21164 -o dbmentry.s.o -console.o: console.c - $(CC) -g3 $(INCLUDES) -D _TIME_T -nostdinc++ -o $*.o -c $*.c +console_ts.o: console.c + $(CC) -g3 $(INCLUDES) -D _TIME_T -D TSUNAMI -nostdinc++ -o console_ts.o -c console.c + +console_tl.o: console.c + $(CC) -g3 $(INCLUDES) -D _TIME_T -D TLASER -nostdinc++ -o console_tl.o -c console.c printf.o: printf.c $(CC) -g3 $(INCLUDES) -nostdinc++ -o $*.o -c $*.c @@ -40,9 +43,13 @@ paljtoslave.s.o: paljtoslave.s g++ -I ../h -E -P -nostdinc -nostdinc++ -x c++ paljtoslave.s | \ $(AS) -m 21164 -o paljtoslave.s.o -console: console.o dbmentry.o printf.o paljtokern.s.o paljtoslave.s.o - $(LD) -o console -N -Ttext $(DBMENTRY) -non_shared \ - dbmentry.s.o console.o printf.o paljtokern.s.o paljtoslave.s.o -lc +console_ts: console_ts.o dbmentry.o printf.o paljtokern.s.o paljtoslave.s.o + $(LD) -o console_ts -N -Ttext $(DBMENTRY) -non_shared \ + dbmentry.s.o console_ts.o printf.o paljtokern.s.o paljtoslave.s.o -lc + +console_tl: console_tl.o dbmentry.o printf.o paljtokern.s.o paljtoslave.s.o + $(LD) -o console_tl -N -Ttext $(DBMENTRY) -non_shared \ + dbmentry.s.o console_tl.o printf.o paljtokern.s.o paljtoslave.s.o -lc install: console scp console zizzer.eecs.umich.edu:/z/m5/system/testing/binaries/console diff --git a/system/alpha/console/console.c b/system/alpha/console/console.c index 61e765411..12db3d9f5 100644 --- a/system/alpha/console/console.c +++ b/system/alpha/console/console.c @@ -33,8 +33,13 @@ typedef unsigned int uint32; #define K1BASE 0xfffffc8000000000 #define KSEG_TO_PHYS(x)(((ul)x) & ~KSEG) +#ifdef TSUNAMI +#define ALPHA_ACCESS_BASE 0xfffffd0200000000 +#elif TLASER #define ALPHA_ACCESS_BASE 0xfffffc8000a00000 - +#else +#error TSUNAMI/TLASER not defined. +#endif #define PHYS_TO_K1(_x) (K1BASE|(_x)) |