X-Git-Url: https://git.saurik.com/apple/boot.git/blobdiff_plain/4f6e3300a83b013a40730e9d4939713f82466b78..57c72a9a9f2a263d364c2df1178760bd057c390f:/i386/boot1u/Makefile

diff --git a/i386/boot1u/Makefile b/i386/boot1u/Makefile
index 565c3b0..0f479ca 100644
--- a/i386/boot1u/Makefile
+++ b/i386/boot1u/Makefile
@@ -1,17 +1,9 @@
 DIR = boot1u
 include ../MakePaths.dir
 
-#
-# these paths are only valid in subdirectories of this directory
-#
-OBJROOT=../../obj/i386/boot1u
-SYMROOT=../../sym/i386
-DSTROOT=../../dst/i386
-SRCROOT=/tmp
-
 OPTIM = -Os
 CFLAGS	= $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -Werror \
-          -fno-builtin -DSAIO_INTERNAL_USER -static \
+          -fno-builtin -DSAIO_INTERNAL_USER -DBOOT1 -static \
 	  -fomit-frame-pointer -mpreferred-stack-boundary=2 \
 	  -fno-align-functions
 DEFINES=
@@ -28,45 +20,49 @@ else
 endif
 AS = as
 LD = ld
-LIBS= -L$(SYMDIR) -lsaio -lsa
+LIBS= -L$(SYMDIR) -lsa
 #LIBS= -L$(SYMDIR)
 
 OTHER_FILES =
 
 INSTALLDIR = $(DSTROOT)/usr/standalone/i386
-VPATH = $(OBJROOT):$(SYMROOT)
+VPATH = $(SYMROOT):$(OBJROOT)
+vpath %.c ../libsaio
+vpath %   $(SYMROOT)
+vpath %.h ../libsaio
+vpath %   $(SYMROOT)
 
 # The ordering is important;
 # boot1u.o must be first.
-#OBJS = $(OBJROOT)/boot1u.o $(OBJROOT)/asm.o $(OBJROOT)/bios.o $(OBJROOT)/boot.o $(OBJROOT)/string.o $(OBJROOT)/malloc.o $(OBJROOT)/disk.o $(OBJROOT)/put.o
-OBJS = boot1u.o asm.o bios.o boot.o string.o malloc.o disk.o put.o
-
-# OBJS += $(OBJROOT)/../libsaio/ufs.o \
-#   $(OBJROOT)/../libsaio/cache.o \
-#   $(OBJROOT)/../libsaio/ufs_byteorder.o \
-#   $(OBJROOT)/../libsaio/table.o \
-#   $(OBJROOT)/../libsaio/misc.o
+OBJS = boot1u.o asm.o bios.o boot.o string.o malloc.o disk.o put.o \
+     ufs.o cache.o misc.o ufs_byteorder.o table.o
 
 # OBJS += $(OBJROOT)/../libsa/prf.o $(OBJROOT)/../libsa/printf.o
 
-# We get the following object files out of libsaio:
+# We build the following source files from the libsaio directory:
 # ufs.o cache.o ufs_byteorder.o table.o
-# and these from libsa:
+# and get these object files from libsa:
 # prf.o printf.o
 # If they increase in size, or if other accidental dependencies
-# are created with other .o files in libsaio.a, then boot1u can get too large.
-# Use care in changing the library.
+# are created with other .o files in libsa.a, then boot1u can get too large.
+# Use care in changing libsaio and libsa.
 
 UTILDIR = ../util
 SFILES = boot1u.s bios.s asm.s
-CFILES = boot.c disk.c string.c put.c malloc.c
+CFILES = boot.c disk.c malloc.c put.c string.c \
+     ufs.c cache.c misc.c ufs_byteorder.c table.c
 HFILES = 
 OTHERFILES = Makefile
 ALLSRC = $(FOREIGNSRC) $(FOREIGNBIN) $(SFILES) $(CFILES) \
 	$(HFILES) $(OTHERFILES)
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 BOOT1UADDR = 10200
-MAXBOOTSIZE = 7680
+
+# Max boot1u code size is 7k (to leave room for the disk label)
+# minus 512 bytes for the partition booter,
+# for a total of 6.5k.
+MAXBOOTSIZE = 6656
+
 NASM = $(SYMROOT)/nasm
 
 all: $(DIRS_NEEDED) boot1u0 boot1u
@@ -74,20 +70,20 @@ all: $(DIRS_NEEDED) boot1u0 boot1u
 boot1u0: boot1u0.s Makefile $(NASM)
 	$(NASM) boot1u0.s -o $(SYMROOT)/$@
 
-boot1u: $(SYMROOT)/machOconv $(OBJS) boot1u0
+boot1u: $(SYMROOT)/machOconv boot1u0 $(OBJS)
 	$(LD) -static -preload -segaddr __TEXT $(BOOT1UADDR) -segalign 20 \
-		-o $(SYMROOT)/boot1u.sys $(OBJS) $(LIBS) -lcc_kext
-	size $(SYMROOT)/boot1u.sys
-	$(SYMROOT)/machOconv $(SYMROOT)/boot1u.sys $(SYMROOT)/boot1u.post
-	ls -l $(SYMROOT)/boot1u.post
-	@( size=`ls -l $(SYMROOT)/boot1u.post | awk '{ print $$5}'` ; \
+		-o $(SYMROOT)/$(@F).sys $(filter %.o,$^) $(LIBS) -lcc_kext
+	size $(SYMROOT)/$(@F).sys
+	$(SYMROOT)/machOconv $(SYMROOT)/$(@F).sys $(SYMROOT)/$(@F).post
+	ls -l $(SYMROOT)/$(@F).post
+	@( size=`ls -l $(SYMROOT)/$(@F).post | awk '{ print $$5}'` ; \
 	  if expr "$$size" ">" "$(MAXBOOTSIZE)" > /dev/null ;\
 	  then \
 	    echo "Booter executable larger than $(MAXBOOTSIZE) bytes" ;\
 	    exit 1;\
 	  fi)
-	cat $(SYMROOT)/boot1u0 $(SYMROOT)/boot1u.post | dd obs=8k conv=osync of=$(SYMROOT)/boot1u
-	rm $(SYMROOT)/boot1u.post
+	cat $(SYMROOT)/boot1u0 $(SYMROOT)/$(@F).post | dd obs=7k conv=osync of=$(SYMROOT)/$(@F)
+	rm $(SYMROOT)/$(@F).post
 
 
 install_i386:: all $(INSTALLDIR)
@@ -95,7 +91,7 @@ install_i386:: all $(INSTALLDIR)
 	cd $(INSTALLDIR); chmod u+w boot1u $(OTHER_FILES)
 
 clean::
-	rm -f $(SYMROOT)/boot1u.sys $(SYMROOT)/boot1u
+	rm -f $(SYMROOT)/boot1u.sys $(SYMROOT)/boot1u $(SYMROOT)/boot1u0
 
 include ../MakeInc.dir