Mon Jan 21 16:59:23 2013 UTC ()
kernel.img is for rpi only


(skrll)
diff -r1.1 -r1.2 src/distrib/utils/embedded/conf/evbarm.conf
diff -r1.9 -r1.10 src/distrib/utils/embedded/conf/rpi.conf
cvs diff -r1.1 -r1.2 src/distrib/utils/embedded/conf/evbarm.conf (expand / switch to unified diff)

--- src/distrib/utils/embedded/conf/evbarm.conf 2013/01/16 23:27:34 1.1
+++ src/distrib/utils/embedded/conf/evbarm.conf 2013/01/21 16:59:23 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: evbarm.conf,v 1.1 2013/01/16 23:27:34 christos Exp $ 1# $NetBSD: evbarm.conf,v 1.2 2013/01/21 16:59:23 skrll Exp $
2# evbarm shared config 2# evbarm shared config
3# 3#
4image=$HOME/${board}.img 4image=$HOME/${board}.img
5 5
6setsdir=$obj/evbarm/media/evbarm/binary/sets/ 6setsdir=$obj/evbarm/media/evbarm/binary/sets/
7specialdirs="/kern /proc" 7specialdirs="/kern /proc"
8 8
9swap=256 9swap=256
10extra=8 # spare space 10extra=8 # spare space
11boot=112 11boot=112
12init=8 12init=8
13 13
14size=0 # autocompute 14size=0 # autocompute
@@ -78,32 +78,25 @@ make_fstab_evbarm() { @@ -78,32 +78,25 @@ make_fstab_evbarm() {
78/dev/ld0e /boot msdos rw 1 1 78/dev/ld0e /boot msdos rw 1 1
79kernfs /kern kernfs rw 79kernfs /kern kernfs rw
80ptyfs /dev/pts ptyfs rw 80ptyfs /dev/pts ptyfs rw
81procfs /proc procfs rw 81procfs /proc procfs rw
82EOF 82EOF
83} 83}
84 84
85customize_evbarm() { 85customize_evbarm() {
86 ${sudo} cat >> ${mnt}/etc/rc.conf << EOF 86 ${sudo} cat >> ${mnt}/etc/rc.conf << EOF
87sshd=YES 87sshd=YES
88dhcpcd=YES 88dhcpcd=YES
89mdnsd=YES 89mdnsd=YES
90EOF 90EOF
91 if [ ! -f ${kerneldir}/kernel.img ]; then 
92 echo ${PROG}: Missing ${kerneldir}/kernel.img 1>&2 
93 exit 1 
94 fi 
95 echo "${bar} installing kernel ${bar}" 
96 ${sudo} cp ${kerneldir}/kernel.img ${mnt}/boot 
97 
98 if [ ! -f ${mnt}/dev/MAKEDEV ]; then 91 if [ ! -f ${mnt}/dev/MAKEDEV ]; then
99 echo ${PROG}: Missing ${mnt}/dev/MAKEDEV 1>&2 92 echo ${PROG}: Missing ${mnt}/dev/MAKEDEV 1>&2
100 exit 1 93 exit 1
101 fi 94 fi
102 echo "${bar} running MAKEDEV ${bar}" 95 echo "${bar} running MAKEDEV ${bar}"
103 (cd ${mnt}/dev && ${sudo} sh MAKEDEV all) 96 (cd ${mnt}/dev && ${sudo} sh MAKEDEV all)
104} 97}
105 98
106cleanup_evbarm() { 99cleanup_evbarm() {
107 rm -f ${tmp} 100 rm -f ${tmp}
108 ${sudo} umount ${mnt}/boot 101 ${sudo} umount ${mnt}/boot
109} 102}
cvs diff -r1.9 -r1.10 src/distrib/utils/embedded/conf/rpi.conf (expand / switch to unified diff)

--- src/distrib/utils/embedded/conf/rpi.conf 2013/01/16 23:27:34 1.9
+++ src/distrib/utils/embedded/conf/rpi.conf 2013/01/21 16:59:23 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: rpi.conf,v 1.9 2013/01/16 23:27:34 christos Exp $ 1# $NetBSD: rpi.conf,v 1.10 2013/01/21 16:59:23 skrll Exp $
2# Raspberry PI customization script used by mkimage 2# Raspberry PI customization script used by mkimage
3# 3#
4 4
5board=rpi 5board=rpi
6kernelconf=RPI 6kernelconf=RPI
7kerneldir=$src/sys/arch/evbarm/compile/${kernelconf} 7kerneldir=$src/sys/arch/evbarm/compile/${kernelconf}
8 8
9. ${DIR}/conf/evbarm.conf 9. ${DIR}/conf/evbarm.conf
10 10
11firmwaredir=$src/external/broadcom/rpi-firmware/dist 11firmwaredir=$src/external/broadcom/rpi-firmware/dist
12firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf" 12firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf"
13 13
14make_filesystems() { 14make_filesystems() {
@@ -17,30 +17,38 @@ make_filesystems() { @@ -17,30 +17,38 @@ make_filesystems() {
17 17
18make_fstab() { 18make_fstab() {
19 make_fstab_evbarm 19 make_fstab_evbarm
20} 20}
21 21
22customize() { 22customize() {
23 customize_evbarm 23 customize_evbarm
24 ${sudo} cat >> ${mnt}/etc/rc.conf << EOF 24 ${sudo} cat >> ${mnt}/etc/rc.conf << EOF
25wscons=YES 25wscons=YES
26EOF 26EOF
27 27
28 ${sudo} cat > ${mnt}/boot/cmdline.txt << EOF 28 ${sudo} cat > ${mnt}/boot/cmdline.txt << EOF
29console=fb 29console=fb
30#fb=1280x1024 # to select a mode, otherwise EDID will be tried and fallback to 30#fb=1280x1024 # to select a mode, otherwise try EDID
31#fb=disable # to disable fb completely 31#fb=disable # to disable fb completely
32EOF 32EOF
33 33
 34 if [ ! -f ${kerneldir}/kernel.img ]; then
 35 echo ${PROG}: Missing ${kerneldir}/kernel.img 1>&2
 36 exit 1
 37 fi
 38
 39 echo "${bar} installing kernel ${bar}"
 40 ${sudo} cp ${kerneldir}/kernel.img ${mnt}/boot
 41
34 echo -n "${bar} installing firmware files:" 42 echo -n "${bar} installing firmware files:"
35 (cd ${mnt}/boot && 43 (cd ${mnt}/boot &&
36 for f in ${firmwarefiles}; do 44 for f in ${firmwarefiles}; do
37 echo -n " $f" 45 echo -n " $f"
38 ${sudo} cp ${firmwaredir}/${f} . 46 ${sudo} cp ${firmwaredir}/${f} .
39 done 47 done
40 ) 48 )
41 echo " ${bar}" 49 echo " ${bar}"
42 50
43} 51}
44 52
45cleanup() { 53cleanup() {
46 cleanup_evbarm 54 cleanup_evbarm