zephyr: update to newer revision

Author: paradajz

app/boards/opendeck/olimex_esp32_poe/common.overlay

@@ -1,3 +1,31 @@
 &psram0 {
     status = "disabled";
 };
+
+&gpio0 {
+    phy_power_hold: phy_power_hold {
+        gpio-hog;
+        gpios = <12 GPIO_ACTIVE_HIGH>;
+        output-high;
+    };
+};
+
+/delete-node/ &phy;
+
+&mdio {
+    ref-clk-output-gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>;
+
+    phy: ethernet-phy@0 {
+        compatible = "ethernet-phy";
+        status = "okay";
+        reg = <0>;
+        no-reset;
+        default-speeds = "10BASE Half-Duplex", "10BASE Full-Duplex",
+                         "100BASE Half-Duplex", "100BASE Full-Duplex";
+    };
+};
+
+&eth {
+    phy-handle = <&phy>;
+    ref-clk-output-gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>;
+};

app/boards/opendeck/olimex_esp32_poe/firmware.overlay

@@ -38,25 +38,6 @@
     };
 };
 
-/delete-node/ &phy;
-
-&mdio {
-    ref-clk-output-gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>;
-
-    phy: ethernet-phy@0 {
-        compatible = "ethernet-phy";
-        reg = <0>;
-        reset-gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
-        reset-assert-duration-us = <300000>;
-        reset-deassertion-timeout-ms = <50>;
-    };
-};
-
-&eth {
-    phy-handle = <&phy>;
-    ref-clk-output-gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>;
-};
-
 opendeck_i2c_bus: &i2c0 {};
 
 &i2c0 {

west.yml

@@ -12,7 +12,7 @@ manifest:
   projects:
     - name: zephyr
       remote: zephyrproject-rtos
-      revision: 2f9f440c2fc8105e6beeb2f711e4acfdda46dcd5
+      revision: b54e0ba58fde513965d077f99c9f22125fe19d68
       import:
         name-allowlist:
           - cmsis

zephyr/patch/zephyr/esp32_eth_enable_rmii_output_clock.patch

@@ -1,15 +1,30 @@
 diff --git a/drivers/ethernet/eth_esp32.c b/drivers/ethernet/eth_esp32.c
-index 545f971ae52..25008051097 100644
+index 1b202e9b9..53d580c7e 100644
 --- a/drivers/ethernet/eth_esp32.c
 +++ b/drivers/ethernet/eth_esp32.c
-@@ -528,7 +528,9 @@ int eth_esp32_initialize(const struct device *dev)
- 
- 	if (strcmp(phy_connection_type, "rmii") == 0) {
- 		esp32_emac_iomux_init_rmii();
--#if !DT_INST_NODE_HAS_PROP(0, ref_clk_output_gpios)
-+#if DT_INST_NODE_HAS_PROP(0, ref_clk_output_gpios)
-+		emac_hal_clock_enable_rmii_output(&dev_data->hal);
-+#else
- 		eth_esp32_iomux_rmii_clk_input();
+@@ -711,8 +711,12 @@ int eth_esp32_initialize(const struct device *dev)
+ 			goto err;
+ 		}
+ #if !DT_INST_NODE_HAS_PROP(0, ref_clk_output_gpios)
+ 		eth_esp32_iomux_rmii_clk_input(rmii_clk_gpio);
  		emac_hal_clock_enable_rmii_input(&dev_data->hal);
++#else
++		/* Restore RMII REF_CLK output after MDIO init and before MAC reset. */
++		emac_hal_clock_enable_rmii_output(&dev_data->hal);
++		(void)emac_hal_ref_clock_div(&dev_data->hal, 0);
  #endif
+ 	} else if (strcmp(phy_connection_type, "mii") == 0) {
+ 		eth_esp32_iomux_init_mii();
+@@ -735,6 +739,12 @@ int eth_esp32_initialize(const struct device *dev)
+ 	/* Set dma_burst_len as ETH_DMA_BURST_LEN_32 by default */
+ 	emac_hal_dma_config_t dma_config = { .dma_burst_len = 0 };
+ 
++#if DT_INST_NODE_HAS_PROP(0, ref_clk_output_gpios)
++	/* MAC reset can clear external clock control; keep PHY REF_CLK running. */
++	emac_hal_clock_enable_rmii_output(&dev_data->hal);
++	(void)emac_hal_ref_clock_div(&dev_data->hal, 0);
++#endif
++
+ 	eth_esp32_reset_desc_chain(dev_data);
+ 	emac_hal_init_mac_default(&dev_data->hal);
+ 	emac_hal_init_dma_default(&dev_data->hal, &dma_config);

zephyr/patch/zephyr/esp32_eth_pass_multicast_frames.patch

@@ -1,12 +1,12 @@
 diff --git a/drivers/ethernet/eth_esp32.c b/drivers/ethernet/eth_esp32.c
-index 545f971ae52..21195f140a2 100644
+index 1b202e485..f4f0a8a60 100644
 --- a/drivers/ethernet/eth_esp32.c
 +++ b/drivers/ethernet/eth_esp32.c
-@@ -568,6 +568,7 @@ int eth_esp32_initialize(const struct device *dev)
+@@ -742,6 +742,7 @@ int eth_esp32_initialize(const struct device *dev)
  	eth_esp32_reset_desc_chain(dev_data);
  	emac_hal_init_mac_default(&dev_data->hal);
  	emac_hal_init_dma_default(&dev_data->hal, &dma_config);
 +	emac_ll_pass_all_multicast_enable(dev_data->hal.mac_regs, true);
 
- 	res = generate_mac_addr(dev_data->mac_addr);
- 	if (res != 0) {
+ 	/*
+ 	 * Enable the TX-finish interrupt (for TX descriptor recycling) and

zephyr/patch/zephyr/esp32_runner_handle_code_partition_offset.patch

@@ -5,12 +5,12 @@
 
  import os
 +import re
+ import shutil
+ from pathlib import Path
 
- from runners.core import RunnerCaps, ZephyrBinaryRunner
- 
-@@ -82,6 +83,31 @@
-             espidf=args.esp_idf_path, encrypt=args.esp_encrypt, no_stub=args.esp_no_stub,
-             reset_type=args.reset_type)
+@@ -141,6 +142,31 @@ class Esp32BinaryRunner(ZephyrBinaryRunner):
+             Path(prev_bin).parent.mkdir(parents=True, exist_ok=True)
+             shutil.copy2(self.app_bin, prev_bin)
 
 +    def get_chosen_code_partition_address(self):
 +        edt_path = os.path.join(self.cfg.build_dir, 'zephyr', 'edt.pickle.cmake')
@@ -37,27 +37,15 @@
 +    def get_app_address(self):
 +        return self.get_chosen_code_partition_address() or self.app_address
 +
-     def do_run(self, command, **kwargs):
+     @classmethod
+     def do_create(cls, cfg, args):
+         return Esp32BinaryRunner(cfg, args)
+@@ -184,7 +210,7 @@ class Esp32BinaryRunner(ZephyrBinaryRunner):
 
-         cmd_flash = ['esptool']
-@@ -101,7 +127,10 @@
-             self.logger.warning(
-                 '--reset-type is ignored because reset is disabled (--no-reset)')
-         if self.reset:
--            cmd_flash.extend(['--after', self.reset_type or 'hard-reset', 'write-flash', '-u'])
-+            cmd_flash.extend(['--after', self.reset_type or 'hard-reset'])
-+        else:
-+            cmd_flash.extend(['--after', 'no-reset'])
-+        cmd_flash.extend(['write-flash', '-u'])
-         cmd_flash.extend(['--flash-mode', self.flash_mode])
-         cmd_flash.extend(['--flash-freq', self.flash_freq])
-         cmd_flash.extend(['--flash-size', self.flash_size])
-@@ -109,7 +138,7 @@
-         if self.encrypt:
-             cmd_flash.extend(['--encrypt'])
+         self._append_flash_opts(cmd_flash)
 
 -        cmd_flash.extend([self.app_address, self.app_bin])
 +        cmd_flash.extend([self.get_app_address(), self.app_bin])
 
-         self.logger.info(f"Flashing esp32 chip on {self.device} ({self.baud}bps)")
-         self.check_call(cmd_flash)
+         device_str = self.device if self.device else 'auto-detect'
+         self.logger.info(