[src/trunk]: src/distrib/utils/embedded/conf More cleanup:

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

details:   https://anonhg.NetBSD.org/src/rev/b8d63ecb87d4
branches:  trunk
changeset: 807692:b8d63ecb87d4
user:      hubertf <hubertf%NetBSD.org@localhost>
date:      Sun Apr 19 18:53:33 2015 +0000

description:
More cleanup:
Instead of first overwriting the *_evbarm functions with own code,
and then calling them from the regular functions, directly put the
code into the regular functions.

No more functions from evbarm.conf are used now.
Some variables are still used!

diffstat:

 distrib/utils/embedded/conf/rpi_inst.conf |  23 ++++++-----------------
 1 files changed, 6 insertions(+), 17 deletions(-)

diffs (51 lines):

diff -r 328085254817 -r b8d63ecb87d4 distrib/utils/embedded/conf/rpi_inst.conf
--- a/distrib/utils/embedded/conf/rpi_inst.conf Sun Apr 19 18:28:31 2015 +0000
+++ b/distrib/utils/embedded/conf/rpi_inst.conf Sun Apr 19 18:53:33 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rpi_inst.conf,v 1.7 2015/04/19 18:28:31 hubertf Exp $
+# $NetBSD: rpi_inst.conf,v 1.8 2015/04/19 18:53:33 hubertf Exp $
 # Raspberry Pi customization script used by mkimage
 #
 
@@ -17,7 +17,7 @@
 size=$(( 10485760 + ${swap} * 1024 * 512 + ${boot} * 1024 * 512 + ${init} * 1024 * 512 ))
 msdosid=12
 
-make_label_evbarm() {
+make_label() {
        # compute all sizes in terms of sectors
        local totalsize=$(( ${newsize} * 1024 * 2 / 512 ))
 
@@ -64,28 +64,17 @@
 EOF
 }
 
-make_fstab_evbarm() {
-:
-}
-
-customize_evbarm() {
+customize() {
        echo "${bar} creating directories ${bar}"
        mkdir ${mnt}/proc ${mnt}/kern
 }
-firmwaredir=$src/external/broadcom/rpi-firmware/dist
-firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf"
 
 make_fstab() {
-       make_fstab_evbarm
+       :
 }
 
-make_label() {
-       make_label_evbarm
-}
-
-customize() {
-       customize_evbarm
-}
+firmwaredir=$src/external/broadcom/rpi-firmware/dist
+firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf"
 
 populate() {
        cat > ${mnt}/boot/cmdline.txt << EOF