mirror of
https://github.com/AsahiLinux/u-boot
synced 2025-01-03 08:48:55 +00:00
Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx/.git
This commit is contained in:
commit
b690b7da0f
5 changed files with 58 additions and 0 deletions
|
@ -29,6 +29,10 @@
|
|||
#include <pci.h>
|
||||
#include <asm/processor.h>
|
||||
|
||||
#if defined(CONFIG_OF_FLAT_TREE)
|
||||
#include <ft_build.h>
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_LITE5200B)
|
||||
#include "mt46v32m16.h"
|
||||
#else
|
||||
|
@ -332,3 +336,11 @@ void ide_set_reset (int idereset)
|
|||
}
|
||||
}
|
||||
#endif /* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */
|
||||
|
||||
#if defined(CONFIG_OF_FLAT_TREE) && defined(CONFIG_OF_BOARD_SETUP)
|
||||
void
|
||||
ft_board_setup(void *blob, bd_t *bd)
|
||||
{
|
||||
ft_cpu_setup(blob, bd);
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -31,6 +31,10 @@
|
|||
#include <mpc5xxx.h>
|
||||
#include <asm/processor.h>
|
||||
|
||||
#if defined(CONFIG_OF_FLAT_TREE)
|
||||
#include <ft_build.h>
|
||||
#endif
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
int checkcpu (void)
|
||||
|
@ -102,3 +106,27 @@ unsigned long get_tbclk (void)
|
|||
}
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
#ifdef CONFIG_OF_FLAT_TREE
|
||||
void
|
||||
ft_cpu_setup(void *blob, bd_t *bd)
|
||||
{
|
||||
u32 *p;
|
||||
ulong clock;
|
||||
int len;
|
||||
|
||||
clock = bd->bi_busfreq;
|
||||
p = ft_get_prop(blob, "/cpus/" OF_CPU "/bus-frequency", &len);
|
||||
if (p != NULL)
|
||||
*p = cpu_to_be32(clock);
|
||||
|
||||
p = ft_get_prop(blob, "/" OF_SOC "/bus-frequency", &len);
|
||||
if (p != NULL)
|
||||
*p = cpu_to_be32(clock);
|
||||
|
||||
p = ft_get_prop(blob, "/" OF_SOC "/ethernet@3000/mac-address", &len);
|
||||
if (p != NULL)
|
||||
memcpy(p, bd->bi_enetaddr, 6);
|
||||
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -340,6 +340,10 @@ int checkcpu (void)
|
|||
puts("SP Rev. B");
|
||||
break;
|
||||
|
||||
case PVR_440SP_RC:
|
||||
puts("SP Rev. C");
|
||||
break;
|
||||
|
||||
case PVR_440SPe_RA:
|
||||
puts("SPe Rev. A");
|
||||
break;
|
||||
|
|
|
@ -749,6 +749,7 @@
|
|||
#define PVR_405EP_RB 0x51210950
|
||||
#define PVR_440SP_RA 0x53221850
|
||||
#define PVR_440SP_RB 0x53221891
|
||||
#define PVR_440SP_RC 0x53221892
|
||||
#define PVR_440SPe_RA 0x53421890
|
||||
#define PVR_440SPe_RB 0x53421891
|
||||
#define PVR_601 0x00010000
|
||||
|
|
|
@ -172,6 +172,19 @@
|
|||
#undef CFG_IPBSPEED_133 /* define for 133MHz speed */
|
||||
#endif
|
||||
#endif /* CONFIG_MPC5200 */
|
||||
|
||||
/* pass open firmware flat tree */
|
||||
#define CONFIG_OF_FLAT_TREE 1
|
||||
#define CONFIG_OF_BOARD_SETUP 1
|
||||
|
||||
/* maximum size of the flat tree (8K) */
|
||||
#define OF_FLAT_TREE_MAX_SIZE 8192
|
||||
|
||||
#define OF_CPU "PowerPC,5200@0"
|
||||
#define OF_SOC "soc5200@f0000000"
|
||||
#define OF_TBCLK (bd->bi_busfreq / 8)
|
||||
#define OF_STDOUT_PATH "/soc5200@f0000000/serial@2000"
|
||||
|
||||
/*
|
||||
* I2C configuration
|
||||
*/
|
||||
|
|
Loading…
Reference in a new issue