Building without CONFIG_RISCV_EXCEPTIONS causes a compile error, because of a definition mismatch. data_abort_mask is a no-op without exception support, but interrupt.c defines it as a different type of symbol. Skip interrupt.c compilation to fix the build error. Reported-by: Yann Sionneau <ysionneau@kalray.eu> Signed-off-by: Ahmad Fatoum <ahmad@a3f.at> --- arch/riscv/cpu/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/riscv/cpu/Makefile b/arch/riscv/cpu/Makefile index 717baaaaa727..d79bafc6f142 100644 --- a/arch/riscv/cpu/Makefile +++ b/arch/riscv/cpu/Makefile @@ -2,6 +2,8 @@ obj-y += core.o time.o obj-$(CONFIG_HAS_DMA) += dma.o +ifeq ($(CONFIG_RISCV_EXCEPTIONS),y) obj-pbl-$(CONFIG_RISCV_M_MODE) += mtrap.o obj-pbl-$(CONFIG_RISCV_S_MODE) += strap.o obj-pbl-y += interrupts.o +endif -- 2.33.0 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
On Sat, Dec 04, 2021 at 02:08:54PM +0100, Ahmad Fatoum wrote: > Building without CONFIG_RISCV_EXCEPTIONS causes a compile error, because > of a definition mismatch. data_abort_mask is a no-op without exception > support, but interrupt.c defines it as a different type of symbol. Skip > interrupt.c compilation to fix the build error. > > Reported-by: Yann Sionneau <ysionneau@kalray.eu> > Signed-off-by: Ahmad Fatoum <ahmad@a3f.at> > --- > arch/riscv/cpu/Makefile | 2 ++ > 1 file changed, 2 insertions(+) Applied, thanks Sascha > > diff --git a/arch/riscv/cpu/Makefile b/arch/riscv/cpu/Makefile > index 717baaaaa727..d79bafc6f142 100644 > --- a/arch/riscv/cpu/Makefile > +++ b/arch/riscv/cpu/Makefile > @@ -2,6 +2,8 @@ > > obj-y += core.o time.o > obj-$(CONFIG_HAS_DMA) += dma.o > +ifeq ($(CONFIG_RISCV_EXCEPTIONS),y) > obj-pbl-$(CONFIG_RISCV_M_MODE) += mtrap.o > obj-pbl-$(CONFIG_RISCV_S_MODE) += strap.o > obj-pbl-y += interrupts.o > +endif > -- > 2.33.0 > > > _______________________________________________ > barebox mailing list > barebox@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/barebox > -- 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
Hello Sascha, On 07.12.21 10:06, Sascha Hauer wrote: > On Sat, Dec 04, 2021 at 02:08:54PM +0100, Ahmad Fatoum wrote: >> Building without CONFIG_RISCV_EXCEPTIONS causes a compile error, because >> of a definition mismatch. data_abort_mask is a no-op without exception >> support, but interrupt.c defines it as a different type of symbol. Skip >> interrupt.c compilation to fix the build error. I don't find this patch in either master or next. Can you push it? Thanks, Ahmad >> >> Reported-by: Yann Sionneau <ysionneau@kalray.eu> >> Signed-off-by: Ahmad Fatoum <ahmad@a3f.at> >> --- >> arch/riscv/cpu/Makefile | 2 ++ >> 1 file changed, 2 insertions(+) > > Applied, thanks > > Sascha > >> >> diff --git a/arch/riscv/cpu/Makefile b/arch/riscv/cpu/Makefile >> index 717baaaaa727..d79bafc6f142 100644 >> --- a/arch/riscv/cpu/Makefile >> +++ b/arch/riscv/cpu/Makefile >> @@ -2,6 +2,8 @@ >> >> obj-y += core.o time.o >> obj-$(CONFIG_HAS_DMA) += dma.o >> +ifeq ($(CONFIG_RISCV_EXCEPTIONS),y) >> obj-pbl-$(CONFIG_RISCV_M_MODE) += mtrap.o >> obj-pbl-$(CONFIG_RISCV_S_MODE) += strap.o >> obj-pbl-y += interrupts.o >> +endif >> -- >> 2.33.0 >> >> >> _______________________________________________ >> barebox mailing list >> barebox@lists.infradead.org >> http://lists.infradead.org/mailman/listinfo/barebox >> > -- 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