From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TA2f0-0008V5-OP for barebox@lists.infradead.org; Fri, 07 Sep 2012 17:48:07 +0000 Date: Fri, 7 Sep 2012 19:48:05 +0200 From: Sascha Hauer Message-ID: <20120907174805.GX26594@pengutronix.de> References: <20120905122556.GF32603@game.jcrosoft.org> <1346848107-4664-1-git-send-email-plagnioj@jcrosoft.com> <1346848107-4664-3-git-send-email-plagnioj@jcrosoft.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1346848107-4664-3-git-send-email-plagnioj@jcrosoft.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: barebox-bounces@lists.infradead.org Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH 3/7] defaultenv-2: boot use global.linux.bootargs.dyn for dynamic globarvar To: Jean-Christophe PLAGNIOL-VILLARD Cc: barebox@lists.infradead.org On Wed, Sep 05, 2012 at 02:28:23PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote: > linux.bootargs.dyn.* will be clearer at the beginning of boot By 'clearer' do you mean 'cleared'? If yes, I maybe understand the intention of this patch. Sascha > > This is need for boot sequence to do not have the previous boot param. > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD > --- > defaultenv-2/base/bin/bootargs-ip | 4 ++-- > defaultenv-2/base/bin/bootargs-ip-barebox | 2 +- > defaultenv-2/base/bin/bootargs-ip-dhcp | 2 +- > defaultenv-2/base/bin/bootargs-ip-none | 2 +- > defaultenv-2/base/bin/bootargs-root-disk | 2 +- > defaultenv-2/base/bin/bootargs-root-ext | 2 +- > defaultenv-2/base/bin/bootargs-root-initrd | 2 +- > defaultenv-2/base/bin/bootargs-root-jffs2 | 2 +- > defaultenv-2/base/bin/bootargs-root-nfs | 2 +- > defaultenv-2/base/bin/bootargs-root-ubi | 2 +- > defaultenv-2/base/bin/init | 5 +++-- > defaultenv-2/base/boot/initrd | 2 +- > 12 files changed, 15 insertions(+), 14 deletions(-) > > diff --git a/defaultenv-2/base/bin/bootargs-ip b/defaultenv-2/base/bin/bootargs-ip > index 15041c6..2d4486c 100644 > --- a/defaultenv-2/base/bin/bootargs-ip > +++ b/defaultenv-2/base/bin/bootargs-ip > @@ -5,7 +5,7 @@ > . /env/network/eth0 > > if [ $ip = dhcp ]; then > - global.linux.bootargs.ip="ip=dhcp" > + global.linux.bootargs.dyn.ip="ip=dhcp" > else > - global.linux.bootargs.ip="ip=$ipaddr:$serverip:$gateway:$netmask::eth0:" > + global.linux.bootargs.dyn.ip="ip=$ipaddr:$serverip:$gateway:$netmask::eth0:" > fi > diff --git a/defaultenv-2/base/bin/bootargs-ip-barebox b/defaultenv-2/base/bin/bootargs-ip-barebox > index 986c142..5a3b984 100644 > --- a/defaultenv-2/base/bin/bootargs-ip-barebox > +++ b/defaultenv-2/base/bin/bootargs-ip-barebox > @@ -4,4 +4,4 @@ > > 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:" > diff --git a/defaultenv-2/base/bin/bootargs-ip-dhcp b/defaultenv-2/base/bin/bootargs-ip-dhcp > index c542b24..dec8ae4 100644 > --- a/defaultenv-2/base/bin/bootargs-ip-dhcp > +++ b/defaultenv-2/base/bin/bootargs-ip-dhcp > @@ -2,4 +2,4 @@ > > # Do dhcp in Linux > > -global.linux.bootargs.ip="ip=dhcp" > +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 > index c010154..88aaa21 100644 > --- a/defaultenv-2/base/bin/bootargs-ip-none > +++ b/defaultenv-2/base/bin/bootargs-ip-none > @@ -2,4 +2,4 @@ > > # disable ip setup in Linux > > -global.linux.bootargs.ip="ip=none" > +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 > index df8750e..aa60cf3 100644 > --- a/defaultenv-2/base/bin/bootargs-root-disk > +++ b/defaultenv-2/base/bin/bootargs-root-disk > @@ -23,4 +23,4 @@ if [ -z "${fstype}" ]; then > exit 1 > fi > > -global.linux.bootargs.root="root=/dev/$part rootfstype=$fstype rootwait" > +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 > index 45fcd5a..dbdddb9 100644 > --- a/defaultenv-2/base/bin/bootargs-root-ext > +++ b/defaultenv-2/base/bin/bootargs-root-ext > @@ -9,4 +9,4 @@ while getopt "m:r:" opt; do > fi > done > > -global.linux.bootargs.root="root=/dev/$part rootfstype=ext$type rootwait" > +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 > index 7072cea..cc711a1 100644 > --- a/defaultenv-2/base/bin/bootargs-root-initrd > +++ b/defaultenv-2/base/bin/bootargs-root-initrd > @@ -13,4 +13,4 @@ while getopt "i:h" opt; do > fi > done > > -global.linux.bootargs.root="root=/dev/ram0 rdinit=${rdinit}" > +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 > index 74d59af..a8eb5e7 100644 > --- a/defaultenv-2/base/bin/bootargs-root-jffs2 > +++ b/defaultenv-2/base/bin/bootargs-root-jffs2 > @@ -18,4 +18,4 @@ if [ -z "$mtd" ]; then > exit 1 > fi > > -global.linux.bootargs.root="root=$mtd rootfstype=jffs2" > +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 > index 27bb6c4..355f93d 100644 > --- a/defaultenv-2/base/bin/bootargs-root-nfs > +++ b/defaultenv-2/base/bin/bootargs-root-nfs > @@ -17,4 +17,4 @@ if [ -n ${serverip} ]; then > nfsroot="$serverip:$nfsroot" > fi > > -global.linux.bootargs.root="root=/dev/nfs nfsroot=$nfsroot,v3,tcp" > +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 > index fb7f328..4260336 100644 > --- a/defaultenv-2/base/bin/bootargs-root-ubi > +++ b/defaultenv-2/base/bin/bootargs-root-ubi > @@ -21,4 +21,4 @@ if [ -z "$mtd" ]; then > exit 1 > 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" > diff --git a/defaultenv-2/base/bin/init b/defaultenv-2/base/bin/init > index 9d7eb2e..8e8871d 100644 > --- a/defaultenv-2/base/bin/init > +++ b/defaultenv-2/base/bin/init > @@ -8,8 +8,9 @@ global autoboot_timeout=3 > global boot.default=net > global allow_color=true > global linux.bootargs.base > -global linux.bootargs.ip > -global linux.bootargs.root > +#linux.bootargs.dyn.* will be clearer at the beginning of boot > +global linux.bootargs.dyn.ip > +global linux.bootargs.dyn.root > global editcmd=sedit > > /env/init/general > diff --git a/defaultenv-2/base/boot/initrd b/defaultenv-2/base/boot/initrd > index 79a353a..7c44d07 100644 > --- a/defaultenv-2/base/boot/initrd > +++ b/defaultenv-2/base/boot/initrd > @@ -11,7 +11,7 @@ global.bootm.initrd="${path}/initramfs" > bootargs-root-initrd > #global.bootm.oftree= > > -global.linux.bootargs.root="root=/dev/ram0" > +global.linux.bootargs.dyn.root="root=/dev/ram0" > > #bootargs-root-nfs -n "" -s > #bootargs-root-ubi -r -m > -- > 1.7.10.4 > > > _______________________________________________ > barebox mailing list > barebox@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/barebox > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox