diff options
| author | Tom Rini <trini@ti.com> | 2014-11-25 11:08:52 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-26 11:21:14 -0500 |
| commit | 1fc4e6f486cc1e9d2dcf0ba86e6021c3d83dce51 (patch) | |
| tree | 9e96deb4b36a251fab92533bc6e8d7ffb58893eb /arch/powerpc/cpu/ppc4xx/fdt.c | |
| parent | 94092e361cfa9461d746e530ca97d8822f5d23f0 (diff) | |
| parent | 933cdbb479aa87dcb6e3e333c3d1e04b0e7de1ec (diff) | |
| download | blackbird-obmc-uboot-1fc4e6f486cc1e9d2dcf0ba86e6021c3d83dce51.tar.gz blackbird-obmc-uboot-1fc4e6f486cc1e9d2dcf0ba86e6021c3d83dce51.zip | |
Merge git://git.denx.de/u-boot-fdt
Diffstat (limited to 'arch/powerpc/cpu/ppc4xx/fdt.c')
| -rw-r--r-- | arch/powerpc/cpu/ppc4xx/fdt.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/powerpc/cpu/ppc4xx/fdt.c b/arch/powerpc/cpu/ppc4xx/fdt.c index bd905d1586..eef9c5a17f 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 |
