diff mbox

[U-Boot,02/11] fdt: Report failure of ft_board_setup()

Message ID 1413360341-25828-2-git-send-email-sjg@chromium.org
State Superseded
Delegated to: Jerry Van Baren
Headers show

Commit Message

Simon Glass Oct. 15, 2014, 8:05 a.m. UTC 
Since this function can fail, print a message when it does.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 common/cmd_fdt.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

Comments

Anatolij Gustschin Oct. 17, 2014, 8:23 p.m. UTC | #1 
Hi Simon,

On Wed, 15 Oct 2014 02:05:32 -0600
Simon Glass <sjg@chromium.org> wrote:
...
> +	else if (strncmp(argv[1], "boa", 3) == 0) {
> +		int err = ft_board_setup(working_fdt, gd->bd);
> +
> +		if (err) {
> +			printf("Failed to add board information to FDT: %s\n",
> +			       fdt_strerror(err));

ft_board_setup() can also remove nodes or properties, so a message
like "Failed to update board information in FDT: %s\n" would be
better here.

Thanks,

Anatolij
diff mbox

Patch

diff --git a/common/cmd_fdt.c b/common/cmd_fdt.c
index 5640ded..51341ac 100644
--- a/common/cmd_fdt.c
+++ b/common/cmd_fdt.c
@@ -566,8 +566,15 @@  static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	}
 #ifdef CONFIG_OF_BOARD_SETUP
 	/* Call the board-specific fixup routine */
-	else if (strncmp(argv[1], "boa", 3) == 0)
-		ft_board_setup(working_fdt, gd->bd);
+	else if (strncmp(argv[1], "boa", 3) == 0) {
+		int err = ft_board_setup(working_fdt, gd->bd);
+
+		if (err) {
+			printf("Failed to add board information to FDT: %s\n",
+			       fdt_strerror(err));
+			return CMD_RET_FAILURE;
+		}
+	}
 #endif
 	/* Create a chosen node */
 	else if (strncmp(argv[1], "cho", 3) == 0) {