mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-24 21:54:01 +00:00
Merge with git://git.kernel.org/pub/scm/boot/u-boot/u-boot.git#ft_infr
This commit is contained in:
Wolfgang Denk
commit
a3f0169880
7 changed files with 135 additions and 18 deletions
27
CHANGELOG
27
CHANGELOG
|
|
@ -2,6 +2,33 @@
|
|||
Changes since U-Boot 1.1.4:
|
||||
======================================================================
|
||||
|
||||
* Add helper function for generic flat device tree fixups for mpc83xx
|
||||
Patch by Kumar Gala, 11 Jan 2006
|
||||
|
||||
* Add support for passing initrd information via flat device tree
|
||||
Patch by Kumar Gala, 11 Jan 2006
|
||||
|
||||
* Added OF_STDOUT_PATH and OF_SOC
|
||||
|
||||
OF_STDOUT_PATH specifies the path to the device the kernel can use
|
||||
for console output
|
||||
|
||||
OF_SOC specifies the proper name of the SOC node if one exists.
|
||||
Patch by Kumar Gala, 11 Jan 2006
|
||||
|
||||
* Allow board code to fixup the flat device tree before booting a kernel
|
||||
Patch by Kumar Gala, 11 Jan 2006
|
||||
|
||||
* Added CONFIG_ options for bd_t and env in flat dev tree
|
||||
|
||||
CONFIG_OF_HAS_BD_T will put a copy of the bd_t
|
||||
into the resulting flat device tree.
|
||||
|
||||
CONFIG_OF_HAS_UBOOT_ENV will copy the environment
|
||||
variables from u-boot into the flat device tree
|
||||
|
||||
Patch by Kumar Gala, 11 Jan 2006
|
||||
|
||||
* Add support for the DHCP vendor optional bootfile (#67).
|
||||
Ignores the vendor TFTP server name option (#66).
|
||||
Patch by Murray Jensen, 30 Jun 2005
|
||||
|
|
|
|||
17
README
17
README
|
|
@ -411,7 +411,24 @@ The following options need to be configured:
|
|||
The maximum size of the constructed OF tree.
|
||||
|
||||
OF_CPU - The proper name of the cpus node.
|
||||
OF_SOC - The proper name of the soc node.
|
||||
OF_TBCLK - The timebase frequency.
|
||||
OF_STDOUT_PATH - The path to the console device
|
||||
|
||||
CONFIG_OF_HAS_BD_T
|
||||
|
||||
The resulting flat device tree will have a copy of the bd_t.
|
||||
Space should be pre-allocated in the dts for the bd_t.
|
||||
|
||||
CONFIG_OF_HAS_UBOOT_ENV
|
||||
|
||||
The resulting flat device tree will have a copy of u-boot's
|
||||
environment variables
|
||||
|
||||
CONFIG_OF_BOARD_SETUP
|
||||
|
||||
Board code has addition modification that it wants to make
|
||||
to the flat device tree before handing it off to the kernel
|
||||
|
||||
- Serial Ports:
|
||||
CFG_PL010_SERIAL
|
||||
|
|
|
|||
|
|
@ -821,7 +821,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
|
|||
(*kernel) (kbd, initrd_start, initrd_end, cmd_start, cmd_end);
|
||||
|
||||
#else
|
||||
ft_setup(of_flat_tree, OF_FLAT_TREE_MAX_SIZE, kbd);
|
||||
ft_setup(of_flat_tree, OF_FLAT_TREE_MAX_SIZE, kbd, initrd_start, initrd_end);
|
||||
/* ft_dump_blob(of_flat_tree); */
|
||||
|
||||
#if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500)
|
||||
|
|
@ -830,12 +830,16 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
|
|||
/*
|
||||
* Linux Kernel Parameters:
|
||||
* r3: ptr to OF flat tree, followed by the board info data
|
||||
* r4: initrd_start or 0 if no initrd
|
||||
* r5: initrd_end - unused if r4 is 0
|
||||
* r6: Start of command line string
|
||||
* r7: End of command line string
|
||||
* r4: physical pointer to the kernel itself
|
||||
* r5: NULL
|
||||
* r6: NULL
|
||||
* r7: NULL
|
||||
*/
|
||||
(*kernel) ((bd_t *)of_flat_tree, initrd_start, initrd_end, cmd_start, cmd_end);
|
||||
if (getenv("disable_of") != NULL)
|
||||
(*kernel) ((bd_t *)of_flat_tree, initrd_start, initrd_end,
|
||||
cmd_start, cmd_end);
|
||||
else
|
||||
(*kernel) ((bd_t *)of_flat_tree, (ulong)kernel, 0, 0, 0);
|
||||
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
|
|
@ -163,7 +163,7 @@ void ft_add_rsvmap(struct ft_cxt *cxt, u64 physaddr, u64 size)
|
|||
((u64 *) cxt->pres)[0] = cpu_to_be64(physaddr); /* phys = 0, size = 0, terminate */
|
||||
((u64 *) cxt->pres)[1] = cpu_to_be64(size);
|
||||
|
||||
cxt->pres += 18; /* advance */
|
||||
cxt->pres += 16; /* advance */
|
||||
|
||||
((u64 *) cxt->pres)[0] = 0; /* phys = 0, size = 0, terminate */
|
||||
((u64 *) cxt->pres)[1] = 0;
|
||||
|
|
@ -529,6 +529,7 @@ extern uchar(*env_get_char) (int);
|
|||
|
||||
#define BDM(x) { .name = #x, .offset = offsetof(bd_t, bi_ ##x ) }
|
||||
|
||||
#ifdef CONFIG_OF_HAS_BD_T
|
||||
static const struct {
|
||||
const char *name;
|
||||
int offset;
|
||||
|
|
@ -574,19 +575,24 @@ static const struct {
|
|||
#endif
|
||||
BDM(baudrate),
|
||||
};
|
||||
#endif
|
||||
|
||||
void ft_setup(void *blob, int size, bd_t * bd)
|
||||
void ft_setup(void *blob, int size, bd_t * bd, ulong initrd_start, ulong initrd_end)
|
||||
{
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
u8 *end;
|
||||
u32 *p;
|
||||
int len;
|
||||
struct ft_cxt cxt;
|
||||
int i, k, nxt;
|
||||
static char tmpenv[256];
|
||||
char *s, *lval, *rval;
|
||||
ulong clock;
|
||||
uint32_t v;
|
||||
#if defined(CONFIG_OF_HAS_UBOOT_ENV)
|
||||
int k, nxt;
|
||||
#endif
|
||||
#if defined(CONFIG_OF_HAS_BD_T)
|
||||
u8 *end;
|
||||
#endif
|
||||
#if defined(CONFIG_OF_HAS_UBOOT_ENV) || defined(CONFIG_OF_HAS_BD_T)
|
||||
int i;
|
||||
static char tmpenv[256];
|
||||
#endif
|
||||
|
||||
/* disable OF tree; booting old kernel */
|
||||
if (getenv("disable_of") != NULL) {
|
||||
|
|
@ -596,7 +602,8 @@ void ft_setup(void *blob, int size, bd_t * bd)
|
|||
|
||||
ft_begin(&cxt, blob, size);
|
||||
|
||||
/* fs_add_rsvmap not used */
|
||||
if (initrd_start && initrd_end)
|
||||
ft_add_rsvmap(&cxt, initrd_start, initrd_end - initrd_start + 1);
|
||||
|
||||
ft_begin_tree(&cxt);
|
||||
|
||||
|
|
@ -610,9 +617,12 @@ void ft_setup(void *blob, int size, bd_t * bd)
|
|||
/* back into root */
|
||||
ft_backtrack_node(&cxt);
|
||||
|
||||
#ifdef CONFIG_OF_HAS_UBOOT_ENV
|
||||
ft_begin_node(&cxt, "u-boot-env");
|
||||
|
||||
for (i = 0; env_get_char(i) != '\0'; i = nxt + 1) {
|
||||
char *s, *lval, *rval;
|
||||
|
||||
for (nxt = i; env_get_char(nxt) != '\0'; ++nxt) ;
|
||||
s = tmpenv;
|
||||
for (k = i; k < nxt && s < &tmpenv[sizeof(tmpenv) - 1]; ++k)
|
||||
|
|
@ -629,12 +639,20 @@ void ft_setup(void *blob, int size, bd_t * bd)
|
|||
}
|
||||
|
||||
ft_end_node(&cxt);
|
||||
#endif
|
||||
|
||||
ft_begin_node(&cxt, "chosen");
|
||||
|
||||
ft_prop_str(&cxt, "name", "chosen");
|
||||
ft_prop_str(&cxt, "bootargs", getenv("bootargs"));
|
||||
ft_prop_int(&cxt, "linux,platform", 0x600); /* what is this? */
|
||||
if (initrd_start && initrd_end) {
|
||||
ft_prop_int(&cxt, "linux,initrd-start", initrd_start);
|
||||
ft_prop_int(&cxt, "linux,initrd-end", initrd_end);
|
||||
}
|
||||
#ifdef OF_STDOUT_PATH
|
||||
ft_prop_str(&cxt, "linux,stdout-path", OF_STDOUT_PATH);
|
||||
#endif
|
||||
|
||||
ft_end_node(&cxt);
|
||||
|
||||
|
|
@ -647,14 +665,19 @@ void ft_setup(void *blob, int size, bd_t * bd)
|
|||
ft_dump_blob(blob);
|
||||
*/
|
||||
|
||||
#ifdef CONFIG_OF_HAS_BD_T
|
||||
/* paste the bd_t at the end of the flat tree */
|
||||
end = (char *)blob +
|
||||
be32_to_cpu(((struct boot_param_header *)blob)->totalsize);
|
||||
memcpy(end, bd, sizeof(*bd));
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PPC
|
||||
|
||||
#ifdef CONFIG_OF_HAS_BD_T
|
||||
for (i = 0; i < sizeof(bd_map)/sizeof(bd_map[0]); i++) {
|
||||
uint32_t v;
|
||||
|
||||
sprintf(tmpenv, "/bd_t/%s", bd_map[i].name);
|
||||
v = *(uint32_t *)((char *)bd + bd_map[i].offset);
|
||||
|
||||
|
|
@ -670,6 +693,7 @@ void ft_setup(void *blob, int size, bd_t * bd)
|
|||
p = ft_get_prop(blob, "/bd_t/ethspeed", &len);
|
||||
if (p != NULL)
|
||||
*p = cpu_to_be32((uint32_t) bd->bi_ethspeed);
|
||||
#endif
|
||||
|
||||
clock = bd->bi_intfreq;
|
||||
p = ft_get_prop(blob, "/cpus/" OF_CPU "/clock-frequency", &len);
|
||||
|
|
@ -680,11 +704,14 @@ void ft_setup(void *blob, int size, bd_t * bd)
|
|||
clock = OF_TBCLK;
|
||||
p = ft_get_prop(blob, "/cpus/" OF_CPU "/timebase-frequency", &len);
|
||||
if (p != NULL)
|
||||
*p = cpu_to_be32(OF_TBCLK);
|
||||
*p = cpu_to_be32(clock);
|
||||
#endif
|
||||
|
||||
#endif /* __powerpc__ */
|
||||
|
||||
#ifdef CONFIG_OF_BOARD_SETUP
|
||||
ft_board_setup(blob, bd);
|
||||
#endif
|
||||
|
||||
/*
|
||||
printf("final OF-tree\n");
|
||||
ft_dump_blob(blob);
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@
|
|||
#include <watchdog.h>
|
||||
#include <command.h>
|
||||
#include <mpc83xx.h>
|
||||
#include <ft_build.h>
|
||||
#include <asm/processor.h>
|
||||
|
||||
|
||||
|
|
@ -151,3 +152,40 @@ void watchdog_reset (void)
|
|||
hang(); /* FIXME: implement watchdog_reset()? */
|
||||
}
|
||||
#endif /* CONFIG_WATCHDOG */
|
||||
|
||||
#if defined(CONFIG_OF_FLAT_TREE)
|
||||
void
|
||||
ft_cpu_setup(void *blob, bd_t *bd)
|
||||
{
|
||||
u32 *p;
|
||||
int len;
|
||||
ulong clock;
|
||||
|
||||
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 "/serial@4500/clock-frequency", &len);
|
||||
if (p != NULL)
|
||||
*p = cpu_to_be32(clock);
|
||||
|
||||
p = ft_get_prop(blob, "/" OF_SOC "/serial@4600/clock-frequency", &len);
|
||||
if (p != NULL)
|
||||
*p = cpu_to_be32(clock);
|
||||
|
||||
#ifdef CONFIG_MPC83XX_TSEC1
|
||||
p = ft_get_prop(blob, "/" OF_SOC "/ethernet@24000/address", &len);
|
||||
memcpy(p, bd->bi_enetaddr, 6);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_MPC83XX_TSEC2
|
||||
p = ft_get_prop(blob, "/" OF_SOC "/ethernet@25000/address", &len);
|
||||
memcpy(p, bd->bi_enet1addr, 6);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -584,5 +584,7 @@ typedef unsigned int led_id_t;
|
|||
|
||||
#define OF_CPU "PowerPC,MPC870@0"
|
||||
#define OF_TBCLK (MPC8XX_HZ / 16)
|
||||
#define CONFIG_OF_HAS_BD_T 1
|
||||
#define CONFIG_OF_HAS_UBOOT_ENV 1
|
||||
|
||||
#endif /* __CONFIG_H */
|
||||
|
|
|
|||
|
|
@ -57,10 +57,12 @@ void ft_prop_int(struct ft_cxt *cxt, const char *name, int val);
|
|||
void ft_begin(struct ft_cxt *cxt, void *blob, int max_size);
|
||||
void ft_add_rsvmap(struct ft_cxt *cxt, u64 physaddr, u64 size);
|
||||
|
||||
void ft_setup(void *blob, int size, bd_t * bd);
|
||||
void ft_setup(void *blob, int size, bd_t * bd, ulong initrd_start, ulong initrd_end);
|
||||
|
||||
void ft_dump_blob(const void *bphp);
|
||||
void ft_merge_blob(struct ft_cxt *cxt, void *blob);
|
||||
void *ft_get_prop(void *bphp, const char *propname, int *szp);
|
||||
|
||||
void ft_board_setup(void *blob, bd_t *bd);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue