defaultenv-2: add boot sequence
v2 cover defaultenv-2: add boot sequence
HI,
v2:
drop global.boot.default as we start the boot sequence by default update ansi-colors
allow to always pass -e to echo
this patch series depends on fs-symlink send previously
please pull
The following changes since commit b65e60792376bb209adfa128e1783cf67af9f13b:
defautenv: add support of symlink (2012-09-05 03:22:14 +0800)
are available in the git repository at:
git://git.jcrosoft.org/barebox.git tags/defaultenv-2-boot-sequence
for you to fetch changes up to 15dd5521e4aeb6061ae258251967e2f89b237f5f:
defaultenv-2: add boot sequence (2012-09-05 20:16:01 +0800)
----------------------------------------------------------------
defaultenv-2: add boot sequence
Boot will boot run sequentially the script in /env/boot.d We store symlink in /env/boot.d on /env/boot
drop global.boot.default
start the boot sequence by default
----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (7):
globalbar: add inline when not enabled
globalvar: add support to set a value to of all globalvars beginning with 'match'
defaultenv-2: boot use global.linux.bootargs.dyn for dynamic globarvar
defaultenv-2: boot reset linux.bootargs.dyn. and bootm. globarvar
echo: always allow to pass -e option
defaultenv-2/ansi-colors: export color only if enable
defaultenv-2: add boot sequence
arch/arm/boards/crystalfontz-cfa10036/env/boot.d/01 | 1 + arch/arm/boards/crystalfontz-cfa10036/env/boot.d/02 | 1 + arch/arm/boards/crystalfontz-cfa10036/env/boot.d/03 | 1 + arch/arm/boards/crystalfontz-cfa10036/env/init/general | 3 --- arch/arm/boards/freescale-mx6-sabrelite/env/boot.d/01 | 1 + arch/arm/boards/freescale-mx6-sabrelite/env/boot.d/02 | 1 + arch/arm/boards/pcm038/env/boot.d/01 | 1 + arch/arm/boards/pcm038/env/boot.d/02 | 1 + arch/arm/boards/pcm038/env/boot.d/03 | 1 + arch/arm/boards/tqma53/env/boot.d/01 | 1 + arch/arm/boards/tqma53/env/boot.d/02 | 1 + commands/echo.c | 4 ++-- commands/global.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++------- common/globalvar.c | 10 ++++++++++ defaultenv-2/base/bin/boot | 55 +++++++++++++++++++++++++++++++++++++++++++++++++------ 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 +- defaultenv-2/base/data/ansi-colors | 4 ++++ defaultenv-2/base/init/general | 3 --- defaultenv-2/menu/menu/mainmenu | 4 +--- include/globalvar.h | 23 +++++++++++++++++++++++ 31 files changed, 165 insertions(+), 38 deletions(-) create mode 120000 arch/arm/boards/crystalfontz-cfa10036/env/boot.d/01 create mode 120000 arch/arm/boards/crystalfontz-cfa10036/env/boot.d/02 create mode 120000 arch/arm/boards/crystalfontz-cfa10036/env/boot.d/03 create mode 120000 arch/arm/boards/freescale-mx6-sabrelite/env/boot.d/01 create mode 120000 arch/arm/boards/freescale-mx6-sabrelite/env/boot.d/02 create mode 120000 arch/arm/boards/pcm038/env/boot.d/01 create mode 120000 arch/arm/boards/pcm038/env/boot.d/02 create mode 120000 arch/arm/boards/pcm038/env/boot.d/03 create mode 120000 arch/arm/boards/tqma53/env/boot.d/01 create mode 120000 arch/arm/boards/tqma53/env/boot.d/02
Best Regards,
J.
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
PATCH v2 1/7 globalbar: add inline when not enabled
--- include/globalvar.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
include/globalvar.h +20 -0
@@ -1,6 +1,7 @@#ifndef __GLOBALVAR_H#define __GLOBALVAR_H +#ifdef CONFIG_GLOBALVAR int globalvar_add_simple (const char *name); int globalvar_add(const char *name,
@@ -8,5 +9,24 @@ int globalvar_add(const char *name,const char *(*get)(struct device_d *,struct param_d *p), unsigned long flags);char *globalvar_get_match (const char *match,const char *seperator); +#else +static inline int globalvar_add_simple (const char *name) +{ +return 0 ; +} + +static inline int globalvar_add (const char *name, +int (*set)(struct device_d *dev,struct param_d *p,const char *val), +const char *(*get)(struct device_d *,struct param_d *p), +unsigned long flags) +{ +return 0 ; +} + +static inline char *globalvar_get_match (const char *match,const char *seperator) +{ +return NULL ; +} +#endif #endif /* __GLOBALVAR_H */
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH v2 2/7 globalvar: add support to set a value to of all globalvars beginning with 'match'
via c global_reset_match and global -r
--- commands/global.c | 58 ++++++++++++++++++++++++++++++++++++++++++++------- common/globalvar.c | 10 +++++++++ include/globalvar.h | 3 +++ 3 files changed, 64 insertions(+), 7 deletions(-)
commands/global.c +51 -7
@@ -24,25 +24,26 @@#include <command.h> #include <globalvar.h> #include <environment.h> +#include <getopt.h> -static int do_global (int argc,char *argv[]) +static int do_global_add (int argc,char *argv[]) {int ret;char *value; -if (argc !=2 ) +if (argc !=1 )return COMMAND_ERROR_USAGE ; - value =strchr (argv[1 ],'=' ); + value =strchr (argv[0 ],'=' );if (value) { *value =0 ; value++; } - ret =globalvar_add_simple (argv[1 ]); + ret =globalvar_add_simple (argv[0 ]);if (value) { -char *name =asprintf ("global.%s" , argv[1 ]); +char *name =asprintf ("global.%s" , argv[0 ]); ret =setenv (name, value);free (name); }
@@ -50,13 +51,56 @@ static int do_global(int argc, char *argv[])return ret ?1 :0 ; } +static int do_global_reset (int argc,char *argv[]) +{ +char *value; + +if (argc !=1 ) +return COMMAND_ERROR_USAGE ; + + value =strchr (argv[0 ],'=' ); +if (value) { + *value =0 ; + value++; + }else { + value ="" ; + } + +globalvar_reset_match (argv[0 ], value); + +return 0 ; +} + +static int do_global (int argc,char *argv[]) +{ +int opt; +int do_reset =0 ; + +while ((opt =getopt (argc, argv,"r" )) >0 ) { +switch (opt) { +case 'r' : + do_reset =1 ; +break ; + } + } + + argc -= optind; + argv += optind; + +if (do_reset) +return do_global_reset (argc, argv); + +return do_global_add (argc, argv); +} + BAREBOX_CMD_HELP_START(global) -BAREBOX_CMD_HELP_USAGE("global <var>[=<value]\n") +BAREBOX_CMD_HELP_USAGE("global [-r] <var>[=<value]\n") BAREBOX_CMD_HELP_SHORT("add a new global variable named <var>, optionally set to <value>\n") +BAREBOX_CMD_HELP_SHORT("-r to set a value to of all globalvars beginning with 'match'") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(global) .cmd = do_global, - .usage = "create global variables", + .usage = "create or reset global variables", BAREBOX_CMD_HELP(cmd_global_help) BAREBOX_CMD_END
common/globalvar.c +10 -0
@@ -46,6 +46,16 @@ char *globalvar_get_match(const char *match, const char *seperator)return val; } +void globalvar_reset_match (const char *match,const char *val) +{ +struct param_d *param; + +list_for_each_entry (param, &global_device.parameters, list) { +if (!strncmp (match, param->name,strlen (match))) +dev_set_param (&global_device, param->name, val); + } +} +/* * globalvar_add_simple *
include/globalvar.h +3 -0
@@ -9,6 +9,7 @@ int globalvar_add(const char *name,const char *(*get)(struct device_d *,struct param_d *p), unsigned long flags);char *globalvar_get_match (const char *match,const char *seperator); +void globalvar_reset_match (const char *match,const char *val);#else static inline int globalvar_add_simple (const char *name) {
@@ -27,6 +28,8 @@ static inline char *globalvar_get_match(const char *match, const char *seperator {return NULL ; } + +static inline void globalvar_reset_match (const char *match,const char *val) {}#endif #endif /* __GLOBALVAR_H */
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 2/7] globalvar: add support to set a value to of all globalvars beginning with 'match'
Quoted 109 lines · Jean-Christophe PLAGNIOL-VILLARD
via c
global_reset_matchand global -rSigned-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>--- commands/global.c | 58 ++++++++++++++++++++++++++++++++++++++++++++------- common/globalvar.c | 10 +++++++++ include/globalvar.h | 3 +++ 3 files changed, 64 insertions(+), 7 deletions(-)commands/global.c +51
-7@@ -24,25 +24,26 @@#include <command.h> #include <globalvar.h> #include <environment.h> +#include <getopt.h> -static int do_global (int argc,char *argv[]) +static int do_global_add (int argc,char *argv[]) {int ret;char *value; -if (argc !=2 ) +if (argc !=1 )return COMMAND_ERROR_USAGE ; - value =strchr (argv[1 ],'=' ); + value =strchr (argv[0 ],'=' );if (value) { *value =0 ; value++; } - ret =globalvar_add_simple (argv[1 ]); + ret =globalvar_add_simple (argv[0 ]);if (value) { -char *name =asprintf ("global.%s" , argv[1 ]); +char *name =asprintf ("global.%s" , argv[0 ]); ret =setenv (name, value);free (name); }@@ -50,13 +51,56 @@ static int do_global(int argc, char *argv[])return ret ?1 :0 ; } +static int do_global_reset (int argc,char *argv[]) +{ +char *value; + +if (argc !=1 ) +return COMMAND_ERROR_USAGE ; + + value =strchr (argv[0 ],'=' ); +if (value) { + *value =0 ; + value++; + }else { + value ="" ; + } + +globalvar_reset_match (argv[0 ], value); + +return 0 ; +} + +static int do_global (int argc,char *argv[]) +{ +int opt; +int do_reset =0 ; + +while ((opt =getopt (argc, argv,"r" )) >0 ) { +switch (opt) { +case 'r' : + do_reset =1 ; +break ; + } + } + + argc -= optind; + argv += optind; + +if (do_reset) +return do_global_reset (argc, argv); + +return do_global_add (argc, argv); +} + BAREBOX_CMD_HELP_START(global) -BAREBOX_CMD_HELP_USAGE("global <var>[=<value]\n") +BAREBOX_CMD_HELP_USAGE("global [-r] <var>[=<value]\n") BAREBOX_CMD_HELP_SHORT("add a new global variable named <var>, optionally set to <value>\n") +BAREBOX_CMD_HELP_SHORT("-r to set a value to of all globalvars beginning with 'match'") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(global) .cmd = do_global, - .usage = "create global variables", + .usage = "create or reset global variables", BAREBOX_CMD_HELP(cmd_global_help) BAREBOX_CMD_ENDcommon/globalvar.c +0
-0
common/globalvar.c char *globalvar_get_match(const char *match, const char *seperator) · line 50
Quoted 5 lines
common/globalvar.c +2
-0@@ -46,6 +46,16 @@ char *globalvar_get_match(const char *match, const char *seperator)return val; } +void globalvar_reset_match (const char *match,const char *val) +{
I think globalvar_set_match would be a better name for this function as resetting is just a special usecase.
How about changing the name and prototype of globalvar_add_simple to:
int globalvar_set(const char *name, const char *value)
Then instead of duplicating code in the command you could do a:
if (match) globalvar_set_match(name, value); else globalvar_set(name, value);
Sascha
Quoted 41 lines
common/globalvar.c +8
-0+struct param_d *param; + +list_for_each_entry (param, &global_device.parameters, list) { +if (!strncmp (match, param->name,strlen (match))) +dev_set_param (&global_device, param->name, val); + } +} +/* * globalvar_add_simple * include/globalvar.h +3
-0@@ -9,6 +9,7 @@ int globalvar_add(const char *name,const char *(*get)(struct device_d *,struct param_d *p), unsigned long flags);char *globalvar_get_match (const char *match,const char *seperator); +void globalvar_reset_match (const char *match,const char *val);#else static inline int globalvar_add_simple (const char *name) {@@ -27,6 +28,8 @@ static inline char *globalvar_get_match(const char *match, const char *seperator {return NULL ; } + +static inline void globalvar_reset_match (const char *match,const char *val) {}#endif #endif /* __GLOBALVAR_H */ Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Signature · 9 lines
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 [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH v2 3/7 defaultenv-2: boot use global.linux.bootargs.dyn for dynamic globarvar
In reply to Jean-Christophe PLAGNIOL-VILLARDlinux.bootargs.dyn.* will be clearer at the beginning of boot
This is need for boot sequence to do not have the previous boot param.
--- 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(-)
defaultenv-2/base/bin/bootargs-ip +2 -2
@@ -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
defaultenv-2/base/bin/bootargs-ip-barebox +1 -1
@@ -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:"
defaultenv-2/base/bin/bootargs-ip-dhcp +1 -1
@@ -2,4 +2,4 @@ # Do dhcp in Linux -global.linux.bootargs.ip="ip=dhcp" +global.linux.bootargs.dyn.ip="ip=dhcp"
defaultenv-2/base/bin/bootargs-ip-none +1 -1
@@ -2,4 +2,4 @@ # disable ip setup in Linux -global.linux.bootargs.ip="ip=none" +global.linux.bootargs.dyn.ip="ip=none"
defaultenv-2/base/bin/bootargs-root-disk +1 -1
@@ -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"
defaultenv-2/base/bin/bootargs-root-ext +1 -1
@@ -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"
defaultenv-2/base/bin/bootargs-root-initrd +1 -1
@@ -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}"
defaultenv-2/base/bin/bootargs-root-jffs2 +1 -1
@@ -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"
defaultenv-2/base/bin/bootargs-root-nfs +1 -1
@@ -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"
defaultenv-2/base/bin/bootargs-root-ubi +1 -1
@@ -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"
defaultenv-2/base/bin/init +3 -2
@@ -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
defaultenv-2/base/boot/initrd +1 -1
@@ -11,7 +11,7 @@ global.bootm.initrd="${path}/initramfs" bootargs-root-initrd #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-ubi -r <volume> -m <mtdname>
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 3/7] defaultenv-2: boot use global.linux.bootargs.dyn for dynamic globarvar
Quoted 1 line · Jean-Christophe PLAGNIOL-VILLARD
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
Quoted 161 lines
This is need for boot sequence to do not have the previous boot param.
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>--- 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(-)defaultenv-2/base/bin/bootargs-ip +2
-2@@ -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:" fidefaultenv-2/base/bin/bootargs-ip-barebox +1
-1@@ -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:"defaultenv-2/base/bin/bootargs-ip-dhcp +1
-1@@ -2,4 +2,4 @@ # Do dhcp in Linux -global.linux.bootargs.ip="ip=dhcp" +global.linux.bootargs.dyn.ip="ip=dhcp"defaultenv-2/base/bin/bootargs-ip-none +1
-1@@ -2,4 +2,4 @@ # disable ip setup in Linux -global.linux.bootargs.ip="ip=none" +global.linux.bootargs.dyn.ip="ip=none"defaultenv-2/base/bin/bootargs-root-disk +1
-1@@ -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"defaultenv-2/base/bin/bootargs-root-ext +1
-1@@ -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"defaultenv-2/base/bin/bootargs-root-initrd +1
-1@@ -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}"defaultenv-2/base/bin/bootargs-root-jffs2 +1
-1@@ -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"defaultenv-2/base/bin/bootargs-root-nfs +1
-1@@ -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"defaultenv-2/base/bin/bootargs-root-ubi +1
-1@@ -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"defaultenv-2/base/bin/init +3
-2@@ -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/generaldefaultenv-2/base/boot/initrd +1
-1@@ -11,7 +11,7 @@ global.bootm.initrd="${path}/initramfs" bootargs-root-initrd #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-ubi -r <volume> -m <mtdname>Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Signature · 9 lines
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 [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 3/7] defaultenv-2: boot use global.linux.bootargs.dyn for dynamic globarvar
Quoted 5 lines · Sascha Hauer
Quoted 1 line · Jean-Christophe PLAGNIOL-VILLARD
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.
yes
Best Regards,
J.
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
PATCH v2 4/7 defaultenv-2: boot reset linux.bootargs.dyn. and bootm. globarvar
In reply to Jean-Christophe PLAGNIOL-VILLARDThis is need for boot sequence to do not have the previous boot param.
--- defaultenv-2/base/bin/boot | 4 ++++ 1 file changed, 4 insertions(+)
defaultenv-2/base/bin/boot +4 -0
@@ -33,6 +33,10 @@ while getopt "vdhl" opt; do fi done +# clear linux.bootargs.dyn.* and bootm.* +global -r linux.bootargs.dyn. +global -r bootm. + if [ $# = 0 ]; then scr="$global.boot.default" else
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH v2 5/7 echo: always allow to pass -e option
In reply to Jean-Christophe PLAGNIOL-VILLARDThis will allow to do not taint if not enabled
--- commands/echo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
commands/echo.c +2 -2
@@ -66,11 +66,11 @@ static int do_echo(int argc, char *argv[]) goto no_optarg_out; optind++;break ; -#ifdef CONFIG_CMD_ECHO_E case 'e' : +#ifdef CONFIG_CMD_ECHO_E process_escape =1 ; -break ;#endif +break ;default : goto exit_parse; }
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 5/7] echo: always allow to pass -e option
Quoted 12 lines · Jean-Christophe PLAGNIOL-VILLARD
This will allow to do not taint if not enabled
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>--- commands/echo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)commands/echo.c +0
-0
commands/echo.c static int do_echo(int argc, char *argv[]) · line 71
Quoted 7 lines
commands/echo.c +1
-1@@ -66,11 +66,11 @@ static int do_echo(int argc, char *argv[]) goto no_optarg_out; optind++;break ; -#ifdef CONFIG_CMD_ECHO_E case 'e' : +#ifdef CONFIG_CMD_ECHO_E process_escape =1 ;
Better:
process_escape = IS_ENABLED(CONFIG_CMD_ECHO_E);
Sascha
Quoted 15 lines
commands/echo.c +1
-1-break ;#endif +break ;default : goto exit_parse; }Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Signature · 9 lines
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 [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH v2 6/7 defaultenv-2/ansi-colors: export color only if enable
In reply to Jean-Christophe PLAGNIOL-VILLARDThis will allow to do not check it everywhere
--- defaultenv-2/base/data/ansi-colors | 4 ++++ defaultenv-2/menu/menu/mainmenu | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-)
defaultenv-2/base/data/ansi-colors +4 -0
@@ -1,5 +1,9 @@ #!/bin/sh +if [ ${global.allow_color} != "true" ]; then + exit +fi + # Colors export RED='\e[1;31m' export BLUE='\e[1;34m'
defaultenv-2/menu/menu/mainmenu +1 -3
@@ -3,9 +3,7 @@ savepath=$PATH export menupath=$PATH:/env/menu -if [ ${global.allow_color} = "true" ]; then - . /env/data/ansi-colors -fi +. /env/data/ansi-colors while true; do export PATH=${menupath}
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH v2 7/7 defaultenv-2: add boot sequence
In reply to Jean-Christophe PLAGNIOL-VILLARDBoot will boot run sequentially the script in /env/boot.d
drop global.boot.default as we start the boot sequence by default
update the current board using the defaultenv-2 at the sametime
--- .../arm/boards/crystalfontz-cfa10036/env/boot.d/01 | 1 + .../arm/boards/crystalfontz-cfa10036/env/boot.d/02 | 1 + .../arm/boards/crystalfontz-cfa10036/env/boot.d/03 | 1 + .../boards/crystalfontz-cfa10036/env/init/general | 3 -- .../boards/freescale-mx6-sabrelite/env/boot.d/01 | 1 + .../boards/freescale-mx6-sabrelite/env/boot.d/02 | 1 + arch/arm/boards/pcm038/env/boot.d/01 | 1 + arch/arm/boards/pcm038/env/boot.d/02 | 1 + arch/arm/boards/pcm038/env/boot.d/03 | 1 + arch/arm/boards/tqma53/env/boot.d/01 | 1 + arch/arm/boards/tqma53/env/boot.d/02 | 1 + defaultenv-2/base/bin/boot | 51 +++++++++++++++++--- defaultenv-2/base/init/general | 3 -- 13 files changed, 55 insertions(+), 12 deletions(-) create mode 120000 arch/arm/boards/crystalfontz-cfa10036/env/boot.d/01 create mode 120000 arch/arm/boards/crystalfontz-cfa10036/env/boot.d/02 create mode 120000 arch/arm/boards/crystalfontz-cfa10036/env/boot.d/03 create mode 120000 arch/arm/boards/freescale-mx6-sabrelite/env/boot.d/01 create mode 120000 arch/arm/boards/freescale-mx6-sabrelite/env/boot.d/02 create mode 120000 arch/arm/boards/pcm038/env/boot.d/01 create mode 120000 arch/arm/boards/pcm038/env/boot.d/02 create mode 120000 arch/arm/boards/pcm038/env/boot.d/03 create mode 120000 arch/arm/boards/tqma53/env/boot.d/01 create mode 120000 arch/arm/boards/tqma53/env/boot.d/02
arch/arm/boards/crystalfontz-cfa10036/env/boot.d/01 new file +1 -0
@@ -0,0 +1 @@ +../boot/mmc-ext3
arch/arm/boards/crystalfontz-cfa10036/env/boot.d/02 new file +1 -0
@@ -0,0 +1 @@ +../boot/net
arch/arm/boards/crystalfontz-cfa10036/env/boot.d/03 new file +1 -0
@@ -0,0 +1 @@ +../boot/initrd
arch/arm/boards/crystalfontz-cfa10036/env/init/general +0 -3
@@ -7,6 +7,3 @@ fi # timeout in seconds before the default boot entry is started global.autoboot_timeout=3 - -# default boot entry (one of /env/boot/*) -global.boot.default=mmc-ext3
arch/arm/boards/freescale-mx6-sabrelite/env/boot.d/01 new file +1 -0
@@ -0,0 +1 @@ +../boot/net
arch/arm/boards/freescale-mx6-sabrelite/env/boot.d/02 new file +1 -0
@@ -0,0 +1 @@ +../boot/initrd
arch/arm/boards/pcm038/env/boot.d/01 new file +1 -0
@@ -0,0 +1 @@ +../boot/nand-ubi
arch/arm/boards/pcm038/env/boot.d/02 new file +1 -0
@@ -0,0 +1 @@ +../boot/net
arch/arm/boards/pcm038/env/boot.d/03 new file +1 -0
@@ -0,0 +1 @@ +../boot/initrd
arch/arm/boards/tqma53/env/boot.d/01 new file +1 -0
@@ -0,0 +1 @@ +../boot/net
arch/arm/boards/tqma53/env/boot.d/02 new file +1 -0
@@ -0,0 +1 @@ +../boot/initrd
defaultenv-2/base/bin/boot +45 -6
87 lines not on this page · raw message
defaultenv-2/base/init/general +0 -3
@@ -10,6 +10,3 @@ global.user=sha # timeout in seconds before the default boot entry is started global.autoboot_timeout=3 - -# default boot entry (one of /env/boot/*) -global.boot.default=net
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Re: [PATCH 1/7] globalbar: add inline when not enabled
In reply to Jean-Christophe PLAGNIOL-VILLARDsibject: s/globalbar/globalvar/
Sascha
Quoted 51 lines · Jean-Christophe PLAGNIOL-VILLARD
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>--- include/globalvar.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)include/globalvar.h +20
-0@@ -1,6 +1,7 @@#ifndef __GLOBALVAR_H#define __GLOBALVAR_H +#ifdef CONFIG_GLOBALVAR int globalvar_add_simple (const char *name); int globalvar_add(const char *name,@@ -8,5 +9,24 @@ int globalvar_add(const char *name,const char *(*get)(struct device_d *,struct param_d *p), unsigned long flags);char *globalvar_get_match (const char *match,const char *seperator); +#else +static inline int globalvar_add_simple (const char *name) +{ +return 0 ; +} + +static inline int globalvar_add (const char *name, +int (*set)(struct device_d *dev,struct param_d *p,const char *val), +const char *(*get)(struct device_d *,struct param_d *p), +unsigned long flags) +{ +return 0 ; +} + +static inline char *globalvar_get_match (const char *match,const char *seperator) +{ +return NULL ; +} +#endif #endif /* __GLOBALVAR_H */ Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Signature · 9 lines
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 [email protected] http://lists.infradead.org/mailman/listinfo/barebox