Updates for review part 2

Ethernet changes
- MDC, MDIO tidy up
- IPV6 local address not allocated on ethernet adapters

Add P4 to builds
Other fixes as per review

Author: AdrianSoundy

azure-pipelines-nightly.yml

@@ -579,6 +579,15 @@ jobs:
           PackageName: ESP_WROVER_KIT
           CMakePreset: ESP_WROVER_KIT
 
+        ESP32_P4_USB:
+          TargetBoard: ESP32_P4
+          TargetSeries: "esp32p4"
+          BuildOptions:
+          IDF_Target: esp32p4
+          TargetName: ESP32_P4_USB
+          PackageName: ESP32_P4_USB
+          CMakePreset: ESP32_P4_USB
+
     variables:
       DOTNET_NOLOGO: true
       # creates a counter and assigns it to the revision variable

azure-pipelines.yml

@@ -521,6 +521,15 @@ jobs:
           PackageName: ESP32_ETHERNET_KIT_1.2
           CMakePreset: ESP32_ETHERNET_KIT_1.2
 
+        ESP32_P4_UART:
+          TargetBoard: ESP32_P4
+          TargetSeries: "esp32p4"
+          BuildOptions:
+          IDF_Target: esp32p4
+          TargetName: ESP32_P4_UART
+          PackageName: ESP32_P4_UART
+          CMakePreset: ESP32_P4_UART
+
     variables:
       DOTNET_NOLOGO: true
       # creates a counter and assigns it to the revision variable

targets/ESP32/_IDF/esp32/partitions_nanoclr_2mb.csv

@@ -8,7 +8,7 @@ nvs,      data, nvs,     0x9000,   0x6000,
 phy_init, data, phy,     0xf000,   0x1000,
 # Factory area for nanoCLR - 1728k
 factory,  app, factory,  0x10000,  0x1B0000,
-# Deployment area for Managed code 12k
+# Deployment area for Managed code 192k
 deploy,   data, 0x84,    0x1C0000, 0x30000,
 # Config data for Network, Wireless, certificates, user data  64k
 config,   data, littlefs,  0x1F0000, 0x10000,

targets/ESP32/_Network/NF_ESP32_Ethernet.cpp

@@ -29,16 +29,6 @@ esp_eth_handle_t eth_handle = NULL;
 #define ETH_PHY_ADDR 0
 #endif
 
-#ifndef ETH_MDC_GPIO
-// GPIO number used by SMI MDC
-#define ETH_MDC_GPIO 23
-#endif
-
-#ifndef ETH_MDIO_GPIO
-// GPIO number used by SMI MDIO
-#define ETH_MDIO_GPIO 18
-#endif
-
 #if CONFIG_IDF_TARGET_ESP32
 #define NANO_ETH_ESP32_EMAC_DEFAULT_CONFIG()               \
     {                                                 \
@@ -156,18 +146,27 @@ esp_err_t NF_ESP32_InitialiseEthernet(uint8_t *pMacAdr)
     CPU_GPIO_ReservePin(esp32_emac_config.clock_config.rmii.clock_gpio, true); // REF_CLK IN
 #endif
 
+// If ETH_MDC_GPIO or ETH_MDIO_GPIO defined then use new values
+#ifdef ETH_MDC_GPIO
     esp32_emac_config.smi_gpio.mdc_num = ETH_MDC_GPIO;
+#endif
+
+#ifdef ETH_MDIO_GPIO
     esp32_emac_config.smi_gpio.mdio_num = ETH_MDIO_GPIO;
+#endif
+
+    ESP_LOGI(TAG, "Ethernet pins for MDC %d MDIO %d\n", esp32_emac_config.smi_gpio.mdc_num, esp32_emac_config.smi_gpio.mdio_num);
+
     esp_eth_mac_t *mac = esp_eth_mac_new_esp32(&esp32_emac_config, &mac_config);
 
     ESP_LOGI(TAG, "Ethernet mdio %d mdc %d\n", ETH_MDIO_GPIO, ETH_MDC_GPIO);
 
     // Reserve all pins used by ethernet interface
-    CPU_GPIO_ReservePin(ETH_MDIO_GPIO, true); // MDIO (18)
+    CPU_GPIO_ReservePin(esp32_emac_config.smi_gpio.mdio_num, true); // MDIO
     CPU_GPIO_ReservePin(19, true);            // TXD0
     CPU_GPIO_ReservePin(21, true);            // TX_EN
     CPU_GPIO_ReservePin(22, true);            // TXD1
-    CPU_GPIO_ReservePin(ETH_MDC_GPIO, true);  // MDC (23)
+    CPU_GPIO_ReservePin(esp32_emac_config.smi_gpio.mdc_num, true);  // MDC
     CPU_GPIO_ReservePin(25, true);            // RXD0
     CPU_GPIO_ReservePin(26, true);            // RXD1
     CPU_GPIO_ReservePin(27, true);            // CRS_DV

targets/ESP32/_common/targetHAL_Network.cpp

@@ -373,6 +373,15 @@ static void event_handler(void *arg, esp_event_base_t event_base, int32_t event_
 #ifdef PRINT_NET_EVENT
                 ets_printf("ETHERNET_EVENT_CONNECTED\n");
 #endif
+
+#if LWIP_IPV6
+                {
+                    // Create IPV6 link local address for ETH interface                
+                    struct netif *netif = esp_netif_get_handle_from_ifkey("ETH_DEF")->lwip_netif;
+                    netif_create_ip6_linklocal_address(netif, 1);
+                }
+#endif
+
                 PostAvailabilityOn(IDF_ETH_DEF);
                 break;
 

targets/ESP32/_include/nf_sockets_priv.h

@@ -34,8 +34,8 @@
  * Author: Joel Cunningham <[email protected]>
  *
  */
-#ifndef LWIP_HDR_SOCKETS_PRIV_H
-#define LWIP_HDR_SOCKETS_PRIV_H
+#ifndef NF_LWIP_HDR_SOCKETS_PRIV_H
+#define NF_LWIP_HDR_SOCKETS_PRIV_H
 
 #include "lwip/opt.h"
 
@@ -179,4 +179,4 @@ struct lwip_select_cb {
 
 #endif /* LWIP_SOCKET */
 
-#endif /* LWIP_HDR_SOCKETS_PRIV_H */
+#endif /* NF_LWIP_HDR_SOCKETS_PRIV_H */