Wean device tree code off phys_ram_base.

Signed-off-by: Paul Brook <paul@codesourcery.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7068 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
pbrook 2009-04-10 16:23:59 +00:00
parent 5c130f659b
commit 7ec632b45c
4 changed files with 31 additions and 25 deletions

View file

@ -25,34 +25,35 @@
#include <libfdt.h>
void *load_device_tree(const char *filename_path, void *load_addr)
void *load_device_tree(const char *filename_path, int *sizep)
{
int dt_file_size;
int dt_size;
int dt_file_load_size;
int new_dt_size;
int ret;
void *dt_file = NULL;
void *fdt;
void *fdt = NULL;
dt_file_size = get_image_size(filename_path);
if (dt_file_size < 0) {
*sizep = 0;
dt_size = get_image_size(filename_path);
if (dt_size < 0) {
printf("Unable to get size of device tree file '%s'\n",
filename_path);
goto fail;
}
/* Expand to 2x size to give enough room for manipulation. */
dt_size *= 2;
/* First allocate space in qemu for device tree */
dt_file = qemu_mallocz(dt_file_size);
fdt = qemu_mallocz(dt_size);
dt_file_load_size = load_image(filename_path, dt_file);
dt_file_load_size = load_image(filename_path, fdt);
if (dt_file_load_size < 0) {
printf("Unable to open device tree file '%s'\n",
filename_path);
goto fail;
}
/* Second we place new copy of 2x size in guest memory
* This give us enough room for manipulation.
*/
new_dt_size = dt_file_size * 2;
fdt = load_addr;
ret = fdt_open_into(dt_file, fdt, new_dt_size);
ret = fdt_open_into(fdt, fdt, dt_size);
if (ret) {
printf("Unable to copy device tree in memory\n");
goto fail;
@ -64,12 +65,11 @@ void *load_device_tree(const char *filename_path, void *load_addr)
filename_path);
goto fail;
}
/* free qemu memory with old device tree */
qemu_free(dt_file);
*sizep = dt_size;
return fdt;
fail:
qemu_free(dt_file);
qemu_free(fdt);
return NULL;
}