shithub: n900

Info  •  Files  •  Log  •  Branches

*: produce raw kernel images

--- a/sys/lib/dist/mkfile

+++ b/sys/lib/dist/mkfile

@@ -115,12 +115,12 @@

 %.n900.img:D: /n/src9/sys/src/boot/n900/boot.scr

 	@{

 	objtype=arm

-	kernel=/n/src9/$objtype/9n900.u

+	kernel=/n/src9/$objtype/9n900

 	> /env/plan9.ini {

 		echo 'console=2'

 	}

 	fatfiles=(/n/src9/sys/src/boot/n900/boot.scr /env/plan9.ini $kernel)

-	mb=1885 # storage vendors idea of 2GB

+	mb=1800

 	mk $target.$pid.disk

 	mv $target.$pid.disk $target

 	}

--- a/sys/src/9/omap/mkfile

+++ b/sys/src/9/omap/mkfile

@@ -64,12 +64,12 @@

 	/$objtype/lib/libc.a\

 	/$objtype/lib/libdtracy.a\

-$p$CONF.u:D: $p$CONF

-	aux/aout2uimage -o $target -Z0 $prereq

-

 $p$CONF:D: $OBJ $CONF.$O $LIB

-	$LD -o $target -T$ktzero -l $prereq

+	$LD -o $target -R4096 -T$ktzero -H6 -l $prereq

+s$p$CONF:D: $OBJ $CONF.$O $LIB

+	$LD -o $target -R4096 -T$ktzero -l $prereq

+

 <../boot/bootmkfile

 <../port/portmkfile

 <|../port/mkbootrules $CONF

@@ -77,6 +77,6 @@

 initcode.out: init9.$O initcode.$O /$objtype/lib/libc.a

 	$LD -l -R1 -s -o $target $prereq

-install:V: $p$CONF.u

+install:V: $p$CONF

 	cp $p$CONF /$objtype/

-	cp $p$CONF.u /$objtype/

+

--- a/sys/src/boot/n900/boot.txt

+++ b/sys/src/boot/n900/boot.txt

@@ -1,3 +1,3 @@

 mw 0x80010000 0x0 0x10000

 ${mmctype}load mmc ${mmcnum}:${mmcpart} 0x80010000 plan9.ini

-${mmctype}load mmc ${mmcnum}:${mmcpart} 0x80020000 9n900.u && bootm 0x80020000

+${mmctype}load mmc ${mmcnum}:${mmcpart} 0x80020000 9n900 && go 0x80020000