From 328a340392a5df9aaf00792be989df73e750859e Mon Sep 17 00:00:00 2001
From: Stefan Roese <sr@denx.de>
Date: Tue, 18 Dec 2007 08:44:51 +0100
Subject: [PATCH] ppc4xx: fdt: Cleanup setup of cpu node setup
Now the cpu node setup ("timebase-frequency" and "clock-frequency") is
without using the absolute path to the cpu node. This makes it possible
to use this U-Boot version with both versions of cpu-node naming
"cpu@0" and the former "PowerPC,440EPx@0".
Signed-off-by: Stefan Roese <sr@denx.de>
---
cpu/ppc4xx/fdt.c | 7 ++++---
include/configs/kilauea.h | 1 -
include/configs/sequoia.h | 1 -
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/cpu/ppc4xx/fdt.c b/cpu/ppc4xx/fdt.c
index f351b8bf3c..afcb974068 100644
--- a/cpu/ppc4xx/fdt.c
+++ b/cpu/ppc4xx/fdt.c
@@ -36,13 +36,14 @@ DECLARE_GLOBAL_DATA_PTR;
void ft_cpu_setup(void *blob, bd_t *bd)
{
- char *cpu_path = "/cpus/" OF_CPU;
sys_info_t sys_info;
get_sys_info(&sys_info);
- do_fixup_by_path_u32(blob, cpu_path, "timebase-frequency", bd->bi_intfreq, 1);
- do_fixup_by_path_u32(blob, cpu_path, "clock-frequency", bd->bi_intfreq, 1);
+ do_fixup_by_prop_u32(blob, "device_type", "cpu", 4, "timebase-frequency",
+ bd->bi_intfreq, 1);
+ do_fixup_by_prop_u32(blob, "device_type", "cpu", 4, "clock-frequency",
+ bd->bi_intfreq, 1);
do_fixup_by_path_u32(blob, "/plb", "clock-frequency", sys_info.freqPLB, 1);
do_fixup_by_path_u32(blob, "/plb/opb", "clock-frequency", sys_info.freqOPB, 1);
do_fixup_by_path_u32(blob, "/plb/opb/ebc", "clock-frequency",
diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h
index bec9fde73a..f3e8601d85 100644
--- a/include/configs/kilauea.h
+++ b/include/configs/kilauea.h
@@ -519,6 +519,5 @@
/* pass open firmware flat tree */
#define CONFIG_OF_LIBFDT 1
#define CONFIG_OF_BOARD_SETUP 1
-#define OF_CPU "cpu@0"
#endif /* __CONFIG_H */
diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h
index 419ee73349..48a64e3fd8 100644
--- a/include/configs/sequoia.h
+++ b/include/configs/sequoia.h
@@ -492,6 +492,5 @@
/* pass open firmware flat tree */
#define CONFIG_OF_LIBFDT 1
#define CONFIG_OF_BOARD_SETUP 1
-#define OF_CPU "cpu@0"
#endif /* __CONFIG_H */
--
2.39.5