From e58f05ae2add56dec9ffdb3a6179d4345880551a Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 14 May 2012 22:55:25 +0200 Subject: magicvar: Add magicvar macro with additional name argument Currently magicvar fails on variables containing a '.' because we can't use these as C names. Overcome this by adding a new macro which allows to specify a name seperately. Signed-off-by: Sascha Hauer --- include/magicvar.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'include') 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 -- cgit v1.2.3