diff options
| author | Simon Glass <sjg@chromium.org> | 2014-10-23 18:58:47 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2014-11-21 04:43:15 +0100 |
| commit | e895a4b06f9062f052d438df7f4766b3decdb3d4 (patch) | |
| tree | ca82de66d4b1a0e6b21b2e360aba83267b45e39a /board/compulab | |
| parent | 4d70b34d7f721d8b1d4d628e68c3a44ab7a10dff (diff) | |
| download | blackbird-obmc-uboot-e895a4b06f9062f052d438df7f4766b3decdb3d4.tar.gz blackbird-obmc-uboot-e895a4b06f9062f052d438df7f4766b3decdb3d4.zip | |
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>
Diffstat (limited to 'board/compulab')
| -rw-r--r-- | board/compulab/cm_fx6/cm_fx6.c | 4 | ||||
| -rw-r--r-- | board/compulab/cm_t54/cm_t54.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c index 0206ae81fc..180e7779d7 100644 --- a/board/compulab/cm_fx6/cm_fx6.c +++ b/board/compulab/cm_fx6/cm_fx6.c @@ -452,7 +452,7 @@ int cm_fx6_setup_ecspi(void) { return 0; } #endif #ifdef CONFIG_OF_BOARD_SETUP -void ft_board_setup(void *blob, bd_t *bd) +int ft_board_setup(void *blob, bd_t *bd) { uint8_t enetaddr[6]; @@ -461,6 +461,8 @@ void ft_board_setup(void *blob, bd_t *bd) fdt_find_and_setprop(blob, "/fec", "local-mac-address", enetaddr, 6, 1); } + + return 0; } #endif diff --git a/board/compulab/cm_t54/cm_t54.c b/board/compulab/cm_t54/cm_t54.c index b1a067d881..2c2530ab3f 100644 --- a/board/compulab/cm_t54/cm_t54.c +++ b/board/compulab/cm_t54/cm_t54.c @@ -121,7 +121,7 @@ int board_mmc_init(bd_t *bis) #ifdef CONFIG_USB_HOST_ETHER -void ft_board_setup(void *blob, bd_t *bd) +int ft_board_setup(void *blob, bd_t *bd) { uint8_t enetaddr[6]; @@ -130,6 +130,8 @@ void ft_board_setup(void *blob, bd_t *bd) fdt_find_and_setprop(blob, "/smsc95xx@0", "mac-address", enetaddr, 6, 1); } + + return 0; } static void generate_mac_addr(uint8_t *enetaddr) |
