From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 26 Jun 2023 11:58:11 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qDiz7-004Kb6-4c for lore@lore.pengutronix.de; Mon, 26 Jun 2023 11:58:11 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qDiz4-0006Px-D8 for lore@pengutronix.de; Mon, 26 Jun 2023 11:58:10 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:From:In-Reply-To: Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=DCAVu6+FnfoQiy/JEumfDlox6nFnDXtBlHnKSvPj0gU=; b=Z8KOZwUMoaX3mvrlKrvRC2lHGZ JUNKxmAHnrx7fqf/VfcN7SCaMjZLAj5pBUw2UFUWNo/g3on+bh2DN1+uyCPux5LCHeRnVd2CPQrJJ GAkYW6XcEp6MXZqi9tnExa7Col44yFhdHZVBW+Y3FanUkpcKwv84L1sJdEJhz6nTaVIrXD2iXgbpU fIMjBiKr5Pi9xYO4YQ8B9BukSCyng6u5aZjaLjEj16iif27PG5SVP4k69Ko2/jvWWVKSrOhQzZFAf MA7eEBuEXRR+fpUMxxuccfur66OWcaGUEefZb9iQex7cmTk5Z6CZuT4j0pGmB9Q5krvQBAUyNdVCV WXdw4l5g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qDixz-009mvM-1C; Mon, 26 Jun 2023 09:57:03 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qDixv-009mul-3A for barebox@lists.infradead.org; Mon, 26 Jun 2023 09:57:01 +0000 Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qDixu-0006Em-CS; Mon, 26 Jun 2023 11:56:58 +0200 Received: from sha by ptx.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1qDixu-0003mo-5Y; Mon, 26 Jun 2023 11:56:58 +0200 Date: Mon, 26 Jun 2023 11:56:58 +0200 To: Ahmad Fatoum Cc: barebox@lists.infradead.org Message-ID: <20230626095658.GV18491@pengutronix.de> References: <20230626070747.815199-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230626070747.815199-1-a.fatoum@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain User-Agent: Mutt/1.10.1 (2018-07-13) From: Sascha Hauer X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230626_025700_016518_2CACC12C X-CRM114-Status: GOOD ( 21.99 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.7 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH] pbl: allow #include from assembly X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) On Mon, Jun 26, 2023 at 09:07:47AM +0200, Ahmad Fatoum wrote: > When compiled with obj-pbl-y, C code can either check #ifdef __PBL__ or > include 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 > safe to include from outside C. > > Signed-off-by: Ahmad Fatoum > --- > include/pbl.h | 15 +++++++++------ > 1 file changed, 9 insertions(+), 6 deletions(-) Applied, thanks Sascha > > 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 > > 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 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |