Changes to match 5121 device tree going mainline in 2.6.25.
Change OF_SOC from "soc5121" to plain "soc".
Remove unneeded "ref-frequency" fixups.
Remove "address" enetaddr fixup.
Add bus-frequency fixup for old OF_SOC so old
kernels with old device trees will work with new
u-boot with 66MHz IPS clock
Signed-off-by: John Rigby <[EMAIL PROTECTED]>
---
cpu/mpc512x/cpu.c | 6 +++---
include/configs/ads5121.h | 5 +++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/cpu/mpc512x/cpu.c b/cpu/mpc512x/cpu.c
index 6421a51..bed77ac 100644
--- a/cpu/mpc512x/cpu.c
+++ b/cpu/mpc512x/cpu.c
@@ -138,11 +138,11 @@ void ft_cpu_setup(void *blob, bd_t *bd)
do_fixup_by_path_u32(blob, cpu_path, "timebase-frequency", OF_TBCLK, 1);
do_fixup_by_path_u32(blob, cpu_path, "bus-frequency", bd->bi_busfreq,
1);
- do_fixup_by_path_u32(blob, cpu_path, "ref-frequency",
CFG_MPC512X_CLKIN, 1);
do_fixup_by_path_u32(blob, cpu_path, "clock-frequency", bd->bi_intfreq,
1);
do_fixup_by_path_u32(blob, "/" OF_SOC, "bus-frequency", bd->bi_ipsfreq,
1);
- do_fixup_by_path_u32(blob, "/" OF_SOC, "ref-frequency",
CFG_MPC512X_CLKIN, 1);
- do_fixup_by_path(blob, eth_path, "address", bd->bi_enetaddr, 6, 0);
do_fixup_by_path(blob, eth_path, "local-mac-address", bd->bi_enetaddr,
6, 0);
+
+ /* this is so old kernels with old device trees will boot */
+ do_fixup_by_path_u32(blob, "/" OF_SOC_OLD, "bus-frequency",
bd->bi_ipsfreq, 0);
}
#endif
diff --git a/include/configs/ads5121.h b/include/configs/ads5121.h
index ce458ae..973f348 100644
--- a/include/configs/ads5121.h
+++ b/include/configs/ads5121.h
@@ -415,8 +415,9 @@
#define CONFIG_OF_BOARD_SETUP 1
#define OF_CPU "PowerPC,[EMAIL PROTECTED]"
-#define OF_SOC "[EMAIL PROTECTED]"
+#define OF_SOC "[EMAIL PROTECTED]"
+#define OF_SOC_OLD "[EMAIL PROTECTED]"
#define OF_TBCLK (bd->bi_busfreq / 4)
-#define OF_STDOUT_PATH "/[EMAIL PROTECTED]/[EMAIL PROTECTED]"
+#define OF_STDOUT_PATH "/[EMAIL PROTECTED]/[EMAIL PROTECTED]"
#endif /* __CONFIG_H */
--
1.5.4.rc4.23.gcab31
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
