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

Merge branch 'master' of git://git.denx.de/u-boot-fdt

Browse Source
This commit is contained in:
Tom Rini 2015-02-18 08:46:50 -05:00
commit 1320112c8a
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/bootm.c
View File

@ -233,7 +233,7 @@ static int bootm_find_fdt(int flag, int argc, char * const argv[])
return 1;
}
set_working_fdt_addr(images.ft_addr);
set_working_fdt_addr((ulong)images.ft_addr);
return 0;
}

10
common/cmd_fdt.c
View File

@ -38,13 +38,13 @@ static int is_printable_string(const void *data, int len);
*/
struct fdt_header *working_fdt;
void set_working_fdt_addr(void *addr)
void set_working_fdt_addr(ulong addr)
{
void *buf;
buf = map_sysmem((ulong)addr, 0);
buf = map_sysmem(addr, 0);
working_fdt = buf;
setenv_addr("fdtaddr", addr);
setenv_ulong("fdtaddr", addr);
}
/*
@ -111,7 +111,7 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
if (!blob || !fdt_valid(&blob))
return 1;
printf("The address of the fdt is %#08lx\n",
control ? (ulong)blob :
control ? (ulong)map_to_sysmem(blob) :
getenv_hex("fdtaddr", 0));
return 0;
}
@ -123,7 +123,7 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
if (control)
gd->fdt_blob = blob;
else
set_working_fdt_addr((void *)blob);
set_working_fdt_addr(addr);
if (argc >= 2) {
int len;

2
common/image-fdt.c
View File

@ -190,7 +190,7 @@ int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, ulong *of_size)
*of_flat_tree = of_start;
*of_size = of_len;
set_working_fdt_addr(*of_flat_tree);
set_working_fdt_addr((ulong)*of_flat_tree);
return 0;
error:

2
include/fdt_support.h
View File

@ -100,7 +100,7 @@ void ft_pci_setup(void *blob, bd_t *bd);
*/
int ft_system_setup(void *blob, bd_t *bd);
void set_working_fdt_addr(void *addr);
void set_working_fdt_addr(ulong addr);
int fdt_shrink_to_minimum(void *blob);
int fdt_increase_size(void *fdt, int add_len);