From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 26 Jun 2023 09:09:36 +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 1qDgLw-004CAZ-4U for lore@lore.pengutronix.de; Mon, 26 Jun 2023 09:09:36 +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 1qDgLt-0001m7-Fe for lore@pengutronix.de; Mon, 26 Jun 2023 09:09:33 +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:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=frsJ5BFOhy/jjknDevQ9ugwJ0A5d2IHy83Ua1vw3r8E=; b=nv5kk9jS9yCt+BU+wmrSQ6Cip/ TzIUSK3QY28ZGAszAgNInnVguPe+UyMLPe1yvzOeDLKz6BHwChQHKf4CT3mRq+tPb8ypk9bugxx6j M575v7xwf6+3xD0MbWvRyzyXm1pd3SjiCJyVA9JBLsAuxR8dWIy0buE2JxGBY6FTzswy2OmNqhOze fWk5IJ0FNcLC2rX12EZRv4Yx7bddOzPbp3fewZL2z9pCR6w0CiYaoMST2DkHQXMHqTzVxwc6GJrAk Dl0gKFoMhiFDgTxKr4zxx8Zwkn9DslthjUeWZXGjRAELl4ZXEcWE57J99g0p+MhWItSQBnCQqwLfy yXN5OqDw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qDgKQ-009XZW-00; Mon, 26 Jun 2023 07:08:02 +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 1qDgKM-009XYi-1o for barebox@lists.infradead.org; Mon, 26 Jun 2023 07:08:00 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qDgKF-0001aU-3t; Mon, 26 Jun 2023 09:07:51 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1qDgKE-00A8uJ-Cn; Mon, 26 Jun 2023 09:07:50 +0200 Received: from afa by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1qDgKD-003Q4e-2n; Mon, 26 Jun 2023 09:07:49 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Mon, 26 Jun 2023 09:07:47 +0200 Message-Id: <20230626070747.815199-1-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230626_000758_616498_415C76F9 X-CRM114-Status: UNSURE ( 9.91 ) X-CRM114-Notice: Please train this message. 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.9 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: [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) 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(-) 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