diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-29 20:13:53 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-05-14 09:16:31 +0200 |
| commit | ee4cab9e587442f95e4fb3442355ca1eb56d9495 (patch) | |
| tree | 5ef83d351e929e8970171dda175b7c1ae9bb49e6 /include | |
| parent | b8c94a15611ce7e191d022a3cd9f3ba23930a9c8 (diff) | |
| download | barebox-ee4cab9e587442f95e4fb3442355ca1eb56d9495.tar.gz barebox-ee4cab9e587442f95e4fb3442355ca1eb56d9495.tar.xz | |
booting: more flexible Linux bootargs generation
We currently use the environment variable 'bootargs' to get the
Linux bootargs. This patch allows for a more flexible bootargs
generation using global variables. With it the Linux bootargs
are concatenated from multiple variables. This allows to replace
parts of the bootargs string without having to reconstruct it
completely.
With this bootargs can be constructed like:
global linux.bootargs.base="console=ttyS0,115200"
global linux.bootargs.ip="ip=dhcp"
global linux.mtdparts="physmap-flash.0:512K(nor0.barebox),-(root)"
This will then automatically be combined into a kernel bootargs
string during boot.
If the 'linux.bootargs.' variables are all empty the old standard
'bootargs' way will be used.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/boot.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/include/boot.h b/include/boot.h index a17bf25a4c..3ce0de125b 100644 --- a/include/boot.h +++ b/include/boot.h @@ -5,6 +5,7 @@ #include <filetype.h> #include <of.h> #include <linux/list.h> +#include <environment.h> struct image_data { /* simplest case. barebox has already loaded the os here */ @@ -71,4 +72,19 @@ static inline int bootm_verbose(struct image_data *data) } #endif +#ifdef CONFIG_FLEXIBLE_BOOTARGS +const char *linux_bootargs_get(void); +int linux_bootargs_overwrite(const char *bootargs); +#else +static inline const char *linux_bootargs_get(void) +{ + return getenv("bootargs"); +} + +static inline int linux_bootargs_overwrite(const char *bootargs) +{ + return setenv("bootargs", bootargs); +} +#endif + #endif /* __BOOT_H */ |