mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH] pbl: allow #include <pbl.h> from assembly
Date: Mon, 26 Jun 2023 09:07:47 +0200	[thread overview]
Message-ID: <20230626070747.815199-1-a.fatoum@pengutronix.de> (raw)

When compiled with obj-pbl-y, C code can either check #ifdef __PBL__ or
include <pbl.h> and use the IN_PBL macro that's always defined to be
either 0 or 1. Support doing the same from assembly by making the
<pbl.h> safe to include from outside C.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 include/pbl.h | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/include/pbl.h b/include/pbl.h
index 7dc4fa309257..44957f59784e 100644
--- a/include/pbl.h
+++ b/include/pbl.h
@@ -6,6 +6,14 @@
 #ifndef __PBL_H__
 #define __PBL_H__
 
+#ifdef __PBL__
+#define IN_PBL	1
+#else
+#define IN_PBL	0
+#endif
+
+#ifndef __ASSEMBLY__
+
 #include <linux/types.h>
 
 extern unsigned long free_mem_ptr;
@@ -13,12 +21,6 @@ extern unsigned long free_mem_end_ptr;
 
 void pbl_barebox_uncompress(void *dest, void *compressed_start, unsigned int len);
 
-#ifdef __PBL__
-#define IN_PBL	1
-#else
-#define IN_PBL	0
-#endif
-
 void fdt_find_mem(const void *fdt, unsigned long *membase, unsigned long *memsize);
 
 struct fdt_device_id {
@@ -32,5 +34,6 @@ fdt_device_get_match_data(const void *fdt, const char *nodepath,
 
 int pbl_barebox_verify(const void *compressed_start, unsigned int len,
 		       const void *hash, unsigned int hash_len);
+#endif
 
 #endif /* __PBL_H__ */
-- 
2.39.2




             reply	other threads:[~2023-06-26  7:09 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-26  7:07 Ahmad Fatoum [this message]
2023-06-26  9:56 ` 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=20230626070747.815199-1-a.fatoum@pengutronix.de \
    --to=a.fatoum@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