[src/netbsd-9]: src/distrib/utils/embedded/conf Pull up following revision(s)...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/518c47bcd918
branches:  netbsd-9
changeset: 963377:518c47bcd918
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Dec 08 14:35:10 2019 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #511):

        distrib/utils/embedded/conf/evbarm.conf: revision 1.34

Remove the pretty much useless 128MB swap partition from the arm images.

diffstat:

 distrib/utils/embedded/conf/evbarm.conf |  16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diffs (71 lines):

diff -r 2066f7903872 -r 518c47bcd918 distrib/utils/embedded/conf/evbarm.conf
--- a/distrib/utils/embedded/conf/evbarm.conf   Sun Dec 08 14:31:57 2019 +0000
+++ b/distrib/utils/embedded/conf/evbarm.conf   Sun Dec 08 14:35:10 2019 +0000
@@ -1,15 +1,14 @@
-# $NetBSD: evbarm.conf,v 1.33 2019/06/11 10:50:57 mrg Exp $
+# $NetBSD: evbarm.conf,v 1.33.2.1 2019/12/08 14:35:10 martin Exp $
 # evbarm shared config
 #
 image=$HOME/${board}.img
 
 MACHINE=evbarm
 
-swap=256
 extra=48               # spare space
 init=32
 boot=$((192 - ${init}))
-ffsoffset=$(( (${init} + ${boot} + ${swap}) / 2 ))m
+ffsoffset=$(( (${init} + ${boot}) / 2 ))m
 
 size=0         # autocompute
 msdosid=12
@@ -20,14 +19,12 @@
        # compute all sizes in terms of sectors
        local totalsize=$(( ${newsize} * 1024 * 2 / 512 ))
 
-       local swapsize=$(( ${swap} * 1024 ))
        local bootsize=$(( ${boot} * 1024 ))
 
        local bootoffset=$(( ${init} * 1024 ))
-       local swapoffset=$(( ${bootoffset} + ${bootsize} ))
 
-       local asize=$(( ${totalsize} - ${swapsize} - ${bootsize} - ${bootoffset} ))
-       local aoffset=$(( ${swapoffset} + ${swapsize} ))
+       local asize=$(( ${totalsize} - ${bootsize} - ${bootoffset} ))
+       local aoffset=$(( ${bootoffset} + ${bootsize} ))
 
        local bps=512
        local spt=32
@@ -57,7 +54,6 @@
 8 partitions:
 #     size         offset        fstype [fsize bsize cpg/sgs]
  a:   ${asize}     ${aoffset}    4.2BSD  ${fsize} ${bsize} 0  # 
- b:   ${swapsize}  ${swapoffset} swap                         #
  c:   ${totalsize} 0             unused      0     0          #
  e:   ${bootsize}  ${bootoffset} MSDOS                        #
 EOF
@@ -68,7 +64,6 @@
 # NetBSD /etc/fstab
 # See /usr/share/examples/fstab/ for more examples.
 ROOT.a         /               ffs     rw,noatime      1 1
-ROOT.b         none            swap    sw      0 0
 ROOT.e         /boot           msdos   rw      1 1
 kernfs         /kern           kernfs  rw
 ptyfs          /dev/pts        ptyfs   rw
@@ -85,7 +80,6 @@
 # NetBSD /etc/fstab
 # See /usr/share/examples/fstab/ for more examples.
 ROOT.a         /                       ffs     rw,log,noatime,nodevmtime 1 1
-ROOT.b         none                    swap    sw                        0 0
 ROOT.e         /boot                   msdos   rw                        1 1
 kernfs         /kern                   kernfs  rw
 ptyfs          /dev/pts                ptyfs   rw
@@ -137,6 +131,8 @@
 
 rc_configured=YES
 hostname=${board}
+no_swap=YES
+savecore=NO
 sshd=YES
 dhcpcd=YES
 ntpd=YES