fdt: Swap the signature for board_fdt_blob_setup()
This returns a devicetree and updates a parameter with an error code. Swap it, since this fits better with the way U-Boot normally works. It also (more easily) allows leaving the existing pointer unchanged. No yaks were harmed in this change, but there is a very small code-size reduction. For sifive, the OF_BOARD option must be set for the function to be called, so there is no point in checking it again. Also OF_SEPARATE is defined always. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Matthias Brugger <mbrugger@suse.com> Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com> [trini: Update total_compute] Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
@@ -114,15 +114,15 @@ int misc_init_r(void)
|
||||
|
||||
#endif
|
||||
|
||||
void *board_fdt_blob_setup(int *err)
|
||||
int board_fdt_blob_setup(void **fdtp)
|
||||
{
|
||||
*err = 0;
|
||||
if (IS_ENABLED(CONFIG_OF_SEPARATE) || IS_ENABLED(CONFIG_OF_BOARD)) {
|
||||
if (gd->arch.firmware_fdt_addr)
|
||||
return (ulong *)(uintptr_t)gd->arch.firmware_fdt_addr;
|
||||
if (gd->arch.firmware_fdt_addr) {
|
||||
*fdtp = (ulong *)(uintptr_t)gd->arch.firmware_fdt_addr;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
return (ulong *)_end;
|
||||
return -EEXIST;
|
||||
}
|
||||
|
||||
int board_init(void)
|
||||
|
Reference in New Issue
Block a user