diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-10-15 22:00:01 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-10-15 22:00:01 +0200 |
| commit | 7bf5228ce190e1659eee0d99bbf4fc5d417a2369 (patch) | |
| tree | fc826219272af416f02aef7c8f2670d1b6f86de7 /arch | |
| parent | e140aad18af5536a25c9ec2055ab53e9e4bc0721 (diff) | |
| parent | a2c1229c39e39d9a5ff90055d78b8de061943097 (diff) | |
| download | blackbird-obmc-uboot-7bf5228ce190e1659eee0d99bbf4fc5d417a2369.tar.gz blackbird-obmc-uboot-7bf5228ce190e1659eee0d99bbf4fc5d417a2369.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-fdt
* 'master' of git://git.denx.de/u-boot-fdt:
powerpc/85xx: use fdt_create_phandle() to create the Fman firmware phandles
fdt: update fdt_alloc_phandle to use fdt_get_phandle
fdt: check for fdt errors in fdt_create_phandle
fdt: Add a do_fixup_by_path_string() function
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/fdt.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c index d20c94c0f7..9d2d76956e 100644 --- a/arch/powerpc/cpu/mpc85xx/fdt.c +++ b/arch/powerpc/cpu/mpc85xx/fdt.c @@ -504,9 +504,8 @@ void fdt_fixup_fman_firmware(void *blob) fdt_strerror(rc)); return; } - phandle = fdt_alloc_phandle(blob); - rc = fdt_setprop_cell(blob, fwnode, "linux,phandle", phandle); - if (rc < 0) { + phandle = fdt_create_phandle(blob, fwnode); + if (!phandle) { char s[64]; fdt_get_path(blob, fwnode, s, sizeof(s)); printf("Could not add phandle property to node %s: %s\n", s, |
