diff options
| -rw-r--r-- | common/bootargs.c | 4 | ||||
| -rw-r--r-- | include/magicvar.h | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/common/bootargs.c b/common/bootargs.c index b17e6d15ae..60e936da37 100644 --- a/common/bootargs.c +++ b/common/bootargs.c @@ -22,6 +22,7 @@ #include <common.h> #include <boot.h> #include <malloc.h> +#include <magicvar.h> #include <globalvar.h> #include <environment.h> @@ -77,3 +78,6 @@ int linux_bootargs_overwrite(const char *bootargs) return 0; } + +BAREBOX_MAGICVAR_NAMED(global_linux_bootargs_, global.linux.bootargs.*, "Linux bootargs variables"); +BAREBOX_MAGICVAR_NAMED(global_linux_mtdparts_, global.linux.mtdparts.*, "Linux mtdparts variables"); diff --git a/include/magicvar.h b/include/magicvar.h index d27a2e32a3..bb5bd2591f 100644 --- a/include/magicvar.h +++ b/include/magicvar.h @@ -18,14 +18,18 @@ extern struct magicvar __barebox_magicvar_end; #endif #ifdef CONFIG_CMD_MAGICVAR -#define BAREBOX_MAGICVAR(_name, _description) \ +#define BAREBOX_MAGICVAR_NAMED(_name, _varname, _description) \ extern const struct magicvar __barebox_magicvar_##_name; \ const struct magicvar __barebox_magicvar_##_name \ __attribute__ ((unused,section (".barebox_magicvar_" __stringify(_name)))) = { \ - .name = #_name, \ + .name = #_varname, \ .description = MAGICVAR_DESCRIPTION(_description), \ }; + +#define BAREBOX_MAGICVAR(_name, _description) \ + BAREBOX_MAGICVAR_NAMED(_name, _name, _description) #else +#define BAREBOX_MAGICVAR_NAMED(_name, _varname, _description) #define BAREBOX_MAGICVAR(_name, _description) #endif |