pc, pc64: properly track dependencies for mem.h on autogenerated apbootstrap.h and reboot.h targets
This commit is contained in:
parent
c88ed6488f
commit
d0f824edc2
|
@ -8,8 +8,9 @@ objtype=386
|
||||||
p=9
|
p=9
|
||||||
|
|
||||||
# must match mem.h
|
# must match mem.h
|
||||||
APBOOTSTRAP=0xF0007000
|
|
||||||
KTZERO=0xF0100020
|
KTZERO=0xF0100020
|
||||||
|
APBOOTSTRAP=0xF0007000
|
||||||
|
REBOOTADDR=0x11000
|
||||||
|
|
||||||
DEVS=`{rc ../port/mkdevlist $CONF}
|
DEVS=`{rc ../port/mkdevlist $CONF}
|
||||||
|
|
||||||
|
@ -143,15 +144,15 @@ init.h:D: ../port/initcode.c init9.c
|
||||||
sed -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g'
|
sed -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g'
|
||||||
echo '};'} > init.h
|
echo '};'} > init.h
|
||||||
|
|
||||||
reboot.h:D: rebootcode.s
|
reboot.h:D: rebootcode.s mem.h
|
||||||
$AS rebootcode.s
|
$AS rebootcode.s
|
||||||
$LD -l -s -T0x11000 -R4 -o reboot.out rebootcode.$O
|
$LD -l -s -T$REBOOTADDR -R4 -o reboot.out rebootcode.$O
|
||||||
{echo 'uchar rebootcode[]={'
|
{echo 'uchar rebootcode[]={'
|
||||||
xd -1x reboot.out |
|
xd -1x reboot.out |
|
||||||
sed -e '1,2d' -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g'
|
sed -e '1,2d' -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g'
|
||||||
echo '};'} > reboot.h
|
echo '};'} > reboot.h
|
||||||
|
|
||||||
apbootstrap.h: apbootstrap.s mem.h
|
apbootstrap.h:D: apbootstrap.s mem.h
|
||||||
$AS $prereq
|
$AS $prereq
|
||||||
$LD -o apbootstrap.out -T$APBOOTSTRAP -R4 -l -s apbootstrap.$O
|
$LD -o apbootstrap.out -T$APBOOTSTRAP -R4 -l -s apbootstrap.$O
|
||||||
{echo 'uchar apbootstrap[]={'
|
{echo 'uchar apbootstrap[]={'
|
||||||
|
|
|
@ -5,6 +5,7 @@ objtype=amd64
|
||||||
</$objtype/mkfile
|
</$objtype/mkfile
|
||||||
p=9
|
p=9
|
||||||
|
|
||||||
|
# must match mem.h
|
||||||
KTZERO=0xffffffff80110000
|
KTZERO=0xffffffff80110000
|
||||||
APBOOTSTRAP=0xffffffff80007000
|
APBOOTSTRAP=0xffffffff80007000
|
||||||
REBOOTADDR=0x11000
|
REBOOTADDR=0x11000
|
||||||
|
@ -99,7 +100,7 @@ REPCC=`{../port/mkfilelist ../pc}
|
||||||
<../port/portmkfile
|
<../port/portmkfile
|
||||||
<|../port/mkbootrules $CONF
|
<|../port/mkbootrules $CONF
|
||||||
|
|
||||||
l.$O apbootstrap.$O: mem.h
|
l.$O: mem.h
|
||||||
|
|
||||||
$ETHER: ../port/etherif.h ../port/netif.h
|
$ETHER: ../port/etherif.h ../port/netif.h
|
||||||
$AUDIO: ../port/audioif.h
|
$AUDIO: ../port/audioif.h
|
||||||
|
@ -144,7 +145,7 @@ init.h:D: ../port/initcode.c ../pc/init9.c
|
||||||
sed -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g'
|
sed -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g'
|
||||||
echo '};'} > init.h
|
echo '};'} > init.h
|
||||||
|
|
||||||
reboot.h: rebootcode.s
|
reboot.h:D: rebootcode.s mem.h
|
||||||
$AS rebootcode.s
|
$AS rebootcode.s
|
||||||
$LD -l -R1 -s -o reboot.out -T$REBOOTADDR rebootcode.$O
|
$LD -l -R1 -s -o reboot.out -T$REBOOTADDR rebootcode.$O
|
||||||
{echo 'uchar rebootcode[]={'
|
{echo 'uchar rebootcode[]={'
|
||||||
|
@ -153,7 +154,7 @@ reboot.h: rebootcode.s
|
||||||
sed -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g'
|
sed -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g'
|
||||||
echo '};'} > $target
|
echo '};'} > $target
|
||||||
|
|
||||||
apbootstrap.h: apbootstrap.s
|
apbootstrap.h:D: apbootstrap.s mem.h
|
||||||
$AS apbootstrap.s
|
$AS apbootstrap.s
|
||||||
$LD -l -R1 -s -o apbootstrap.out -T$APBOOTSTRAP apbootstrap.$O
|
$LD -l -R1 -s -o apbootstrap.out -T$APBOOTSTRAP apbootstrap.$O
|
||||||
{echo 'uchar apbootstrap[]={'
|
{echo 'uchar apbootstrap[]={'
|
||||||
|
|
Loading…
Reference in a new issue