sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

defaultenv-2: boot use global.linux.bootargs.dyn for dynamic globalvar 

linux.bootargs.dyn.* will be cleared at the beginning of boot

This is need for boot sequence to do not have the previous boot param.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2012-08-13 02:04:23 +08:00
parent 4732c27030
commit 86df3fcd30
12 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
defaultenv-2/base/bin/bootargs-ip
View File

@ -5,7 +5,7 @@
. /env/network/eth0 . /env/network/eth0
if [ $ip = dhcp ]; then if [ $ip = dhcp ]; then
global.linux.bootargs.ip="ip=dhcp" global.linux.bootargs.dyn.ip="ip=dhcp"
else else
global.linux.bootargs.ip="ip=$ipaddr:$serverip:$gateway:$netmask::eth0:" global.linux.bootargs.dyn.ip="ip=$ipaddr:$serverip:$gateway:$netmask::eth0:"
fi fi

2
defaultenv-2/base/bin/bootargs-ip-barebox
View File

@ -4,4 +4,4 @@
ifup eth0 ifup eth0
global.linux.bootargs.ip="ip=$eth0.ipaddr:$eth0.serverip:$eth0.gateway:$eth0.netmask::eth0:" global.linux.bootargs.dyn.ip="ip=$eth0.ipaddr:$eth0.serverip:$eth0.gateway:$eth0.netmask::eth0:"

2
defaultenv-2/base/bin/bootargs-ip-dhcp
View File

@ -2,4 +2,4 @@
# Do dhcp in Linux # Do dhcp in Linux
global.linux.bootargs.ip="ip=dhcp" global.linux.bootargs.dyn.ip="ip=dhcp"

2
defaultenv-2/base/bin/bootargs-ip-none
View File

@ -2,4 +2,4 @@
# disable ip setup in Linux # disable ip setup in Linux
global.linux.bootargs.ip="ip=none" global.linux.bootargs.dyn.ip="ip=none"

2
defaultenv-2/base/bin/bootargs-root-disk
View File

@ -23,4 +23,4 @@ if [ -z "${fstype}" ]; then
exit 1 exit 1
fi fi
global.linux.bootargs.root="root=/dev/$part rootfstype=$fstype rootwait" global.linux.bootargs.dyn.root="root=/dev/$part rootfstype=$fstype rootwait"

2
defaultenv-2/base/bin/bootargs-root-ext
View File

@ -9,4 +9,4 @@ while getopt "m:r:" opt; do
fi fi
done done
global.linux.bootargs.root="root=/dev/$part rootfstype=ext$type rootwait" global.linux.bootargs.dyn.root="root=/dev/$part rootfstype=ext$type rootwait"

2
defaultenv-2/base/bin/bootargs-root-initrd
View File

@ -13,4 +13,4 @@ while getopt "i:h" opt; do
fi fi
done done
global.linux.bootargs.root="root=/dev/ram0 rdinit=${rdinit}" global.linux.bootargs.dyn.root="root=/dev/ram0 rdinit=${rdinit}"

2
defaultenv-2/base/bin/bootargs-root-jffs2
View File

@ -18,4 +18,4 @@ if [ -z "$mtd" ]; then
exit 1 exit 1
fi fi
global.linux.bootargs.root="root=$mtd rootfstype=jffs2" global.linux.bootargs.dyn.root="root=$mtd rootfstype=jffs2"

2
defaultenv-2/base/bin/bootargs-root-nfs
View File

@ -17,4 +17,4 @@ if [ -n ${serverip} ]; then
nfsroot="$serverip:$nfsroot" nfsroot="$serverip:$nfsroot"
fi fi
global.linux.bootargs.root="root=/dev/nfs nfsroot=$nfsroot,v3,tcp" global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,v3,tcp"

2
defaultenv-2/base/bin/bootargs-root-ubi
View File

@ -21,4 +21,4 @@ if [ -z "$mtd" ]; then
exit 1 exit 1
fi fi
global.linux.bootargs.root="root=ubi0:$ubiroot ubi.mtd=$mtd rootfstype=ubifs" global.linux.bootargs.dyn.root="root=ubi0:$ubiroot ubi.mtd=$mtd rootfstype=ubifs"

5
defaultenv-2/base/bin/init
View File

@ -8,8 +8,9 @@ global autoboot_timeout=3
global boot.default=net global boot.default=net
global allow_color=true global allow_color=true
global linux.bootargs.base global linux.bootargs.base
global linux.bootargs.ip #linux.bootargs.dyn.* will be clearer at the beginning of boot
global linux.bootargs.root global linux.bootargs.dyn.ip
global linux.bootargs.dyn.root
global editcmd=sedit global editcmd=sedit
/env/init/general /env/init/general

2
defaultenv-2/base/boot/initrd
View File

@ -11,7 +11,7 @@ global.bootm.initrd="${path}/initramfs"
bootargs-root-initrd bootargs-root-initrd
#global.bootm.oftree=<path to oftree> #global.bootm.oftree=<path to oftree>
global.linux.bootargs.root="root=/dev/ram0" global.linux.bootargs.dyn.root="root=/dev/ram0"
#bootargs-root-nfs -n "<path on server>" -s <serverip> #bootargs-root-nfs -n "<path on server>" -s <serverip>
#bootargs-root-ubi -r <volume> -m <mtdname> #bootargs-root-ubi -r <volume> -m <mtdname>