diff options
| author | Tom Rini <trini@ti.com> | 2014-11-25 16:08:52 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-26 16:21:14 (GMT) |
| commit | 1fc4e6f486cc1e9d2dcf0ba86e6021c3d83dce51 (patch) | |
| tree | 9e96deb4b36a251fab92533bc6e8d7ffb58893eb /arch | |
| parent | 94092e361cfa9461d746e530ca97d8822f5d23f0 (diff) | |
| parent | 933cdbb479aa87dcb6e3e333c3d1e04b0e7de1ec (diff) | |
| download | u-boot-1fc4e6f486cc1e9d2dcf0ba86e6021c3d83dce51.tar.xz | |
Merge git://git.denx.de/u-boot-fdt
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/nios2/cpu/fdt.c | 8 | ||||
| -rw-r--r-- | arch/powerpc/cpu/ppc4xx/fdt.c | 7 |
2 files changed, 11 insertions, 4 deletions
diff --git a/arch/nios2/cpu/fdt.c b/arch/nios2/cpu/fdt.c index 4d88f16..5024682 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 */ diff --git a/arch/powerpc/cpu/ppc4xx/fdt.c b/arch/powerpc/cpu/ppc4xx/fdt.c index bd905d1..eef9c5a 100644 --- a/arch/powerpc/cpu/ppc4xx/fdt.c +++ b/arch/powerpc/cpu/ppc4xx/fdt.c @@ -18,7 +18,7 @@ DECLARE_GLOBAL_DATA_PTR; -void __ft_board_setup(void *blob, bd_t *bd) +int __ft_board_setup(void *blob, bd_t *bd) { int rc; int i; @@ -60,8 +60,11 @@ void __ft_board_setup(void *blob, bd_t *bd) printf("Unable to update property EBC mappings, err=%s\n", fdt_strerror(rc)); } + + return 0; } -void ft_board_setup(void *blob, bd_t *bd) __attribute__((weak, alias("__ft_board_setup"))); +int ft_board_setup(void *blob, bd_t *bd) + __attribute__((weak, alias("__ft_board_setup"))); /* * Fixup all PCIe nodes by setting the device_type property |