diff options
| author | Tom Rini <trini@ti.com> | 2015-02-18 08:46:50 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-18 08:46:50 -0500 |
| commit | 1320112c8aa58345d71a5a46f3bf6a52589f1f2b (patch) | |
| tree | 6172c6e175b759515bae9e5def62342b97401795 | |
| parent | 9ec84f103b3f3e770043b06042e5d2d6f2339e39 (diff) | |
| parent | c71a0164d9b23e624552fb614bcb426a11119b57 (diff) | |
| download | u-boot-imx-1320112c8aa58345d71a5a46f3bf6a52589f1f2b.zip u-boot-imx-1320112c8aa58345d71a5a46f3bf6a52589f1f2b.tar.gz u-boot-imx-1320112c8aa58345d71a5a46f3bf6a52589f1f2b.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-fdt
| -rw-r--r-- | common/bootm.c | 2 | ||||
| -rw-r--r-- | common/cmd_fdt.c | 10 | ||||
| -rw-r--r-- | common/image-fdt.c | 2 | ||||
| -rw-r--r-- | include/fdt_support.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/common/bootm.c b/common/bootm.c index e2dc164..34f60bb 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -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; } diff --git a/common/cmd_fdt.c b/common/cmd_fdt.c index dc59fab..48b3e70 100644 --- a/common/cmd_fdt.c +++ b/common/cmd_fdt.c @@ -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; diff --git a/common/image-fdt.c b/common/image-fdt.c index e3f06cd..d9e4728 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -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: diff --git a/include/fdt_support.h b/include/fdt_support.h index 1f19fe4..ae5e8a3 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -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); |