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