GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-04-01 20:11:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Convert mpc7448hpc2 to CONFIG_OF_LIBFDT

Browse source 
This was configured to use the deprecated CONFIG_OF_FLAT_TREE, change
to CONFIG_OF_LIBFDT.

WARNING: This conversion is 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 <vanbaren@cideas.com>
This commit is contained in:
Gerald Van Baren 2008-06-03 20:24:58 -04:00
parent 8155efbd7a
commit 589c04271d
4 changed files with 43 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
board/freescale/mpc7448hpc2/mpc7448hpc2.c
View file

@ -105,3 +105,12 @@ ft_board_setup (void *blob, bd_t *bd)
} }
} }
#endif #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

35
cpu/74xx_7xx/cpu.c
View file

@ -44,6 +44,11 @@
#include <74xx_7xx.h> #include <74xx_7xx.h>
#include <asm/cache.h> #include <asm/cache.h>
#if defined(CONFIG_OF_LIBFDT)
#include <libfdt.h>
#include <fdt_support.h>
#endif
#if defined(CONFIG_OF_FLAT_TREE) #if defined(CONFIG_OF_FLAT_TREE)
#include <ft_build.h> #include <ft_build.h>
#endif #endif
@ -301,29 +306,19 @@ watchdog_reset(void)
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
#ifdef CONFIG_OF_FLAT_TREE #ifdef CONFIG_OF_LIBFDT
void void ft_cpu_setup(void *blob, bd_t *bd)
ft_cpu_setup (void *blob, bd_t *bd)
{ {
u32 *p; do_fixup_by_prop_u32(blob, "device_type", "cpu", 4,
ulong clock; "timebase-frequency", bd->bi_busfreq / 4, 1);
int len; 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);
clock = bd->bi_busfreq; fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);
p = ft_get_prop (blob, "/cpus/" OF_CPU "/bus-frequency", &len); fdt_fixup_ethernet(blob, bd);
if (p != NULL)
*p = cpu_to_be32 (clock);
#if defined(CONFIG_TSI108_ETH)
p = ft_get_prop (blob, "/" OF_TSI "/ethernet@6200/address", &len);
memcpy (p, bd->bi_enetaddr, 6);
#endif
#if defined(CONFIG_HAS_ETH1)
p = ft_get_prop (blob, "/" OF_TSI "/ethernet@6600/address", &len);
memcpy (p, bd->bi_enet1addr, 6);
#endif
} }
#endif #endif
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */

31
drivers/pci/tsi108_pci.c
View file

@ -33,8 +33,9 @@
#include <pci.h> #include <pci.h>
#include <asm/io.h> #include <asm/io.h>
#include <tsi108.h> #include <tsi108.h>
#ifdef CONFIG_OF_FLAT_TREE #if defined(CONFIG_OF_LIBFDT)
#include <ft_build.h> #include <libfdt.h>
#include <fdt_support.h>
#endif #endif
struct pci_controller local_hose; struct pci_controller local_hose;
@ -162,20 +163,24 @@ void pci_init_board (void)
return; return;
} }
#ifdef CONFIG_OF_FLAT_TREE #if defined(CONFIG_OF_LIBFDT)
void void ft_pci_setup(void *blob, bd_t *bd)
ft_pci_setup (void *blob, bd_t *bd)
{ {
u32 *p; int nodeoffset;
int len; int tmp[2];
const char *path;
p = (u32 *)ft_get_prop (blob, "/" OF_TSI "/pci@1000/bus-range", &len); nodeoffset = fdt_path_offset(blob, "/aliases");
if (p != NULL) { if (nodeoffset >= 0) {
p[0] = local_hose.first_busno; path = fdt_getprop(blob, nodeoffset, "pci", NULL);
p[1] = local_hose.last_busno; if (path) {
tmp[0] = cpu_to_be32(local_hose.first_busno);
tmp[1] = cpu_to_be32(local_hose.last_busno);
do_fixup_by_path(blob, path, "bus-range",
&tmp, sizeof(tmp), 1);
} }
} }
#endif }
#endif /* CONFIG_OF_LIBFDT */
#endif /* CONFIG_TSI108_PCI */ #endif /* CONFIG_TSI108_PCI */

2
include/configs/mpc7448hpc2.h
View file

@ -75,7 +75,7 @@
#define CFG_PROMPT_HUSH_PS2 "> " #define CFG_PROMPT_HUSH_PS2 "> "
/* Pass open firmware flat tree */ /* Pass open firmware flat tree */
#define CONFIG_OF_FLAT_TREE 1 #define CONFIG_OF_LIBFDT 1
#define CONFIG_OF_BOARD_SETUP 1 #define CONFIG_OF_BOARD_SETUP 1
#define OF_CPU "PowerPC,7448@0" #define OF_CPU "PowerPC,7448@0"