Skip to content

Commit 64f4255

Browse files
committed
Disable Memprot to allow loading external elfs
1 parent beb96c7 commit 64f4255

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

.github/workflows/cron.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ on:
1313
# * * * * *
1414
- cron: '0 */6 * * *'
1515

16+
defaults:
17+
run:
18+
shell: bash
19+
1620
jobs:
1721
run:
1822
name: Build with IDF ${{ matrix.idf_branch }}
@@ -31,7 +35,6 @@ jobs:
3135
GIT_AUTHOR_EMAIL: ${{ secrets.PUSH_EMAIL }}
3236
GIT_COMMITTER_EMAIL: ${{ secrets.PUSH_EMAIL }}
3337
IDF_BRANCH: ${{ matrix.idf_branch }}
34-
shell: bash
3538
run: |
3639
git checkout ${{ matrix.idf_branch }}
3740
bash ./build.sh -d
@@ -45,7 +48,11 @@ jobs:
4548
# check:
4649
# name: Check if result should be deployed
4750
# runs-on: ubuntu-latest
51+
# strategy:
52+
# matrix:
53+
# branch: [release/v5.1, release/v4.4] #, release/v3.3]
4854
# outputs:
55+
# idf_branch: ${{ steps.check.outputs.idf_branch }}
4956
# idf_commit: ${{ steps.check.outputs.idf_commit }}
5057
# ar_branch: ${{ steps.check.outputs.ar_branch }}
5158
# ar_new_commit_message: ${{ steps.check.outputs.ar_new_commit_message }}
@@ -64,12 +71,14 @@ jobs:
6471
# GITHUB_TOKEN: ${{ secrets.PUSH_TOKEN }}
6572
# GIT_AUTHOR_EMAIL: ${{ secrets.PUSH_EMAIL }}
6673
# GIT_COMMITTER_EMAIL: ${{ secrets.PUSH_EMAIL }}
74+
# IDF_BRANCH: ${{ matrix.idf_branch }}
6775
# run: bash ./tools/check-deploy-needed.sh
6876

6977
# build:
7078
# name: Build Libs for ${{ matrix.target }}
7179
# runs-on: ubuntu-latest
7280
# needs: check
81+
# if: needs.check.outputs.libs_has_commit == '0' || needs.check.outputs.ar_has_commit == '0'
7382
# strategy:
7483
# matrix:
7584
# target: [esp32, esp32s2, esp32s3, esp32c3, esp32c6, esp32h2]
@@ -99,6 +108,7 @@ jobs:
99108
# GITHUB_TOKEN: ${{ secrets.PUSH_TOKEN }}
100109
# GIT_AUTHOR_EMAIL: ${{ secrets.PUSH_EMAIL }}
101110
# GIT_COMMITTER_EMAIL: ${{ secrets.PUSH_EMAIL }}
111+
# IDF_BRANCH: ${{ needs.check.outputs.idf_branch }}
102112
# IDF_COMMIT: ${{ needs.check.outputs.idf_commit }}
103113
# AR_BRANCH: ${{ needs.check.outputs.ar_branch }}
104114
# AR_NEW_COMMIT_MESSAGE: ${{ needs.check.outputs.ar_new_commit_message }}

configs/defconfig.esp32s2

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ CONFIG_ESP32S2_KEEP_USB_ALIVE=y
55
# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
66
# CONFIG_USE_WAKENET is not set
77
# CONFIG_USE_MULTINET is not set
8-
CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
8+
CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
9+
CONFIG_ESP_SYSTEM_MEMPROT_FEATURE=n

configs/defconfig.esp32s3

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES_TWO=y
66
# CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND is not set
77
# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1 is not set
88
CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
9-
CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=3120
9+
CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=3120
10+
CONFIG_ESP_SYSTEM_MEMPROT_FEATURE=n

0 commit comments

Comments
 (0)