diff options
| author | Ilias Apalodimas <ilias.apalodimas@linaro.org> | 2021-10-26 09:12:33 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-10-27 16:38:26 -0400 |
| commit | e7fb789612e39653f9f20ad08ad40896c7f61742 (patch) | |
| tree | 2a16e7d6ebd67449b5c0fca8f7841d879564889f /board/Marvell | |
| parent | 670d657dfb6ede2957043dd0ac868297ac093857 (diff) | |
| download | u-boot-e7fb789612e39653f9f20ad08ad40896c7f61742.zip u-boot-e7fb789612e39653f9f20ad08ad40896c7f61742.tar.gz u-boot-e7fb789612e39653f9f20ad08ad40896c7f61742.tar.bz2 | |
sandbox: Remove OF_HOSTFILEWIP/27Oct2021
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@linaro.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'board/Marvell')
| -rw-r--r-- | board/Marvell/octeontx/board-fdt.c | 3 | ||||
| -rw-r--r-- | board/Marvell/octeontx2/board-fdt.c | 3 | ||||
| -rw-r--r-- | board/Marvell/octeontx2/board.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/board/Marvell/octeontx/board-fdt.c b/board/Marvell/octeontx/board-fdt.c index 1db2a4a..e989c37 100644 --- a/board/Marvell/octeontx/board-fdt.c +++ b/board/Marvell/octeontx/board-fdt.c @@ -301,7 +301,8 @@ int ft_board_setup(void *blob, struct bd_info *bd) * * @return FDT base address received from ATF in x1 register */ -void *board_fdt_blob_setup(void) +void *board_fdt_blob_setup(int *err) { + *err = 0; return (void *)fdt_base_addr; } diff --git a/board/Marvell/octeontx2/board-fdt.c b/board/Marvell/octeontx2/board-fdt.c index a4771af..e2cfe01 100644 --- a/board/Marvell/octeontx2/board-fdt.c +++ b/board/Marvell/octeontx2/board-fdt.c @@ -215,7 +215,8 @@ int ft_board_setup(void *blob, struct bd_info *bd) * * @return FDT base address received from ATF in x1 register */ -void *board_fdt_blob_setup(void) +void *board_fdt_blob_setup(int *err) { + *err = 0; return (void *)fdt_base_addr; } diff --git a/board/Marvell/octeontx2/board.c b/board/Marvell/octeontx2/board.c index 4e8cb83..63aa2d6 100644 --- a/board/Marvell/octeontx2/board.c +++ b/board/Marvell/octeontx2/board.c @@ -226,12 +226,13 @@ static int do_go_uboot(struct cmd_tbl *cmdtp, int flag, int argc, uboot_entry_t entry; ulong addr; void *fdt; + int err; if (argc < 2) return CMD_RET_USAGE; addr = hextoul(argv[1], NULL); - fdt = board_fdt_blob_setup(); + fdt = board_fdt_blob_setup(&err); entry = (uboot_entry_t)addr; flush_cache((ulong)addr, 1 << 20); /* 1MiB should be enough */ dcache_disable(); |