projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge http://git.denx.de/u-boot-samsung
[oweals/u-boot.git]
/
arch
/
powerpc
/
cpu
/
ppc4xx
/
fdt.c
diff --git
a/arch/powerpc/cpu/ppc4xx/fdt.c
b/arch/powerpc/cpu/ppc4xx/fdt.c
index bd905d15863b99ca6c0e81f75bf2d5c69dee514b..c73509b3ee35be1b1c2a619bdb3547ea00b54ee5 100644
(file)
--- a/
arch/powerpc/cpu/ppc4xx/fdt.c
+++ b/
arch/powerpc/cpu/ppc4xx/fdt.c
@@
-11,14
+11,14
@@
#include <asm/cache.h>
#include <asm/ppc4xx.h>
#include <asm/cache.h>
#include <asm/ppc4xx.h>
-#if
defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
+#if
def CONFIG_OF_BOARD_SETUP
#include <libfdt.h>
#include <fdt_support.h>
#include <asm/4xx_pcie.h>
DECLARE_GLOBAL_DATA_PTR;
#include <libfdt.h>
#include <fdt_support.h>
#include <asm/4xx_pcie.h>
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;
{
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));
}
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
/*
* Fixup all PCIe nodes by setting the device_type property
@@
-157,4
+160,4
@@
void ft_cpu_setup(void *blob, bd_t *bd)
*/
fdt_pcie_setup(blob);
}
*/
fdt_pcie_setup(blob);
}
-#endif /* CONFIG_OF_
LIBFDT && CONFIG_OF_
BOARD_SETUP */
+#endif /* CONFIG_OF_BOARD_SETUP */