From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 1/3] magicvar: Use __UNIQUE_ID to generate name
Date: Thu, 1 Oct 2020 10:07:06 +0200 [thread overview]
Message-ID: <20201001080708.636-1-s.hauer@pengutronix.de> (raw)
BAREBOX_MAGICVAR_NAME only exists to generate a unique identifier. We can
generate that using __UNIQUE_ID. With this we can convert users from
BAREBOX_MAGICVAR_NAME to the simpler BAREBOX_MAGICVAR macro.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
include/magicvar.h | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/include/magicvar.h b/include/magicvar.h
index 9fb89a84cc..bad9b0dee5 100644
--- a/include/magicvar.h
+++ b/include/magicvar.h
@@ -19,16 +19,18 @@ 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 \
+#define __BAREBOX_MAGICVAR_NAMED(_name, _varname, _description) \
+static const struct magicvar _name \
__attribute__ ((unused,section (".barebox_magicvar_" __stringify(_name)))) = { \
.name = #_varname, \
.description = MAGICVAR_DESCRIPTION(_description), \
};
+#define BAREBOX_MAGICVAR_NAMED(_name, _varname, _description) \
+ __BAREBOX_MAGICVAR_NAMED(__barebox_magicvar_##_name, _varname, _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)
--
2.28.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2020-10-01 8:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-01 8:07 Sascha Hauer [this message]
2020-10-01 8:07 ` [PATCH 2/3] magicvar: Replace BAREBOX_MAGICVAR_NAMED with BAREBOX_MAGICVAR Sascha Hauer
2020-10-01 8:07 ` [PATCH 3/3] magicvar: retire BAREBOX_MAGICVAR_NAMED Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201001080708.636-1-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox