mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-24 12:44:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

cmd_fdt: Actually fix fdt command in sandbox

Browse Source 
Commit 90bac29a76 claims to fix this bug
that was introduced in commit a92fd6577e
but doesn't actually make the change that the commit message describes.

Actually fix the bug this time.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Joe Hershberger 2015-02-04 21:56:53 -06:00 committed by Simon Glass
parent 5745f8c4fd
commit 90fbee3e40
4 changed files with 7 additions and 7 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;
}

8
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);
}
/*
@ -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);