Update 5121 fdt support to match latest kernel work.
PATCH 1/1 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.
--- cpu/mpc512x/cpu.c | 2 -- include/configs/ads5121.h | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-)
cpu/mpc512x/cpu.c +0 -2
@@ -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 ); }
include/configs/ads5121.h +3 -3
@@ -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 at 0" -#define OF_SOC "soc5121 at 80000000" +#define OF_SOC "soc at 80000000"#define OF_TBCLK (bd->bi_busfreq / 4) -#define OF_STDOUT_PATH "/soc5121 at 80000000/serial at 11300" +#define OF_STDOUT_PATH "/soc at 80000000/serial at 11300"#endif /* __CONFIG_H */
Signature · 1 line
1.5.3.5.726.g41a7a
PATCH 1/1 Update 5121 fdt support to match latest kernel work.
Quoted 16 lines · John Rigby
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 <[email protected]>--- cpu/mpc512x/cpu.c | 2 -- include/configs/ads5121.h | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-)cpu/mpc512x/cpu.c +0
-0
cpu/mpc512x/cpu.c void ft_cpu_setup(void *blob, bd_t *bd) · line 144
Quoted 9 lines
cpu/mpc512x/cpu.c +0
-2@@ -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
PATCH 1/1 Update 5121 fdt support to match latest kernel work.
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.
Quoted 36 lines · Grzegorz Bernacki
Quoted 16 lines · John Rigby
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 <[email protected]>--- cpu/mpc512x/cpu.c | 2 -- include/configs/ads5121.h | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-)cpu/mpc512x/cpu.c +0
-0cpu/mpc512x/cpu.c void ft_cpu_setup(void *blob, bd_t *bd) · line 145
Quoted 10 lines
cpu/mpc512x/cpu.c +0
-2@@ -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