pc, pc64: new memory map code

[plan9front.git] / sys / src / 9 / pc / mkfile

diff --git a/sys/src/9/pc/mkfile b/sys/src/9/pc/mkfile
index 5298ed0d4824579e110313fb5363da58b9d9caee..2c3f6e395d6a8dd7c532d0f72dda0480e60f8577 100644 (file)
--- a/sys/src/9/pc/mkfile
+++ b/sys/src/9/pc/mkfile
@@ -1,6 +1,5 @@
-CONF=pcf
-CONFLIST=pcf pccpuf
-CRAPLIST=pc pccpu pccd pcflop
+CONF=pc
+CONFLIST=pc pcf pccpuf
 EXTRACOPIES=
 #EXTRACOPIES=lookout boundary  # copy to these servers on install
 
@@ -9,8 +8,9 @@ objtype=386
 p=9
 
 # must match mem.h
-APBOOTSTRAP=0xF0003000
 KTZERO=0xF0100020
+APBOOTSTRAP=0xF0007000
+REBOOTADDR=0x11000
 
 DEVS=`{rc ../port/mkdevlist $CONF}
 
@@ -32,28 +32,29 @@ PORT=\
        proc.$O\
        qio.$O\
        qlock.$O\
+       random.$O\
        rdb.$O\
        rebootcmd.$O\
+       memmap.$O\
        segment.$O\
-       swap.$O\
+       syscallfmt.$O\
        sysfile.$O\
        sysproc.$O\
        taslock.$O\
        tod.$O\
        xalloc.$O\
-       pcrandom.$O\
+       userinit.$O\
 
 OBJ=\
        l.$O\
-       plan9l.$O\
        cga.$O\
        i8253.$O\
        i8259.$O\
        main.$O\
        memory.$O\
        mmu.$O\
-       syscallfmt.$O\
        trap.$O\
+       bootargs.$O\
        $CONF.root.$O\
        $CONF.rootc.$O\
        $DEVS\
@@ -69,15 +70,15 @@ LIB=\
        /$objtype/lib/libmp.a\
        /$objtype/lib/libfis.a\
        /$objtype/lib/libaml.a\
+       /$objtype/lib/libdtracy.a\
 
 ETHER=`{echo devether.c ether*.c | sed 's/\.c/.'$O'/g'}
 AUDIO=`{echo devaudio.c audio*.c | sed 's/\.c/.'$O'/g'}
 VGA=`{echo devvga.c screen.c vga*.c | sed 's/\.c/.'$O'/g'}
 SDEV=`{echo devsd.c sd*.c | sed 's/\.c/.'$O'/g'}
 
-$p$CONF:       $CONF.c $OBJ $LIB
-       $CC $CFLAGS '-DKERNDATE='`{date -n} $CONF.c
-       $LD -o $target -T$KTZERO -l $OBJ $CONF.$O $LIB
+$p$CONF:       $OBJ $CONF.$O $LIB
+       $LD -o $target -T$KTZERO -l $prereq
        size $target
 
 # don't strip the gzipped kernels -- too frustrating when that's all you have!
@@ -102,51 +103,47 @@ install:V:        $p$CONF
 <../port/portmkfile
 <|../port/mkbootrules $CONF
 
-$ETHER:                        etherif.h ../port/netif.h
+$ETHER:                        ../port/etherif.h ../port/netif.h
 $AUDIO:                                ../port/audioif.h
 ether8003.$O ether8390.$O:     ether8390.h
+etheryuk.$O:                   yukdump.h
 $VGA mouse.$O:                 screen.h /sys/include/memdraw.h
+vgavesa.$O:                    /386/include/ureg.h
 devfloppy.$O:                  floppy.h
-archmp.$O mp.$O:               apbootstrap.h
+mp.$O:                         apbootstrap.i
 apic.$O archmp.$O mp.$O:       mp.h
+squidboy.$O:                   mp.h
 $SDEV:                         ../port/sd.h
 sd53c8xx.$O:                   sd53c8xx.i
 sdiahci.$O:                    ahci.h
 devaoe.$O sdaoe.$O:            ../port/aoe.h
-main.$O:                       init.h reboot.h
+main.$O:                       rebootcode.i
 wavelan.$O:                    wavelan.c ../pc/wavelan.c ../pc/wavelan.h
 etherwavelan.$O:               etherwavelan.c ../pc/wavelan.h
-devusb.$O usbuhci.$O usbohci.$O usbehci.$O: ../port/usb.h
-trap.$O:                       /sys/include/tos.h
+devusb.$O usbuhci.$O usbohci.$O usbehci.$O usbehcipc.$O usbxhci.$O: ../port/usb.h
+usbehci.$O usbehcipc.$O:       usbehci.h
+trap.$O main.$O:               /sys/include/tos.h
 uartaxp.$O:                    uartaxp.i
+ether8169.$O:                  ../port/ethermii.h
+etherdp83820.$O:               ../port/ethermii.h
+etherigbe.$O:                  ../port/ethermii.h
+ethervgbe.$O:                  ../port/ethermii.h
+ethervt6102.$O:                        ../port/ethermii.h
+ethervt6105m.$O:               ../port/ethermii.h
 etherm10g.$O:                  etherm10g2k.i etherm10g4k.i
-etheriwl.$O:                   wifi.h
-wifi.$O:                       wifi.h
-
-init.h:D:              ../port/initcode.c init9.c
-       $CC ../port/initcode.c
-       $CC init9.c
-       $LD -l -R1 -s -o init.out init9.$O initcode.$O /386/lib/libc.a
-       {echo 'uchar initcode[]={'
-        xd -1x <init.out |
-               sed -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g'
-        echo '};'} > init.h
-
-reboot.h:D:    rebootcode.s
-       $AS rebootcode.s
-       $LD -l -s -T0x11000 -R4 -o reboot.out rebootcode.$O
-       {echo 'uchar rebootcode[]={'
-        xd -1x reboot.out |
-               sed -e '1,2d' -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g'
-        echo '};'} > reboot.h
-
-apbootstrap.h: apbootstrap.s mem.h
-       $AS $prereq
-       $LD -o apbootstrap.out -T$APBOOTSTRAP -R4 -l -s apbootstrap.$O
-       {echo 'uchar apbootstrap[]={'
-        xd -1x apbootstrap.out |
-               sed -e '1,2d' -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g'
-        echo '};'} > $target
+etheriwl.$O:                   ../port/wifi.h
+etherwpi.$O:                   ../port/wifi.h
+etherrt2860.$O:                ../port/wifi.h
+l.$O rebootcode.$O apbootstrap.$O:     mem.h
+
+initcode.out:          init9.$O initcode.$O /$objtype/lib/libc.a
+       $LD -l -R1 -s -o $target $prereq
+
+rebootcode.out:                rebootcode.$O
+       $LD -l -R4 -s -o $target -T$REBOOTADDR -H3 $prereq
+
+apbootstrap.out:       apbootstrap.$O
+       $LD -l -R4 -s -o $target -T$APBOOTSTRAP -H3 $prereq
 
 sd53c8xx.i:    sd53c8xx.n
        aux/na $prereq > $target
@@ -188,6 +185,3 @@ checkdist:VQ:
        for(i in pcdisk pcflop)
        for(j in checkvga checkether)
                mk $i.$j
-
-%.clean:V:
-       rm -f $stem.c [9bz]$stem [9bz]$stem.gz boot$stem.* reboot.h apbootstrap.h init.h