diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-05-15 20:34:34 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-05-15 20:34:34 +0200 |
commit | 3f66e8dc57d0dd05e22d321786da39810ba6b7ff (patch) | |
tree | 0e3f62a46c2fb05f50f73d7575ff1fff3688e520 /include | |
parent | cff2d83a86a83d8cd0535e0c8edd364f91039270 (diff) | |
parent | 69ee684695209036e0e134324a1c310efbd4b46d (diff) | |
download | barebox-3f66e8dc57d0dd05e22d321786da39810ba6b7ff.tar.gz barebox-3f66e8dc57d0dd05e22d321786da39810ba6b7ff.tar.xz |
Merge branch 'pu/magicvar' into next
Diffstat (limited to 'include')
-rw-r--r-- | include/magicvar.h | 8 |
1 files changed, 6 insertions, 2 deletions
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 |