[PATCH v4] sandbox: Remove OF_HOSTFILE

[Simon Glass]

On Tue, 19 Oct 2021 at 08:17, Tom Rini <trini at konsulko.com> wrote:
>
> On Tue, Oct 19, 2021 at 08:03:07AM -0600, Simon Glass wrote:
> > Hi Ilias,
> >
> > On Tue, 19 Oct 2021 at 07:07, Ilias Apalodimas
> > <ilias.apalodimas at linaro.org> 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.apalodimas at linaro.org>
> > > ---
> > > Note that this must be applied on top of
> > > https://lore.kernel.org/u-boot/20211011210016.135929-1-ilias.apalodimas@linaro.org/
> > > changes since v3:
> > > - fix xilinx platforms based on xilinx_zynq_virt_defconfig
> > > changes since v2:
> > > - Rebased on top of the updated OF_BOARD patchset
> > > Changes since v1:
> > > - Added internal error value on board_fdt_blob_setup().  Arguably
> > >   we can just check against NULL and simplify this even more if we
> > >   don't care about the errno
> > > - OF_BOARD is now default for sandbox builds
> > >  Makefile                                    |  6 ++---
> > >  arch/arm/mach-stm32mp/boot_params.c         |  3 ++-
> > >  arch/sandbox/cpu/cpu.c                      | 27 +++++++++++++--------
> > >  arch/sandbox/include/asm/u-boot-sandbox.h   |  8 ------
> > >  board/AndesTech/ax25-ae350/ax25-ae350.c     |  2 ++
> > >  board/Marvell/octeontx/board-fdt.c          |  3 ++-
> > >  board/Marvell/octeontx2/board-fdt.c         |  3 ++-
> > >  board/Marvell/octeontx2/board.c             |  3 ++-
> > >  board/armltd/vexpress64/vexpress64.c        |  7 ++++--
> > >  board/broadcom/bcmstb/bcmstb.c              |  3 ++-
> > >  board/emulation/qemu-arm/qemu-arm.c         |  3 ++-
> > >  board/emulation/qemu-ppce500/qemu-ppce500.c |  3 ++-
> > >  board/emulation/qemu-riscv/qemu-riscv.c     |  3 ++-
> > >  board/highbank/highbank.c                   |  3 ++-
> > >  board/raspberrypi/rpi/rpi.c                 |  8 ++++--
> > >  board/sifive/unleashed/unleashed.c          |  3 ++-
> > >  board/sifive/unmatched/unmatched.c          |  3 ++-
> > >  board/socrates/socrates.c                   |  4 ++-
> > >  board/xen/xenguest_arm64/xenguest_arm64.c   |  7 ++++--
> > >  board/xilinx/common/board.c                 |  3 ++-
> > >  configs/sandbox64_defconfig                 |  1 -
> > >  configs/sandbox_defconfig                   |  1 -
> > >  configs/sandbox_flattree_defconfig          |  1 -
> > >  configs/sandbox_noinst_defconfig            |  1 -
> > >  configs/sandbox_spl_defconfig               |  1 -
> > >  configs/tools-only_defconfig                |  1 -
> > >  doc/develop/devicetree/control.rst          |  7 +++---
> > >  dts/Kconfig                                 | 10 +-------
> > >  include/fdtdec.h                            |  4 ++-
> > >  lib/fdtdec.c                                | 14 +++++------
> > >  scripts/Makefile.spl                        |  4 +--
> > >  31 files changed, 81 insertions(+), 69 deletions(-)
> > >
> >
> > For some reason this still does not apply for me on -master. Can you
> > please confirm the hash you are using?
>
> The hunk for scripts/Makefile.spl still fails (it failed on v3 as well),
> but is easily fixed-up, fwiw.

OK I see.

Reviewed-by: Simon Glass <sjg at chromium.org>

This still has the CONFIG_SANDBOX in Makefile.spl but my OF_BOARD
series can tidy that up.

Regards,
Simon