[U-Boot-Users] [PATCH] Update 5121 fdt support to match latest kernel work.
Based on reviews on the linuxppc-dev mailing list some changes have been made to the device tree. This patch updates u-boot to be in sync with those changes.
Signed-off-by: John Rigby jrigby@freescale.com --- cpu/mpc512x/cpu.c | 2 -- include/configs/ads5121.h | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/cpu/mpc512x/cpu.c b/cpu/mpc512x/cpu.c index 6421a51..793b62a 100644 --- a/cpu/mpc512x/cpu.c +++ b/cpu/mpc512x/cpu.c @@ -138,10 +138,8 @@ 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); } diff --git a/include/configs/ads5121.h b/include/configs/ads5121.h index ce458ae..0a2348e 100644 --- a/include/configs/ads5121.h +++ b/include/configs/ads5121.h @@ -377,7 +377,7 @@ "fdt_addr=FC2C0000\0" \ "ramdisk_addr=FC300000\0" \ "ramdiskfile=ads5121/uRamdisk\0" \ - "fdtfile=ads5121/ads5121.dtb\0" \ + "fdtfile=ads5121/mpc5121ads.dtb\0" \ "u-boot=ads5121/u-boot.bin\0" \ "netdev=eth0\0" \ "consdev=ttyPSC0\0" \ @@ -415,8 +415,8 @@ #define CONFIG_OF_BOARD_SETUP 1
#define OF_CPU "PowerPC,5121@0" -#define OF_SOC "soc5121@80000000" +#define OF_SOC "soc@80000000" #define OF_TBCLK (bd->bi_busfreq / 4) -#define OF_STDOUT_PATH "/soc5121@80000000/serial@11300" +#define OF_STDOUT_PATH "/soc@80000000/serial@11300"
#endif /* __CONFIG_H */
John Rigby wrote:
Based on reviews on the linuxppc-dev mailing list some changes have been made to the device tree. This patch updates u-boot to be in sync with those changes.
Signed-off-by: John Rigby jrigby@freescale.com
cpu/mpc512x/cpu.c | 2 -- include/configs/ads5121.h | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/cpu/mpc512x/cpu.c b/cpu/mpc512x/cpu.c index 6421a51..793b62a 100644 --- a/cpu/mpc512x/cpu.c +++ b/cpu/mpc512x/cpu.c @@ -138,10 +138,8 @@ 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);
[snip]
What about "address" and "local-mac-address"? I cannot find it in device tree, I think you should removed it also.
regards, Grzesiek
address should be removed
local-mac-address will be added to the device tree when I submit an ethernet patch so it should be left in u-boot.
Grzegorz Bernacki wrote:
John Rigby wrote:
Based on reviews on the linuxppc-dev mailing list some changes have been made to the device tree. This patch updates u-boot to be in sync with those changes.
Signed-off-by: John Rigby jrigby@freescale.com
cpu/mpc512x/cpu.c | 2 -- include/configs/ads5121.h | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/cpu/mpc512x/cpu.c b/cpu/mpc512x/cpu.c index 6421a51..793b62a 100644 --- a/cpu/mpc512x/cpu.c +++ b/cpu/mpc512x/cpu.c @@ -138,10 +138,8 @@ 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);
[snip]
What about "address" and "local-mac-address"? I cannot find it in device tree, I think you should removed it also.
regards, Grzesiek
participants (2)
-
Grzegorz Bernacki -
John Rigby