Convert mpc7448hpc2 to CONFIG_OF_LIBFDT
PATCH 1/3 Convert mpc7448hpc2 to CONFIG_OF_LIBFDT
This was configured to use the deprecated CONFIG_OF_FLAT_TREE, change to CONFIG_OF_LIBFDT.
WARNING: This conversion was untested because I do not have a board to test it on.
NOTE: The FDT blob (DTS) must have an /aliases/ethernet0 and (optionally) /aliases/ethernet1 property for the ethernet to work.
Signed-off-by Gerald Van Baren <[email protected]>
--- board/freescale/mpc7448hpc2/mpc7448hpc2.c | 9 +++++++ cpu/74xx_7xx/cpu.c | 35 ++++++++++++---------------- include/configs/mpc7448hpc2.h | 2 +- 3 files changed, 25 insertions(+), 21 deletions(-)
board/freescale/mpc7448hpc2/mpc7448hpc2.c +9 -0
@@ -105,3 +105,12 @@ ft_board_setup (void *blob, bd_t *bd) } }#endif + +#if defined(CONFIG_OF_BOARD_SETUP ) +void +ft_board_setup (void *blob,bd_t *bd) +{ +ft_cpu_setup (blob, bd); +fdt_fixup_memory (blob, (u64 )bd->bi_memstart, (u64 )bd->bi_memsize); +} +#endif
cpu/74xx_7xx/cpu.c +15 -20
@@ -44,6 +44,11 @@#include <74xx_7xx.h> #include <asm/cache.h> +#if defined(CONFIG_OF_LIBFDT ) +#include <libfdt.h> +#include <fdt_support.h> +#endif +#if defined(CONFIG_OF_FLAT_TREE )#include <ft_build.h> #endif
@@ -301,29 +306,19 @@ watchdog_reset(void)/* ------------------------------------------------------------------------- */ -#ifdef CONFIG_OF_FLAT_TREE -void -ft_cpu_setup (void *blob,bd_t *bd) +#ifdef CONFIG_OF_LIBFDT +void ft_cpu_setup (void *blob,bd_t *bd) { -u32 *p; -ulong clock; -int len; - - clock = bd->bi_busfreq; +do_fixup_by_prop_u32 (blob,"device_type" ,"cpu" ,4 , +"timebase-frequency" , bd->bi_busfreq /4 ,1 ); +do_fixup_by_prop_u32 (blob,"device_type" ,"cpu" ,4 , +"bus-frequency" , bd->bi_busfreq,1 ); +do_fixup_by_prop_u32 (blob,"device_type" ,"cpu" ,4 , +"clock-frequency" , bd->bi_intfreq,1 ); - p =ft_get_prop (blob,"/cpus/" OF_CPU "/bus-frequency" , &len); -if (p !=NULL ) - *p =cpu_to_be32 (clock); +fdt_fixup_memory (blob, (u64 )bd->bi_memstart, (u64 )bd->bi_memsize); -#if defined(CONFIG_TSI108_ETH ) - p =ft_get_prop (blob,"/" OF_TSI "/ethernet at 6200/address" , &len); -memcpy (p, bd->bi_enetaddr,6 ); -#endif - -#if defined(CONFIG_HAS_ETH1 ) - p =ft_get_prop (blob,"/" OF_TSI "/ethernet at 6600/address" , &len); -memcpy (p, bd->bi_enet1addr,6 ); -#endif +fdt_fixup_ethernet (blob, bd); }#endif /* ------------------------------------------------------------------------- */
include/configs/mpc7448hpc2.h +1 -1
@@ -75,7 +75,7 @@#define CFG_PROMPT_HUSH_PS2 "> "/* Pass open firmware flat tree */ -#define CONFIG_OF_FLAT_TREE 1 +#define CONFIG_OF_LIBFDT 1#define CONFIG_OF_BOARD_SETUP 1#define OF_CPU "PowerPC,7448 at 0"
Signature · 1 line
1.5.5.1