On Tue, 26 Oct 2021 at 00:17, Tom Rini <tr...@konsulko.com> wrote: > > On Tue, Oct 19, 2021 at 04:07:21PM +0300, Ilias Apalodimas wrote: > > > OF_HOSTFILE is used on sandbox configs only. Although it's pretty > > unique and not causing any confusions, we are better of having simpler > > config options for the DTB. > > > > So let's replace that with the existing OF_BOARD. U-Boot would then > > have only three config options for the DTB origin. > > - OF_SEPARATE, build separately from U-Boot > > - OF_BOARD, board specific way of providing the DTB > > - OF_EMBED embedded in the u-boot binary(should not be used in production > > > > Signed-off-by: Ilias Apalodimas <ilias.apalodi...@linaro.org> > > Reviewed-by: Simon Glass <s...@chromium.org> > > > This doesn't build on riscv: > +(ae350_rv64) board/AndesTech/ax25-ae350/ax25-ae350.c:57:7: error: > conflicting types for 'board_fdt_blob_setup'; have 'void *(void)' > +(ae350_rv64) 57 | void *board_fdt_blob_setup(void) > +(ae350_rv64) | ^~~~~~~~~~~~~~~~~~~~ > +(ae350_rv64) In file included from include/asm-generic/global_data.h:23, > +(ae350_rv64) from arch/riscv/include/asm/global_data.h:35, > +(ae350_rv64) from include/init.h:21, > +(ae350_rv64) from > board/AndesTech/ax25-ae350/ax25-ae350.c:10: > +(ae350_rv64) include/fdtdec.h:1164:7: note: previous declaration of > 'board_fdt_blob_setup' with type 'void *(int *)' > +(ae350_rv64) 1164 | void *board_fdt_blob_setup(int *err); > +(ae350_rv64) board/AndesTech/ax25-ae350/ax25-ae350.c: In function > 'board_fdt_blob_setup': > +(ae350_rv64) board/AndesTech/ax25-ae350/ax25-ae350.c:59:10: error: 'err' > undeclared (first use in this function); did you mean 'errno'? > +(ae350_rv64) 59 | *err = 0; > +(ae350_rv64) | ^~~ > +(ae350_rv64) | errno > +(ae350_rv64) board/AndesTech/ax25-ae350/ax25-ae350.c:59:10: note: each > undeclared identifier is reported only once for each function it appears in > +(ae350_rv64) make[2]: *** [scripts/Makefile.build:254: > board/AndesTech/ax25-ae350/ax25-ae350.o] Error 1 > +(ae350_rv64) make[1]: *** [Makefile:1801: board/AndesTech/ax25-ae350] Error 2 > +(ae350_rv64) make: *** [Makefile:177: sub-make] Error 2
Yea I somehow managed to mess up my merges. Apologies for the noise, I'll send a v5 Cheers /Ilias > > -- > Tom
