mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH master] RISC-V: nmon: fix SiFive DEBUG_LL build
@ 2021-11-29  6:41 Ahmad Fatoum
  2021-11-30 10:27 ` Sascha Hauer
  0 siblings, 1 reply; 2+ messages in thread
From: Ahmad Fatoum @ 2021-11-29  6:41 UTC (permalink / raw)
  To: barebox; +Cc: Ahmad Fatoum

nmon includes <debug_ll.h> in assembly source, so add __ASSEMBLY__
guards, so the build doesn't fail.

Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
 arch/riscv/include/asm/debug_ll.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/riscv/include/asm/debug_ll.h b/arch/riscv/include/asm/debug_ll.h
index d01b4f09b8e1..867c96d79724 100644
--- a/arch/riscv/include/asm/debug_ll.h
+++ b/arch/riscv/include/asm/debug_ll.h
@@ -36,7 +36,7 @@
 
 #include <asm/debug_ll_ns16550.h>
 
-#elif defined CONFIG_DEBUG_SIFIVE
+#elif defined CONFIG_DEBUG_SIFIVE && !defined __ASSEMBLY__
 
 #include <io.h>
 
-- 
2.33.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH master] RISC-V: nmon: fix SiFive DEBUG_LL build
  2021-11-29  6:41 [PATCH master] RISC-V: nmon: fix SiFive DEBUG_LL build Ahmad Fatoum
@ 2021-11-30 10:27 ` Sascha Hauer
  0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2021-11-30 10:27 UTC (permalink / raw)
  To: Ahmad Fatoum; +Cc: barebox

On Mon, Nov 29, 2021 at 07:41:17AM +0100, Ahmad Fatoum wrote:
> nmon includes <debug_ll.h> in assembly source, so add __ASSEMBLY__
> guards, so the build doesn't fail.
> 
> Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
> ---
>  arch/riscv/include/asm/debug_ll.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks

Sascha


-- 
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 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-11-30 10:32 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-29  6:41 [PATCH master] RISC-V: nmon: fix SiFive DEBUG_LL build Ahmad Fatoum
2021-11-30 10:27 ` Sascha Hauer

mail archive of the barebox mailing list

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://lore.barebox.org/barebox/0 barebox/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 barebox barebox/ https://lore.barebox.org/barebox \
		barebox@lists.infradead.org barebox@lists.infradead.org
	public-inbox-index barebox

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git