ppc4xx: Canyonlands: Remove unnecessary FDT warning upon DTB fixup
PATCH 1/1 ppc4xx: Canyonlands: Remove unnecessary FDT warning upon DTB fixup
Depending on the configuration jumper "SATA SELECT", U-Boot disabled either one PCIe node or the SATA node in the device tree blob. This patch removes the unnecessary and even confusing warning, when the node is not found at all.
--- board/amcc/canyonlands/canyonlands.c | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-)
board/amcc/canyonlands/canyonlands.c +4 -12
@@ -460,12 +460,8 @@ void ft_board_setup(void *blob, bd_t *bd)* node in the device tree, so that Linux doesn't initialize * it. */ - rc =fdt_find_and_setprop (blob,"/plb/pciex at d00000000" ,"status" , -"disabled" ,sizeof ("disabled" ),1 ); -if (rc) { -printf ("Unable to update property status in PCIe node, err=%s\n" , -fdt_strerror (rc)); - } +fdt_find_and_setprop (blob,"/plb/pciex at d00000000" ,"status" , +"disabled" ,sizeof ("disabled" ),1 ); }if (gd->board_type ==BOARD_CANYONLANDS_PCIE ) {
@@ -474,12 +470,8 @@ void ft_board_setup(void *blob, bd_t *bd)* node in the device tree, so that Linux doesn't initialize * it. */ - rc =fdt_find_and_setprop (blob,"/plb/sata at bffd1000" ,"status" , -"disabled" ,sizeof ("disabled" ),1 ); -if (rc) { -printf ("Unable to update property status in PCIe node, err=%s\n" , -fdt_strerror (rc)); - } +fdt_find_and_setprop (blob,"/plb/sata at bffd1000" ,"status" , + "disabled", sizeof("disabled"), 1); } }#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */
Signature · 1 line
1.6.0.2
Wolfgang Denk
AppliedPATCH 1/1 ppc4xx: Canyonlands: Remove unnecessary FDT warning upon DTB fixup
Dear Stefan Roese,
Quoted 9 lines · In message <[email protected]> you wrote:
Depending on the configuration jumper "SATA SELECT", U-Boot disabled either one PCIe node or the SATA node in the device tree blob. This patch removes the unnecessary and even confusing warning, when the node is not found at all.
Signed-off-by Stefan Roese <[email protected]>--- board/amcc/canyonlands/canyonlands.c | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-)
Applied, thanks.
Hope it's OK that I pulled this directly.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de The easiest way to figure the cost of living is to take your income and add ten percent.
PATCH 1/1 ppc4xx: Canyonlands: Remove unnecessary FDT warning upon DTB fixup
Hi Wolfgang,
Quoted 5 lines · Wolfgang Denk
Quoted 5 lines
Depending on the configuration jumper "SATA SELECT", U-Boot disabled either one PCIe node or the SATA node in the device tree blob. This patch removes the unnecessary and even confusing warning, when the node is not found at all.
Quoted 8 lines
Quoted 4 lines
Signed-off-by Stefan Roese <[email protected]>--- board/amcc/canyonlands/canyonlands.c | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-)Applied, thanks.
Hope it's OK that I pulled this directly.
Sure. Thanks.
Best regards,
Stefan
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================