summaryrefslogtreecommitdiffstats
path: root/loader2
diff options
context:
space:
mode:
Diffstat (limited to 'loader2')
-rw-r--r--loader2/Makefile19
-rw-r--r--loader2/md5.h4
2 files changed, 1 insertions, 22 deletions
diff --git a/loader2/Makefile b/loader2/Makefile
index 03489786d..fe4466243 100644
--- a/loader2/Makefile
+++ b/loader2/Makefile
@@ -38,12 +38,7 @@ NETOBJS = net.o urls.o ftp.o telnet.o telnetd.o
PCMCIAOBJS = pcmcia.o $(NETOBJS)
SOURCES = $(subst .o,.c,$(OBJS)) loader.c
-HWLIBS = -lkudzu_loader
-ifeq (1, $(USEDIET))
-HWLIBS += -lpci_loader
-else
-HWLIBS += -lpci
-endif
+HWLIBS = -lkudzu_loader -lpci
# NSS linker flags
NSSFLAGS = -Wl,-rpath-link,/nss
@@ -52,19 +47,7 @@ CFLAGS += -DUSE_LOGDEV -DVERSION='"$(VERSION)"'
STATIC = -static
REALCC=gcc
-ifeq (1, $(USEDIET))
-CFLAGS += -DGZLIB=1 -DDIET=1
-DIET=diet
-CC=$(DIET) $(REALCC)
-ISYSLIB = ../isys/libisys-diet.a
-GUNZIP = ../isys/gzlib/libgunzip-diet.a
-
-OBJS += dietstubs.o ctype.o
-ISYSLIB += -lrpc
-CTYPEDEP = ctype.c
-else
UNICODELIB = ../stubs/libunicode-lite.a
-endif
# linuxrc + shutdown on s390, init everywhere else
ifneq (,$(filter s390 s390x,$(ARCH)))
diff --git a/loader2/md5.h b/loader2/md5.h
index e376124ec..fb6bf20a9 100644
--- a/loader2/md5.h
+++ b/loader2/md5.h
@@ -3,11 +3,7 @@
#include <sys/types.h>
-#ifdef DIET
-typedef uint32_t uint32;
-#else
typedef u_int32_t uint32;
-#endif
struct MD5Context {
uint32 buf[4];