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 branch 'u-boot-imx/master' into 'u-boot-arm/master'
[oweals/u-boot.git]
/
arch
/
powerpc
/
cpu
/
mpc86xx
/
fdt.c
diff --git
a/arch/powerpc/cpu/mpc86xx/fdt.c
b/arch/powerpc/cpu/mpc86xx/fdt.c
index ff89ee554c4125cef0f3012f363806429d6cb1c5..26a65c586d5da49ca1f3437594e2ee9a7489f7d2 100644
(file)
--- a/
arch/powerpc/cpu/mpc86xx/fdt.c
+++ b/
arch/powerpc/cpu/mpc86xx/fdt.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 2008,
2010
Freescale Semiconductor, Inc.
+ * Copyright 2008,
2011
Freescale Semiconductor, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@
-14,12
+14,13
@@
DECLARE_GLOBAL_DATA_PTR;
extern void ft_fixup_num_cores(void *blob);
DECLARE_GLOBAL_DATA_PTR;
extern void ft_fixup_num_cores(void *blob);
+extern void ft_srio_setup(void *blob);
void ft_cpu_setup(void *blob, bd_t *bd)
{
#ifdef CONFIG_MP
int off;
void ft_cpu_setup(void *blob, bd_t *bd)
{
#ifdef CONFIG_MP
int off;
- u32 bootpg = determine_mp_bootpg();
+ u32 bootpg = determine_mp_bootpg(
NULL
);
#endif
do_fixup_by_prop_u32(blob, "device_type", "cpu", 4,
#endif
do_fixup_by_prop_u32(blob, "device_type", "cpu", 4,
@@
-33,10
+34,10
@@
void ft_cpu_setup(void *blob, bd_t *bd)
#if defined(CONFIG_MPC8641)
do_fixup_by_compat_u32(blob, "fsl,mpc8641-localbus",
#if defined(CONFIG_MPC8641)
do_fixup_by_compat_u32(blob, "fsl,mpc8641-localbus",
- "bus-frequency", gd->lbc_clk, 1);
+ "bus-frequency", gd->
arch.
lbc_clk, 1);
#endif
do_fixup_by_compat_u32(blob, "fsl,elbc",
#endif
do_fixup_by_compat_u32(blob, "fsl,elbc",
- "bus-frequency", gd->lbc_clk, 1);
+ "bus-frequency", gd->
arch.
lbc_clk, 1);
fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);
fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);
@@
-58,4
+59,8
@@
void ft_cpu_setup(void *blob, bd_t *bd)
ft_fixup_num_cores(blob);
#endif
ft_fixup_num_cores(blob);
#endif
+
+#ifdef CONFIG_SYS_SRIO
+ ft_srio_setup(blob);
+#endif
}
}