From: Tim Harvey <tharvey@gateworks.com>
Date: Thu, 17 Jun 2021 23:31:07 +0000 (-0700)
Subject: octeontx: do not require cavium BDK node to be present
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=800433814af22708ec11f8042089bcf2c8bb1fa6;p=u-boot.git

octeontx: do not require cavium BDK node to be present

The cavium,bdk node is a non-standard dt node used by the BDK and
therefore it is removed from the dt before booting Linux. Do not
require this node to exist as it won't for standard dt's.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Reviewed-by: Stefan Roese <sr@denx.de>
---

diff --git a/board/Marvell/octeontx/board-fdt.c b/board/Marvell/octeontx/board-fdt.c
index 0b05ef11e9..1db2a4a267 100644
--- a/board/Marvell/octeontx/board-fdt.c
+++ b/board/Marvell/octeontx/board-fdt.c
@@ -281,20 +281,16 @@ int ft_board_setup(void *blob, struct bd_info *bd)
 	}
 
 	if (blob) {
+		/* delete cavium,bdk node if it exists */
 		offset = fdt_path_offset(blob, "/cavium,bdk");
-		if (offset < 0) {
-			printf("ERROR: FDT BDK node not found\n");
-			return offset;
-		}
-
-		/* delete node */
-		ret = fdt_del_node(blob, offset);
-		if (ret < 0) {
-			printf("WARNING : could not remove bdk node\n");
-			return ret;
+		if (offset >= 0) {
+			ret = fdt_del_node(blob, offset);
+			if (ret < 0) {
+				printf("WARNING : could not remove bdk node\n");
+				return ret;
+			}
+			debug("%s deleted bdk node\n", __func__);
 		}
-
-		debug("%s deleted bdk node\n", __func__);
 	}
 
 	return 0;