diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-01 13:58:47 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-01 16:50:19 +0100 |
commit | fee5d94b9ab10fc4c7c0890384bd368681f4a0f6 (patch) | |
tree | 6febd3bed68608a31b530f06269fb6531ffadc8b /defaultenv-2 | |
parent | 9103c6dcd73293f7df8308c561860fba08b95926 (diff) | |
download | barebox-fee5d94b9ab10fc4c7c0890384bd368681f4a0f6.tar.gz barebox-fee5d94b9ab10fc4c7c0890384bd368681f4a0f6.tar.xz |
defenv-2: remove some helper scripts
The added complexity of bootargs-ip-* and bootargs-root-* makes
understanding defenv-2 more complicated. remove them and open
code the scripts instead in their users.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'defaultenv-2')
-rw-r--r-- | defaultenv-2/base/bin/bootargs-ip-barebox | 7 | ||||
-rw-r--r-- | defaultenv-2/base/bin/bootargs-ip-dhcp | 5 | ||||
-rw-r--r-- | defaultenv-2/base/bin/bootargs-ip-none | 5 | ||||
-rw-r--r-- | defaultenv-2/base/bin/bootargs-root-disk | 26 | ||||
-rw-r--r-- | defaultenv-2/base/bin/bootargs-root-ext | 12 | ||||
-rw-r--r-- | defaultenv-2/base/bin/bootargs-root-initrd | 16 | ||||
-rw-r--r-- | defaultenv-2/base/bin/bootargs-root-jffs2 | 21 | ||||
-rw-r--r-- | defaultenv-2/base/bin/bootargs-root-nfs | 20 | ||||
-rw-r--r-- | defaultenv-2/base/bin/bootargs-root-ubi | 24 | ||||
-rw-r--r-- | defaultenv-2/base/boot/net | 2 | ||||
-rw-r--r-- | defaultenv-2/base/data/boot-template | 4 |
11 files changed, 2 insertions, 140 deletions
diff --git a/defaultenv-2/base/bin/bootargs-ip-barebox b/defaultenv-2/base/bin/bootargs-ip-barebox deleted file mode 100644 index 5a3b984069..0000000000 --- a/defaultenv-2/base/bin/bootargs-ip-barebox +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# pass barebox ip settings for eth0 to Linux - -ifup eth0 - -global.linux.bootargs.dyn.ip="ip=$eth0.ipaddr:$eth0.serverip:$eth0.gateway:$eth0.netmask::eth0:" diff --git a/defaultenv-2/base/bin/bootargs-ip-dhcp b/defaultenv-2/base/bin/bootargs-ip-dhcp deleted file mode 100644 index dec8ae452a..0000000000 --- a/defaultenv-2/base/bin/bootargs-ip-dhcp +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -# Do dhcp in Linux - -global.linux.bootargs.dyn.ip="ip=dhcp" diff --git a/defaultenv-2/base/bin/bootargs-ip-none b/defaultenv-2/base/bin/bootargs-ip-none deleted file mode 100644 index 88aaa21a78..0000000000 --- a/defaultenv-2/base/bin/bootargs-ip-none +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -# disable ip setup in Linux - -global.linux.bootargs.dyn.ip="ip=none" diff --git a/defaultenv-2/base/bin/bootargs-root-disk b/defaultenv-2/base/bin/bootargs-root-disk deleted file mode 100644 index aa60cf33f0..0000000000 --- a/defaultenv-2/base/bin/bootargs-root-disk +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -usage="$0 [OPTIONS]\n -p <partition>\n -t <fstype>" - -while getopt "p:t:h" opt; do - if [ ${opt} = p ]; then - part=${OPTARG} - elif [ ${opt} = t ]; then - fstype=${OPTARG} - elif [ ${opt} = h ]; then - echo -e "$usage" - exit 0 - fi -done - -if [ -z "${part}" ]; then - echo "$0: no partition given" - exit 1 -fi - -if [ -z "${fstype}" ]; then - echo "$0: no filesystem type given" - exit 1 -fi - -global.linux.bootargs.dyn.root="root=/dev/$part rootfstype=$fstype rootwait" diff --git a/defaultenv-2/base/bin/bootargs-root-ext b/defaultenv-2/base/bin/bootargs-root-ext deleted file mode 100644 index dbdddb9fcc..0000000000 --- a/defaultenv-2/base/bin/bootargs-root-ext +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -while getopt "m:r:" opt; do - if [ ${opt} = m ]; then - part=${OPTARG} - fi - if [ ${opt} = r ]; then - type=${OPTARG} - fi -done - -global.linux.bootargs.dyn.root="root=/dev/$part rootfstype=ext$type rootwait" diff --git a/defaultenv-2/base/bin/bootargs-root-initrd b/defaultenv-2/base/bin/bootargs-root-initrd deleted file mode 100644 index cc711a1051..0000000000 --- a/defaultenv-2/base/bin/bootargs-root-initrd +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -rdinit="/sbin/init" - -usage="$0 [OPTIONS]\n -i <rdinitpath> (/sbin/init)" - -while getopt "i:h" opt; do - if [ ${opt} = i ]; then - rdinit=${OPTARG} - elif [ ${opt} = h ]; then - echo -e "$usage" - exit 0 - fi -done - -global.linux.bootargs.dyn.root="root=/dev/ram0 rdinit=${rdinit}" diff --git a/defaultenv-2/base/bin/bootargs-root-jffs2 b/defaultenv-2/base/bin/bootargs-root-jffs2 deleted file mode 100644 index a8eb5e7bb8..0000000000 --- a/defaultenv-2/base/bin/bootargs-root-jffs2 +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -mtd= - -usage="$0 [OPTIONS]\n -m <mtd>" - -while getopt "m:h" opt; do - if [ ${opt} = m ]; then - mtd=${OPTARG} - elif [ ${opt} = h ]; then - echo -e "$usage" - exit 0 - fi -done - -if [ -z "$mtd" ]; then - echo -e "$usage" - exit 1 -fi - -global.linux.bootargs.dyn.root="root=$mtd rootfstype=jffs2" diff --git a/defaultenv-2/base/bin/bootargs-root-nfs b/defaultenv-2/base/bin/bootargs-root-nfs deleted file mode 100644 index 355f93dbe3..0000000000 --- a/defaultenv-2/base/bin/bootargs-root-nfs +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -usage="$0 [OPTIONS]\n -n <nfspath>\n -s <serverip>" - -while getopt "n:s:h" opt; do - if [ ${opt} = n ]; then - nfsroot=${OPTARG} - elif [ ${opt} = s ]; then - serverip=${OPTARG} - elif [ ${opt} = h ]; then - echo -e "$usage" - exit 0 - fi -done - -if [ -n ${serverip} ]; then - nfsroot="$serverip:$nfsroot" -fi - -global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,v3,tcp" diff --git a/defaultenv-2/base/bin/bootargs-root-ubi b/defaultenv-2/base/bin/bootargs-root-ubi deleted file mode 100644 index 4260336915..0000000000 --- a/defaultenv-2/base/bin/bootargs-root-ubi +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -ubiroot=root -mtd= - -usage="$0 [OPTIONS]\n -r <ubiroot> (root)\n -m <mtd>" - -while getopt "m:r:h" opt; do - if [ ${opt} = r ]; then - ubiroot=${OPTARG} - elif [ ${opt} = m ]; then - mtd=${OPTARG} - elif [ ${opt} = h ]; then - echo -e "$usage" - exit 0 - fi -done - -if [ -z "$mtd" ]; then - echo -e "$usage" - exit 1 -fi - -global.linux.bootargs.dyn.root="root=ubi0:$ubiroot ubi.mtd=$mtd rootfstype=ubifs" diff --git a/defaultenv-2/base/boot/net b/defaultenv-2/base/boot/net index 922bef12bb..90c25aa147 100644 --- a/defaultenv-2/base/boot/net +++ b/defaultenv-2/base/boot/net @@ -11,4 +11,4 @@ global.bootm.image="${path}/${global.user}-linux-${global.hostname}" #global.bootm.oftree="${path}/${global.user}-oftree-${global.hostname}" nfsroot="/home/${global.user}/nfsroot/${global.hostname}" bootargs-ip -bootargs-root-nfs -n "$nfsroot" +global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,v3,tcp" diff --git a/defaultenv-2/base/data/boot-template b/defaultenv-2/base/data/boot-template index 1cacf18bf7..9297499036 100644 --- a/defaultenv-2/base/data/boot-template +++ b/defaultenv-2/base/data/boot-template @@ -11,6 +11,4 @@ global.bootm.image=<path to image> #bootargs-ip -#bootargs-root-nfs -n "<path on server>" -s <serverip> -#bootargs-root-jffs2 -m <mtdname> -#bootargs-root-ubi -r <volume> -m <mtdname> +global.linux.bootargs.dyn.root="root=<rootfs here>" |