fdt: Allow ft_board_setup() to report failure
This function can fail if the device tree runs out of space. Rather than silently booting with an incomplete device tree, allow the failure to be detected. Unfortunately this involves changing a lot of places in the code. I have not changed behvaiour to return an error where one is not currently returned, to avoid unexpected breakage. Eventually it would be nice to allow boards to register functions to be called to update the device tree. This would avoid all the many functions to do this. However it's not clear yet if this should be done using driver model or with a linker list. This work is left for later. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Anatolij Gustschin <agust@denx.de>
This commit is contained in:
@@ -454,7 +454,7 @@ int update_flash_size (int flash_size)
|
||||
}
|
||||
#endif /* defined(CONFIG_SYS_UPDATE_FLASH_SIZE) */
|
||||
|
||||
void ft_board_setup(void *blob, bd_t *bd)
|
||||
int ft_board_setup(void *blob, bd_t *bd)
|
||||
{
|
||||
int phy_addr = CONFIG_PHY_ADDR;
|
||||
char eth_path[] = "/soc5200@f0000000/mdio@3000/ethernet-phy@0";
|
||||
@@ -478,5 +478,7 @@ void ft_board_setup(void *blob, bd_t *bd)
|
||||
#endif
|
||||
/* fix up the phy address */
|
||||
do_fixup_by_path(blob, eth_path, "reg", &phy_addr, sizeof(int), 0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
|
||||
|
||||
Reference in New Issue
Block a user