diff options
| author | Stefan Roese <sr@denx.de> | 2007-12-11 11:34:54 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-12-11 11:34:54 +0100 |
| commit | 9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105 (patch) | |
| tree | 1afcc9c20c04e19870ab5e2996104877695c54a3 /board/cm5200/cm5200.c | |
| parent | 7cfc12a7dcfdb350e2ab76db4dafcc30f7e77c2b (diff) | |
| parent | 41be969f4957115ed7b1fe8b890bfaee99d7a7a2 (diff) | |
| download | u-boot-imx-9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105.zip u-boot-imx-9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105.tar.gz u-boot-imx-9caeaadf508cd0e11ac5dfc56ab0f72e3b89a105.tar.bz2 | |
Merge commit 'u-boot/master' into for-1.3.1
Conflicts:
drivers/rtc/Makefile
Diffstat (limited to 'board/cm5200/cm5200.c')
| -rw-r--r-- | board/cm5200/cm5200.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/cm5200/cm5200.c b/board/cm5200/cm5200.c index e2ab5b8..4a86d3c 100644 --- a/board/cm5200/cm5200.c +++ b/board/cm5200/cm5200.c @@ -276,7 +276,7 @@ static void ft_blob_update(void *blob, bd_t *bd) memory_data[0] = cpu_to_be32(bd->bi_memstart); memory_data[1] = cpu_to_be32(bd->bi_memsize); - nodeoffset = fdt_find_node_by_path (blob, "/memory"); + nodeoffset = fdt_path_offset (blob, "/memory"); if (nodeoffset >= 0) { ret = fdt_setprop(blob, nodeoffset, "reg", memory_data, sizeof(memory_data)); |