From 5251eba05ce180a5ab8401a9ba2f176402a1f577 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Wed, 25 May 2022 14:28:49 +0200
Subject: [PATCH 1/2] No code sign

---
 .github/workflows/build_esptool.yml | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build_esptool.yml b/.github/workflows/build_esptool.yml
index 68be4638b..edb15920b 100644
--- a/.github/workflows/build_esptool.yml
+++ b/.github/workflows/build_esptool.yml
@@ -8,9 +8,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
+        os: [macos-10.15, ubuntu-latest, windows-latest]
         include:
-        - os: macos-latest
+        - os: macos-10.15
           TARGET: macos
         - os: ubuntu-latest
           TARGET: linux-amd64
@@ -21,9 +21,9 @@ jobs:
       DISTPATH: esptool-${{ matrix.TARGET }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
       - name: Set up Python 3.8
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
           python-version: 3.8
       - name: Install dependencies
@@ -37,17 +37,6 @@ jobs:
           pyinstaller --distpath ./${{ env.DISTPATH }} -F --icon=build_tools/espressif.ico espefuse.py
           pyinstaller --distpath ./${{ env.DISTPATH }} -F --icon=build_tools/espressif.ico espsecure.py
           pyinstaller --distpath ./${{ env.DISTPATH }} -F --icon=build_tools/espressif.ico esp_rfc2217_server.py
-      - name: Sign binaries
-        if: matrix.os == 'windows-latest'
-        env:
-          CERTIFICATE: ${{ secrets.CERTIFICATE }}
-          CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }}
-        shell: pwsh
-        run: |
-          ./build_tools/Sign-File.ps1 -Path ./${{ env.DISTPATH }}/esptool.exe
-          ./build_tools/Sign-File.ps1 -Path ./${{ env.DISTPATH }}/espefuse.exe
-          ./build_tools/Sign-File.ps1 -Path ./${{ env.DISTPATH }}/espsecure.exe
-          ./build_tools/Sign-File.ps1 -Path ./${{ env.DISTPATH }}/esp_rfc2217_server.exe
       - name: Test binaries
         shell: bash
         run: |

From c6c5b4b339a523ea387f95ef6cca46b5fb278c28 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Wed, 25 May 2022 15:40:16 +0200
Subject: [PATCH 2/2] add single core OEM

---
 esptool/targets/esp32.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/esptool/targets/esp32.py b/esptool/targets/esp32.py
index 3cad70bad..86c91db08 100644
--- a/esptool/targets/esp32.py
+++ b/esptool/targets/esp32.py
@@ -205,8 +205,9 @@ def get_chip_description(self):
 
         chip_name = {
             0: "ESP32-S0WDQ6" if single_core else "ESP32-D0WDQ6",
-            1: "ESP32-S0WD" if single_core else "ESP32-D0WD",
-            2: "ESP32-D2WD",
+            1: "ESP32-S0WDQ5" if single_core else "ESP32-D0WDQ5",
+            2: "ESP32-S2WDQ5" if single_core else "ESP32-D2WDQ5",
+            3: "ESP32-S0WD-OEM" if single_core else "ESP32-D0WD-OEM",
             4: "ESP32-U4WDH",
             5: "ESP32-PICO-V3" if rev3 else "ESP32-PICO-D4",
             6: "ESP32-PICO-V3-02",