Skip to content

Commit c727e0e

Browse files
pankorepankore
committed
[Realtek] Fix conflict
2 parents 4e82601 + 7c1d6f7 commit c727e0e

File tree

564 files changed

+32051
-22386
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

564 files changed

+32051
-22386
lines changed

‎.devcontainer/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -54,24 +54,24 @@ RUN curl https://raw.githubusercontent.com/restyled-io/restyler/master/bin/resty
5454
&& chmod +x /usr/local/bin/restyle-path \
5555
&& :
5656

57-
RUN mkdir -p /opt/sdk/sdks/ \
57+
RUN mkdir -p /opt/android/sdk \
5858
&& chown -R $USERNAME:$USERNAME \
59-
/opt/sdk/sdks/ `# NXP uses a patch_sdk script to change SDK files` \
59+
/opt/android/sdk `# NXP uses a patch_sdk script to change SDK files` \
6060
$ANDROID_HOME \
6161
$IDF_TOOLS_PATH \
6262
&& find $AMEBA_PATH -name "inc_lp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
6363
&& find $AMEBA_PATH -name "inc_hp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
6464
&& find $AMEBA_PATH -name "project_lp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
6565
&& find $AMEBA_PATH -name "project_hp" -print0 | xargs -0 chown -R $USERNAME:$USERNAME \
6666
&& chmod -R +x \
67-
$ANDROID_HOME/tools/bin `# sdkmanager for accepting licenses`\
67+
$ANDROID_HOME/cmdline-tools/10.0/bin `# sdkmanager for accepting licenses`\
6868
&& chmod -R +w \
6969
$IDF_TOOLS_PATH \
7070
&& find $AMEBA_PATH -name "inc_lp" -print0 | xargs -0 chmod -R +w \
7171
&& find $AMEBA_PATH -name "inc_hp" -print0 | xargs -0 chmod -R +w \
7272
&& find $AMEBA_PATH -name "project_lp" -print0 | xargs -0 chmod -R +w \
7373
&& find $AMEBA_PATH -name "project_hp" -print0 | xargs -0 chmod -R +w \
74-
# Safe directory is preffered over chown.
74+
# Safe directory is preferred over chown.
7575
&& git config --global --add safe.directory "*" \
7676
&& :
7777

‎.github/.wordlist.txt

+9
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ amebad
4949
amebaiot
5050
AmebaZ
5151
amebaz2
52+
ANC
5253
announcementReason
5354
AnnounceOTAProvider
5455
AnnounceOTAProviderRequest
@@ -85,6 +86,7 @@ ASR
8586
AssertionError
8687
AST
8788
ASYNC
89+
ATL
8890
ATLs
8991
atomics
9092
att
@@ -114,6 +116,7 @@ avahi
114116
avL
115117
AwaitNextAction
116118
AXXXF
119+
Axxxx
117120
AYNJV
118121
babaf
119122
backend
@@ -507,6 +510,7 @@ entrypoint
507510
enum
508511
Enums
509512
env
513+
EP
510514
epochKey
511515
epochStartTime
512516
eq
@@ -538,6 +542,7 @@ ExtendedPAN
538542
ExtensionEntry
539543
extern
540544
extpanid
545+
Exx
541546
FabricId
542547
fabricIdx
543548
fabricIndex
@@ -585,6 +590,7 @@ fuzzer
585590
fuzzers
586591
fuzztest
587592
FW
593+
Fxx
588594
gbl
589595
gcloud
590596
GDB
@@ -684,6 +690,7 @@ ICMP
684690
IDF
685691
IDL
686692
IDLs
693+
IDM
687694
idt
688695
idx
689696
ifconfig
@@ -1236,6 +1243,7 @@ RPi's
12361243
RPis
12371244
RSA
12381245
rsn
1246+
Rsp
12391247
RSSI
12401248
RST
12411249
rsync
@@ -1623,6 +1631,7 @@ xFFFF
16231631
xfffff
16241632
xFFFFFFEFFFFFFFFF
16251633
XMLPICSValidator
1634+
XMLs
16261635
xtensa
16271636
xvzf
16281637
xwayland

‎.github/dependabot.yml

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ updates:
3838
- dependency-name: "third_party/java_deps/repo"
3939
- dependency-name: "third_party/jlink/repo"
4040
- dependency-name: "third_party/jsoncpp/repo"
41+
- dependency-name: "third_party/libdatachannel/repo"
4142
- dependency-name: "third_party/libwebsockets/repo"
4243
- dependency-name: "third_party/lwip/repo"
4344
- dependency-name: "third_party/mbed-mcu-boot/repo"

‎.github/workflows/bloat_check.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
runs-on: ubuntu-latest
3535

3636
container:
37-
image: ghcr.io/project-chip/chip-build:104
37+
image: ghcr.io/project-chip/chip-build:112
3838

3939
steps:
4040
- name: Checkout

‎.github/workflows/build.yaml

+11-7
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
if: github.actor != 'restyled-io[bot]'
4444

4545
container:
46-
image: ghcr.io/project-chip/chip-build:104
46+
image: ghcr.io/project-chip/chip-build:112
4747
volumes:
4848
- "/:/runner-root-volume"
4949
- "/tmp/log_output:/tmp/test_logs"
@@ -131,7 +131,7 @@ jobs:
131131
if: github.actor != 'restyled-io[bot]'
132132

133133
container:
134-
image: ghcr.io/project-chip/chip-build:104
134+
image: ghcr.io/project-chip/chip-build:112
135135
volumes:
136136
- "/:/runner-root-volume"
137137
- "/tmp/log_output:/tmp/test_logs"
@@ -211,11 +211,16 @@ jobs:
211211
- name: Find changed files
212212
id: changed-files
213213
uses: tj-actions/changed-files@v45
214+
with:
215+
# Exclude all files under "third_party/"
216+
files-ignore: |
217+
third_party/
218+
214219
- name: Clang-tidy validation
215220
# NOTE: clang-tidy crashes on CodegenDataModel_Write due to Nullable/std::optional check.
216221
# See https://github.com/llvm/llvm-project/issues/97426
217222
env:
218-
ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
223+
ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.changed_files }}
219224
run: |
220225
touch out/changed_files.txt
221226
for file in ${ALL_CHANGED_FILES}; do
@@ -300,7 +305,7 @@ jobs:
300305
if: github.actor != 'restyled-io[bot]'
301306

302307
container:
303-
image: ghcr.io/project-chip/chip-build:104
308+
image: ghcr.io/project-chip/chip-build:112
304309
volumes:
305310
- "/:/runner-root-volume"
306311
- "/tmp/log_output:/tmp/test_logs"
@@ -365,7 +370,7 @@ jobs:
365370
if: github.actor != 'restyled-io[bot]'
366371

367372
container:
368-
image: ghcr.io/project-chip/chip-build:104
373+
image: ghcr.io/project-chip/chip-build:112
369374
volumes:
370375
- "/:/runner-root-volume"
371376
- "/tmp/log_output:/tmp/test_logs"
@@ -487,7 +492,7 @@ jobs:
487492
runs-on: ubuntu-latest
488493

489494
container:
490-
image: ghcr.io/project-chip/chip-build:104
495+
image: ghcr.io/project-chip/chip-build:112
491496
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
492497
net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0"
493498

@@ -502,4 +507,3 @@ jobs:
502507

503508
- name: Run Build Coverage
504509
run: ./scripts/build_coverage.sh --yaml
505-

‎.github/workflows/chef.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build:104
39+
image: ghcr.io/project-chip/chip-build:112
4040
options: --user root
4141

4242
steps:
@@ -57,7 +57,7 @@ jobs:
5757
if: github.actor != 'restyled-io[bot]'
5858

5959
container:
60-
image: ghcr.io/project-chip/chip-build-esp32:104
60+
image: ghcr.io/project-chip/chip-build-esp32:112
6161
options: --user root
6262

6363
steps:
@@ -78,7 +78,7 @@ jobs:
7878
if: github.actor != 'restyled-io[bot]'
7979

8080
container:
81-
image: ghcr.io/project-chip/chip-build-nrf-platform:104
81+
image: ghcr.io/project-chip/chip-build-nrf-platform:112
8282
options: --user root
8383

8484
steps:
@@ -99,7 +99,7 @@ jobs:
9999
if: github.actor != 'restyled-io[bot]'
100100

101101
container:
102-
image: ghcr.io/project-chip/chip-build-telink:104
102+
image: ghcr.io/project-chip/chip-build-telink:112
103103
options: --user root
104104

105105
steps:
@@ -111,7 +111,7 @@ jobs:
111111
platform: telink
112112
# - name: Update Zephyr to specific revision (for developers purpose)
113113
# shell: bash
114-
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 52c23bb5bfa7b08fb2499fda8c34cbd3418e0c1d"
114+
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py ce4027fc0768b8509758af2e43f74e3fd2c7d58d"
115115
- name: CI Examples Telink
116116
shell: bash
117117
run: |

‎.github/workflows/doxygen.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484

8585
runs-on: ubuntu-latest
8686
container:
87-
image: ghcr.io/project-chip/chip-build-doxygen:104
87+
image: ghcr.io/project-chip/chip-build-doxygen:112
8888

8989
if: github.actor != 'restyled-io[bot]'
9090

‎.github/workflows/examples-ameba.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
if: github.actor != 'restyled-io[bot]'
4040

4141
container:
42-
image: ghcr.io/project-chip/chip-build-ameba:104
42+
image: ghcr.io/project-chip/chip-build-ameba:112
4343
options: --user root
4444

4545
steps:

‎.github/workflows/examples-asr.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
if: github.actor != 'restyled-io[bot]'
3838

3939
container:
40-
image: ghcr.io/project-chip/chip-build-asr:104
40+
image: ghcr.io/project-chip/chip-build-asr:112
4141
options: --user root
4242

4343
steps:

‎.github/workflows/examples-bouffalolab.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
if: github.actor != 'restyled-io[bot]'
3939

4040
container:
41-
image: ghcr.io/project-chip/chip-build-bouffalolab:104
41+
image: ghcr.io/project-chip/chip-build-bouffalolab:112
4242
volumes:
4343
- "/tmp/bloat_reports:/tmp/bloat_reports"
4444
steps:

‎.github/workflows/examples-cc13xx_26xx.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
if: github.actor != 'restyled-io[bot]'
4343

4444
container:
45-
image: ghcr.io/project-chip/chip-build-ti:104
45+
image: ghcr.io/project-chip/chip-build-ti:112
4646
volumes:
4747
- "/tmp/bloat_reports:/tmp/bloat_reports"
4848
steps:

‎.github/workflows/examples-cc32xx.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
if: github.actor != 'restyled-io[bot]'
4242

4343
container:
44-
image: ghcr.io/project-chip/chip-build-ti:104
44+
image: ghcr.io/project-chip/chip-build-ti:112
4545
volumes:
4646
- "/tmp/bloat_reports:/tmp/bloat_reports"
4747
steps:

‎.github/workflows/examples-efr32.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
if: github.actor != 'restyled-io[bot]'
4242

4343
container:
44-
image: ghcr.io/project-chip/chip-build-efr32:104
44+
image: ghcr.io/project-chip/chip-build-efr32:112
4545
volumes:
4646
- "/tmp/bloat_reports:/tmp/bloat_reports"
4747
steps:

‎.github/workflows/examples-esp32.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
if: github.actor != 'restyled-io[bot]'
3838

3939
container:
40-
image: ghcr.io/project-chip/chip-build-esp32:104
40+
image: ghcr.io/project-chip/chip-build-esp32:112
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343

@@ -132,7 +132,7 @@ jobs:
132132
if: github.actor != 'restyled-io[bot]' && github.repository_owner == 'espressif'
133133

134134
container:
135-
image: ghcr.io/project-chip/chip-build-esp32:104
135+
image: ghcr.io/project-chip/chip-build-esp32:112
136136
volumes:
137137
- "/tmp/bloat_reports:/tmp/bloat_reports"
138138

‎.github/workflows/examples-infineon.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
if: github.actor != 'restyled-io[bot]'
3939

4040
container:
41-
image: ghcr.io/project-chip/chip-build-infineon:104
41+
image: ghcr.io/project-chip/chip-build-infineon:112
4242
env:
4343
# TODO: this should probably be part of the dockerfile itself
4444
CY_TOOLS_PATHS: /opt/Tools/ModusToolbox/tools_3.2

‎.github/workflows/examples-linux-arm.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
if: github.actor != 'restyled-io[bot]'
3838

3939
container:
40-
image: ghcr.io/project-chip/chip-build-crosscompile:104
40+
image: ghcr.io/project-chip/chip-build-crosscompile:112
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343

‎.github/workflows/examples-linux-imx.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
if: github.actor != 'restyled-io[bot]'
3838

3939
container:
40-
image: ghcr.io/project-chip/chip-build-imx:104
40+
image: ghcr.io/project-chip/chip-build-imx:112
4141

4242
steps:
4343
- name: Checkout

‎.github/workflows/examples-linux-standalone.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
if: github.actor != 'restyled-io[bot]'
3838

3939
container:
40-
image: ghcr.io/project-chip/chip-build:104
40+
image: ghcr.io/project-chip/chip-build:112
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343

‎.github/workflows/examples-linux-tv-casting-app.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
if: github.actor != 'restyled-io[bot]'
3838

3939
container:
40-
image: ghcr.io/project-chip/chip-build:104
40+
image: ghcr.io/project-chip/chip-build:112
4141

4242
steps:
4343
- name: Checkout

‎.github/workflows/examples-mw320.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
if: github.actor != 'restyled-io[bot]'
4141

4242
container:
43-
image: ghcr.io/project-chip/chip-build:104
43+
image: ghcr.io/project-chip/chip-build:112
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
steps:

‎.github/workflows/examples-nrfconnect.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
if: github.actor != 'restyled-io[bot]'
4141

4242
container:
43-
image: ghcr.io/project-chip/chip-build-nrf-platform:104
43+
image: ghcr.io/project-chip/chip-build-nrf-platform:112
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646

‎.github/workflows/examples-nuttx.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
if: github.actor != 'restyled-io[bot]'
3939

4040
container:
41-
image: ghcr.io/project-chip/chip-build-nuttx:104
41+
image: ghcr.io/project-chip/chip-build-nuttx:112
4242
volumes:
4343
- "/tmp/bloat_reports:/tmp/bloat_reports"
4444
steps:

0 commit comments

Comments
 (0)