leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrate 5xxx boards from CONFIG_OF_FLAT_TREE to CONFIG_OF_LIBFDT

Browse Source 
Affects boards: icecube (lite5200), jupiter, motionpro, tqm5200

Tested on: lite5200b

Note: the fixup functions have not been moved to a common place.  This
patch is targeted for immediate merging as in solves a build issue, but
the final name/location of the fixups is still subject to debate.  I
propose to merge this now, and move the fixups in the next merge window
to be usable by all targets.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
Grant Likely 2007-09-06 09:46:23 -06:00
parent 41bb76e941
commit cf2817a84c
9 changed files with 52 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
board/icecube/icecube.c
View File

@ -28,10 +28,7 @@
#include <mpc5xxx.h> #include <mpc5xxx.h>
#include <pci.h> #include <pci.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <libfdt.h>
#if defined(CONFIG_OF_FLAT_TREE)
#include <ft_build.h>
#endif
#if defined(CONFIG_LITE5200B) #if defined(CONFIG_LITE5200B)
#include "mt46v32m16.h" #include "mt46v32m16.h"
@ -386,7 +383,7 @@ void ide_set_reset (int idereset)
} }
#endif #endif
#if defined(CONFIG_OF_FLAT_TREE) && defined(CONFIG_OF_BOARD_SETUP) #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
void void
ft_board_setup(void *blob, bd_t *bd) ft_board_setup(void *blob, bd_t *bd)
{ {

8
board/jupiter/jupiter.c
View File

@ -28,11 +28,7 @@
#include <mpc5xxx.h> #include <mpc5xxx.h>
#include <pci.h> #include <pci.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <libfdt.h>
#if defined(CONFIG_OF_FLAT_TREE)
#include <ft_build.h>
#endif
#define SDRAM_DDR 0 #define SDRAM_DDR 0
#if 1 #if 1
@ -308,7 +304,7 @@ void ide_set_reset (int idereset)
} }
#endif #endif
#if defined(CONFIG_OF_FLAT_TREE) && defined(CONFIG_OF_BOARD_SETUP) #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
void void
ft_board_setup(void *blob, bd_t *bd) ft_board_setup(void *blob, bd_t *bd)
{ {

8
board/motionpro/motionpro.c
View File

@ -29,9 +29,7 @@
#include <common.h> #include <common.h>
#include <mpc5xxx.h> #include <mpc5xxx.h>
#include <miiphy.h> #include <miiphy.h>
#if defined(CONFIG_OF_FLAT_TREE) #include <libfdt.h>
#include <ft_build.h>
#endif
#if defined(CONFIG_STATUS_LED) #if defined(CONFIG_STATUS_LED)
#include <status_led.h> #include <status_led.h>
@ -196,12 +194,12 @@ int checkboard(void)
} }
#if defined(CONFIG_OF_FLAT_TREE) && defined(CONFIG_OF_BOARD_SETUP) #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
void ft_board_setup(void *blob, bd_t *bd) void ft_board_setup(void *blob, bd_t *bd)
{ {
ft_cpu_setup(blob, bd); ft_cpu_setup(blob, bd);
} }
#endif /* defined(CONFIG_OF_FLAT_TREE) && defined(CONFIG_OF_BOARD_SETUP) */ #endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
#if defined(CONFIG_STATUS_LED) #if defined(CONFIG_STATUS_LED)

9
board/tqm5200/tqm5200.c
View File

@ -31,10 +31,7 @@
#include <mpc5xxx.h> #include <mpc5xxx.h>
#include <pci.h> #include <pci.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <libfdt.h>
#if defined(CONFIG_OF_FLAT_TREE)
#include <ft_build.h>
#endif
#ifdef CONFIG_VIDEO_SM501 #ifdef CONFIG_VIDEO_SM501
#include <sm501.h> #include <sm501.h>
@ -780,9 +777,9 @@ int board_get_height (void)
#endif /* CONFIG_VIDEO_SM501 */ #endif /* CONFIG_VIDEO_SM501 */
#if defined(CONFIG_OF_FLAT_TREE) && defined(CONFIG_OF_BOARD_SETUP) #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
void ft_board_setup(void *blob, bd_t *bd) void ft_board_setup(void *blob, bd_t *bd)
{ {
ft_cpu_setup(blob, bd); ft_cpu_setup(blob, bd);
} }
#endif /* defined(CONFIG_OF_FLAT_TREE) && defined(CONFIG_OF_BOARD_SETUP) */ #endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */

60
cpu/mpc5xxx/cpu.c
View File

@ -29,10 +29,12 @@
#include <watchdog.h> #include <watchdog.h>
#include <command.h> #include <command.h>
#include <mpc5xxx.h> #include <mpc5xxx.h>
#include <asm/io.h>
#include <asm/processor.h> #include <asm/processor.h>
#if defined(CONFIG_OF_FLAT_TREE) #if defined(CONFIG_OF_LIBFDT)
#include <ft_build.h> #include <libfdt.h>
#include <libfdt_env.h>
#endif #endif
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -111,29 +113,43 @@ unsigned long get_tbclk (void)
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
#ifdef CONFIG_OF_FLAT_TREE #ifdef CONFIG_OF_LIBFDT
void static void do_fixup(void *fdt, const char *node, const char *prop,
ft_cpu_setup(void *blob, bd_t *bd) const void *val, int len, int create)
{ {
u32 *p; #if defined(DEBUG)
int len; int i;
debug("Updating property '%s/%s' = ", node, prop);
for (i = 0; i < len; i++)
debug(" %.2x", *(u8*)(val+i));
debug("\n");
#endif
int rc = fdt_find_and_setprop(fdt, node, prop, val, len, create);
if (rc)
printf("Unable to update property %s:%s, err=%s\n",
node, prop, fdt_strerror(rc));
}
/* Core XLB bus frequency */ static void do_fixup_u32(void *fdt, const char *node, const char *prop,
p = ft_get_prop(blob, "/cpus/" OF_CPU "/bus-frequency", &len); u32 val, int create)
if (p != NULL) {
*p = cpu_to_be32(bd->bi_busfreq); val = cpu_to_fdt32(val);
do_fixup(fdt, node, prop, &val, sizeof(val), create);
}
/* SOC peripherals use the IPB bus frequency */ void ft_cpu_setup(void *blob, bd_t *bd)
p = ft_get_prop(blob, "/" OF_SOC "/bus-frequency", &len); {
if (p != NULL) int div = in_8((void*)CFG_MBAR + 0x204) & 0x0020 ? 8 : 4;
*p = cpu_to_be32(bd->bi_ipbfreq); char * cpu_path = "/cpus/" OF_CPU;
char * eth_path = "/" OF_SOC "/ethernet@3000";
p = ft_get_prop(blob, "/" OF_SOC "/ethernet@3000/mac-address", &len); do_fixup_u32(blob, cpu_path, "timebase-frequency", OF_TBCLK, 1);
if (p != NULL) do_fixup_u32(blob, cpu_path, "bus-frequency", bd->bi_busfreq, 1);
memcpy(p, bd->bi_enetaddr, 6); do_fixup_u32(blob, cpu_path, "clock-frequency", bd->bi_intfreq, 1);
do_fixup_u32(blob, "/" OF_SOC, "bus-frequency", bd->bi_ipbfreq, 1);
p = ft_get_prop(blob, "/" OF_SOC "/ethernet@3000/local-mac-address", &len); do_fixup_u32(blob, "/" OF_SOC, "system-frequency",
if (p != NULL) bd->bi_busfreq*div, 1);
memcpy(p, bd->bi_enetaddr, 6); do_fixup(blob, eth_path, "mac-address", bd->bi_enetaddr, 6, 0);
do_fixup(blob, eth_path, "local-mac-address", bd->bi_enetaddr, 6, 0);
} }
#endif #endif

2
include/configs/IceCube.h
View File

@ -178,7 +178,7 @@
#endif /* CONFIG_MPC5200 */ #endif /* CONFIG_MPC5200 */
/* 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,5200@0" #define OF_CPU "PowerPC,5200@0"

2
include/configs/TQM5200.h
View File

@ -701,7 +701,7 @@
* Open firmware flat tree support * Open firmware flat tree support
*----------------------------------------------------------------------- *-----------------------------------------------------------------------
*/ */
#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,5200@0" #define OF_CPU "PowerPC,5200@0"

2
include/configs/jupiter.h
View File

@ -145,7 +145,7 @@
#if 0 #if 0
/* 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,5200@0" #define OF_CPU "PowerPC,5200@0"

2
include/configs/motionpro.h
View File

@ -417,7 +417,7 @@ extern void __led_set(led_id_t id, int state);
#define CFG_RESET_ADDRESS 0xfff00100 #define CFG_RESET_ADDRESS 0xfff00100
/* 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,5200@0" #define OF_CPU "PowerPC,5200@0"