diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-07 10:01:20 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-07 10:02:38 +0200 |
| commit | 764941b17e53e40dd1df1ac3137ebc825d5d6480 (patch) | |
| tree | 845a9c567691ddfac0c46493f2f50fe61e1e728e /include | |
| parent | bc4ac257257c340b108499e65ed7ac383306b2b8 (diff) | |
| parent | 8a7822a8d6659a1132f668dcc20328a1e646f00e (diff) | |
| download | barebox-764941b17e53e40dd1df1ac3137ebc825d5d6480.tar.gz barebox-764941b17e53e40dd1df1ac3137ebc825d5d6480.tar.xz | |
Merge branch 'for-next/magicvar-unique-id' into for-next/reboot-mode
Diffstat (limited to 'include')
| -rw-r--r-- | include/magicvar.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/magicvar.h b/include/magicvar.h index 9fb89a84cc..31292611bb 100644 --- a/include/magicvar.h +++ b/include/magicvar.h @@ -19,18 +19,16 @@ extern struct magicvar __barebox_magicvar_end; #endif #ifdef CONFIG_CMD_MAGICVAR -#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)))) = { \ +#define __BAREBOX_MAGICVAR_NAMED(_name, _varname, _description) \ +static const struct magicvar _name \ + __attribute__ ((used,section (".barebox_magicvar_" __stringify(_name)))) = { \ .name = #_varname, \ .description = MAGICVAR_DESCRIPTION(_description), \ }; #define BAREBOX_MAGICVAR(_name, _description) \ - BAREBOX_MAGICVAR_NAMED(_name, _name, _description) + __BAREBOX_MAGICVAR_NAMED(__UNIQUE_ID(magicvar), _name, _description) #else -#define BAREBOX_MAGICVAR_NAMED(_name, _varname, _description) #define BAREBOX_MAGICVAR(_name, _description) #endif |