diff options
Diffstat (limited to 'tip22')
| -rw-r--r-- | tip22/Makefile | 19 | ||||
| -rw-r--r-- | tip22/tftpload.c | 4 |
2 files changed, 13 insertions, 10 deletions
diff --git a/tip22/Makefile b/tip22/Makefile index 48829b4..27ba0ce 100644 --- a/tip22/Makefile +++ b/tip22/Makefile @@ -2,12 +2,19 @@ # Copyright 2002-2004 Guido Guenther <agx@sigxcpu.org> # -ARCLIBDIR = ../arclib -ARCLIB = $(ARCLIBDIR)/libarc.a +ifeq ($(SUBARCH),SNIRM) +PROMINCLUDEDIR = ../snilib +PROMLIBDIR = ../snilib +PROMLIB = $(PROMLIBDIR)/libsni.a +else +PROMINCLUDEDIR = ../arclib +PROMLIBDIR = ../arclib +PROMLIB = $(PROMLIBDIR)/libarc.a +endif COMMONDIR = ../common -CFLAGS += -O2 -I$(COMMONDIR) -I$(ARCLIBDIR) -Wall -mno-abicalls -G 0 \ +CFLAGS += -O2 -I$(COMMONDIR) -I$(PROMLIBDIR) -Wall -mno-abicalls -G 0 \ -fno-pic -DSUBARCH=${SUBARCH} ASFLAGS = -O2 -mno-abicalls -G 0 -fno-pic @@ -15,7 +22,7 @@ ASFLAGS = -O2 -mno-abicalls -G 0 -fno-pic LIBDIR ?= /usr/lib/tip22 BINDIR ?= /usr/sbin -LIBS=${ARCLIB} +LIBS=${PROMLIB} BINS=tip22 tip32 LD_SCRIPTS = ld.kernel.script ld.ramdisk.script ld.script OBJECTS = tftpload.o @@ -29,7 +36,7 @@ all: ${LIBS} $(TARGETS) $(ARCLIB): - @$(MAKE) -C $(ARCLIBDIR) + @$(MAKE) -C $(PROMLIBDIR) $(PRINT_LOADADDR): @$(MAKE) -C $(COMMONDIR) SUBARCH=$(SUBARCH) @@ -45,7 +52,7 @@ $(PRINT_LOADADDR): -e "s/@@OUTPUTFORMAT@@/$$OUTPUTFORMAT/" <$< >$@ clean: - @$(MAKE) -C $(ARCLIBDIR) clean + @$(MAKE) -C $(PROMLIBDIR) clean @$(MAKE) -C $(COMMONDIR) clean rm -f $(TARGETS) diff --git a/tip22/tftpload.c b/tip22/tftpload.c index ed31e15..e048399 100644 --- a/tip22/tftpload.c +++ b/tip22/tftpload.c @@ -9,9 +9,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <types.h> -#include <arc.h> #include <prom.h> #include <elf.h> @@ -20,8 +18,6 @@ #include <version.h> #include <subarch.h> -#define KSEG0ADDR(addr) (((addr) & 0x1fffffff) | 0x80000000) - #define ANSI_CLEAR "\033[2J" extern void* __kernel_start; |