board: microchip: icicle: make both ethernets optional

A given AMP configuration for a board may make either one, or neither
of, the ethernet ports available to U-Boot. The Icicle's init code will
fail if mac1 is not present, so move it to the optional approach taken
for mac0.

Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com>

diff --git a/board/microchip/mpfs_icicle/mpfs_icicle.c b/board/microchip/mpfs_icicle/mpfs_icicle.c
index 844937951c0607449fea3bd21ac095ba83e70b4f..31523c081ee8789d0298a166e4e128b89c8e82a3 100644 (file)
--- a/board/microchip/mpfs_icicle/mpfs_icicle.c
+++ b/board/microchip/mpfs_icicle/mpfs_icicle.c
@@ -80,18 +80,6 @@ int board_late_init(void)
        char icicle_mac_addr[20];
        void *blob = (void *)gd->fdt_blob;
 
-       node = fdt_path_offset(blob, "/soc/ethernet@20112000");
-       if (node < 0) {
-               printf("No ethernet0 path offset\n");
-               return -ENODEV;
-       }
-
-       ret = fdtdec_get_byte_array(blob, node, "local-mac-address", mac_addr, 6);
-       if (ret) {
-               printf("No local-mac-address property for ethernet@20112000\n");
-               return -EINVAL;
-       }
-
        read_device_serial_number(device_serial_number, 16);
 
        /* Update MAC address with device serial number */
@@ -102,10 +90,13 @@ int board_late_init(void)
        mac_addr[4] = device_serial_number[1];
        mac_addr[5] = device_serial_number[0];
 
-       ret = fdt_setprop(blob, node, "local-mac-address", mac_addr, 6);
-       if (ret) {
-               printf("Error setting local-mac-address property for ethernet@20112000\n");
-               return -ENODEV;
+       node = fdt_path_offset(blob, "/soc/ethernet@20112000");
+       if (node >= 0) {
+               ret = fdt_setprop(blob, node, "local-mac-address", mac_addr, 6);
+               if (ret) {
+                       printf("Error setting local-mac-address property for ethernet@20112000\n");
+                       return -ENODEV;
+               }
        }
 
        icicle_mac_addr[0] = '[';