Merge branch 'bugfix/eth_opencore' into 'master'

esp_eth: Fix open-cores explicit inclusion

See merge request espressif/esp-idf!17551

components/esp_eth/src/esp_eth_mac_openeth.c

@@ -1,16 +1,8 @@
-// Copyright 2019 Espressif Systems (Shanghai) PTE LTD
+/*
-//
+ * SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD
-// Licensed under the Apache License, Version 2.0 (the "License");
+ *
-// you may not use this file except in compliance with the License.
+ * SPDX-License-Identifier: Apache-2.0
-// You may obtain a copy of the License at
+ */
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 // This is a driver for OpenCores Ethernet MAC (https://opencores.org/projects/ethmac).
 // Espressif chips do not use this MAC, but it is supported in QEMU
@@ -31,9 +23,9 @@
 #include "esp_intr_alloc.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
-#include "freertos/semphr.h"
 #include "hal/cpu_hal.h"
 #include "openeth.h"
+#include "esp_mac.h"
 
 static const char *TAG = "opencores.emac";
 

tools/ci/check_copyright_ignore.txt

@@ -422,7 +422,6 @@ components/esp32/include/rom/tjpgd.h
 components/esp32/include/rom/uart.h
 components/esp_eth/include/eth_phy_regs_struct.h
 components/esp_eth/src/dm9051.h
-components/esp_eth/src/esp_eth_mac_openeth.c
 components/esp_eth/src/esp_eth_mac_w5500.c
 components/esp_eth/src/esp_eth_phy.c
 components/esp_eth/src/ksz8851.h