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 /arch/nios2 | |
| 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 'arch/nios2')
| -rw-r--r-- | arch/nios2/cpu/fdt.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/nios2/cpu/fdt.c b/arch/nios2/cpu/fdt.c index 4d88f169df..5024682088 100644 --- a/arch/nios2/cpu/fdt.c +++ b/arch/nios2/cpu/fdt.c @@ -18,11 +18,13 @@ DECLARE_GLOBAL_DATA_PTR; -void __ft_board_setup(void *blob, bd_t *bd) +int __ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); + + return 0; } -void ft_board_setup(void *blob, bd_t *bd) \ +int ft_board_setup(void *blob, bd_t *bd) __attribute__((weak, alias("__ft_board_setup"))); void ft_cpu_setup(void *blob, bd_t *bd) @@ -32,5 +34,7 @@ void ft_cpu_setup(void *blob, bd_t *bd) * Note: aliases in the dts are required for this */ fdt_fixup_ethernet(blob); + + return 0; } #endif /* CONFIG_OF_LIBFDT && CONFIG_OF_BOARD_SETUP */ |
