On Mon, May 03, 2021 at 01:39:59PM +0200, Ahmad Fatoum wrote: > Hello Sascha, > > On 03.05.21 13:33, Sascha Hauer wrote: > > Hi Ahmad, > > > > This patch doesn't apply, I think there's something wrong with it. > > > > On Tue, Apr 27, 2021 at 10:23:01PM +0200, Ahmad Fatoum wrote: > >> -config MACH_ERIZO > >> - bool "erizo family" > >> - select ARCH_RV32I > >> - select HAS_DEBUG_LL > >> - select HAS_NMON > >> - select USE_COMPRESSED_DTB > >> - select RISCV_M_MODE > >> - select RISCV_TIMER > >> - > >> -config MACH_VIRT > >> - bool "virt family" > >> - select BOARD_RISCV_GENERIC_DT > >> - select CLINT_TIMER > >> - help > >> - Generates an image tht can be be booted by QEMU. The image is called > >> - barebox-dt-2nd.img > > > > This drops MACH_ERIZO and MACH_VIRT in favour of: > > > >> +config SOC_ERIZO > >> + bool "Erizo SoC" > >> + select ARCH_RV32I > >> + select HAS_DEBUG_LL > >> + select HAS_NMON > >> + select USE_COMPRESSED_DTB > >> + select RISCV_M_MODE > >> + select RISCV_TIMER > >> + > >> +config SOC_VIRT > >> + bool "QEMU Virt Machine" > >> + select BOARD_RISCV_GENERIC_DT > >> + select CLINT_TIMER > >> + help > >> + Generates an image tht can be be booted by QEMU. The image is called > >> + barebox-dt-2nd.img > > > >> @@ -19,7 +19,7 @@ LDFLAGS_pbl += $(riscv-ldflags-y) > >> cflags-y += $(riscv-cflags-y) > >> LDFLAGS_barebox += -nostdlib > >> > >> -machine-$(CONFIG_MACH_ERIZO) := erizo > >> +machine-$(CONFIG_SOC_ERIZO) := erizo > > > > for CONFIG_*_ERIZO this is changed here as well, but here the file has: > > > > machine-$(CONFIG_MACH_ERIZO) := erizo > > machine-$(CONFIG_MACH_VIRT) := virt > > > > I think CONFIG_MACH_VIRT should be replaced here as well. I could fix > > the obvious, but I am not sure how this happened and if this is the only > > mistake here, so not applying this. Please resend. > > Sorry, I should have noted that this applied on top of the earlier RISC-V > patches: > > https://lore.barebox.org/barebox/20210410110638.2106658-1-ahmad@xxxxxx/ Ok, applied that one first. 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@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
