]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
octeontx: do not require cavium BDK node to be present
authorTim Harvey <tharvey@gateworks.com>
Thu, 17 Jun 2021 23:31:07 +0000 (16:31 -0700)
committerStefan Roese <sr@denx.de>
Thu, 8 Jul 2021 14:40:52 +0000 (16:40 +0200)
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>
board/Marvell/octeontx/board-fdt.c

index 0b05ef11e9c6f8acf983378b27c5e4e0a230e00a..1db2a4a26750f641721a9d614552cffa2d15df5b 100644 (file)
@@ -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;