From 0a3c2a580fd29883809c2cba2eda76f65da5a0ae Mon Sep 17 00:00:00 2001
From: Bogdan Kolendovskyy <bogdan.kolendovskyy@espressif.com>
Date: Thu, 8 Aug 2024 11:35:19 +0200
Subject: [PATCH] Re-enable LAN867x option in ethernet_init

---
 .../simple-ethernet/main/idf_component.yml           |  6 +++++-
 ethernet_init/Kconfig.projbuild                      | 12 +++++-------
 ethernet_init/idf_component.yml                      |  3 +++
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/common_examples/simple-ethernet/main/idf_component.yml b/common_examples/simple-ethernet/main/idf_component.yml
index cb1c895..9722c6e 100644
--- a/common_examples/simple-ethernet/main/idf_component.yml
+++ b/common_examples/simple-ethernet/main/idf_component.yml
@@ -4,4 +4,8 @@ dependencies:
   ethernet_init:
     version: '*'
     # For local development use the local copy of the component
-    override_path: '../../../ethernet_init/'
\ No newline at end of file
+    override_path: '../../../'
+  espressif/lan867x:
+    rules:
+       - if: "target in [esp32, esp32p4]"
+    override_path: '../../../'
diff --git a/ethernet_init/Kconfig.projbuild b/ethernet_init/Kconfig.projbuild
index 09f6b81..70a25a2 100644
--- a/ethernet_init/Kconfig.projbuild
+++ b/ethernet_init/Kconfig.projbuild
@@ -63,13 +63,11 @@ menu "Ethernet Configuration"
                         KSZ8051, KSZ8061, KSZ8081, KSZ8091
                     Goto https://www.microchip.com for more information about them.
 
-            # TODO: un-hide this option once processing of Matches and Rules is fixed in  IDF Component Manager and so LAN867x component can be conditionally included. 
-            #config ETHERNET_PHY_LAN867X
-            #    bool "LAN867x"
-            #    depends on !ETHERNET_INTERNAL_SUPPORT
-            #    help
-            #        The LAN8670/1/2 is a high-performance 10BASE-T1S single-pair Ethernet PHY transceiver for 10 Mbit/s half-duplex networking over a single pair of conductors
-            #        Goto https://www.microchip.com for more information about them.
+            config ETHERNET_PHY_LAN867X
+                bool "LAN867x"
+                help
+                    The LAN8670/1/2 is a high-performance 10BASE-T1S single-pair Ethernet PHY transceiver for 10 Mbit/s half-duplex networking over a single pair of conductors
+                    Goto https://www.microchip.com for more information about them.
         endchoice # ETHERNET_PHY_MODEL
 
         config ETHERNET_MDC_GPIO
diff --git a/ethernet_init/idf_component.yml b/ethernet_init/idf_component.yml
index 9bcf08f..5c86594 100644
--- a/ethernet_init/idf_component.yml
+++ b/ethernet_init/idf_component.yml
@@ -1,4 +1,7 @@
 dependencies:
+  espressif/lan867x: 
+    rules:
+       - if: "target in [esp32, esp32p4]"
   idf:
     version: '>=5.1'
   ch390: