Skip to content

Commit 7e78180

Browse files
thaoluonguwthaoluonguw
authored
Merge branch 'zephyrproject-rtos:main' into ra8-support-1.2
2 parents 5fb5250 + 262af56 commit 7e78180

File tree

320 files changed

+6664
-1460
lines changed

Some content is hidden

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

320 files changed

+6664
-1460
lines changed

‎.github/workflows/coding_guidelines.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
2828
- name: Install Packages
2929
run: |
30-
sudo apt-get update || true
30+
sudo apt-get update
3131
sudo apt-get install coccinelle
3232
3333
- name: Run Coding Guildeines Checks

‎.github/workflows/doc-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
7474
- name: install-pkgs
7575
run: |
76-
sudo apt-get update || true
76+
sudo apt-get update
7777
sudo apt-get install -y wget python3-pip git ninja-build graphviz lcov
7878
wget --no-verbose "https://github.com/doxygen/doxygen/releases/download/Release_${DOXYGEN_VERSION//./_}/doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz"
7979
sudo tar xf doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz -C /opt

‎.github/workflows/footprint-tracking.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
5454
- name: Install packages
5555
run: |
56-
sudo apt-get update || true
56+
sudo apt-get update
5757
sudo apt-get install -y python3-venv
5858
sudo pip3 install -U setuptools wheel pip gitpython
5959

‎.github/workflows/issue_count.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
2525
- name: install-packages
2626
run: |
27-
sudo apt-get update || true
27+
sudo apt-get update
2828
sudo apt-get install discount
2929
3030
- uses: brcrista/summarize-issues@v4

‎MAINTAINERS.yml‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -190,14 +190,18 @@ ARM64 arch:
190190
- arch.arm64
191191

192192
ARM Platforms:
193-
status: odd fixes
193+
status: maintained
194+
maintainers:
195+
- ithinuel
194196
files:
195197
- boards/arm/mps*/
196198
- boards/arm/v2m_*/
199+
- boards/arm/fvp_base*/
197200
- soc/arm/mps*/
198201
- soc/arm/musca/
199202
- soc/arm/beetle/
200-
- soc/arm/fvp_aemv8r/aarch32/
203+
- soc/arm/designstart/
204+
- soc/arm/fvp_aemv8*/
201205
- dts/arm/armv*.dtsi
202206
labels:
203207
- "platform: ARM"
@@ -237,12 +241,8 @@ MIPS arch:
237241
- arch.mips
238242

239243
Ambiq Platforms:
240-
status: maintained
241-
maintainers:
242-
- fkokosinski
244+
status: odd fixes
243245
collaborators:
244-
- tgorochowik
245-
- msobkowski
246246
- aaronyegx
247247
- RichardSWheatley
248248
files:
@@ -2410,6 +2410,8 @@ Mbed TLS:
24102410
maintainers:
24112411
- d3zd3z
24122412
- ceolin
2413+
collaborators:
2414+
- ithinuel
24132415
files:
24142416
- tests/crypto/mbedtls/
24152417
- doc/services/crypto/
@@ -3821,6 +3823,7 @@ TF-M Integration:
38213823
- d3zd3z
38223824
collaborators:
38233825
- SebastianBoe
3826+
- ithinuel
38243827
files:
38253828
- samples/tfm_integration/
38263829
- modules/trusted-firmware-m/
@@ -4195,12 +4198,8 @@ West:
41954198
- "platform: Altera"
41964199

41974200
"West project: hal_ambiq":
4198-
status: maintained
4199-
maintainers:
4200-
- fkokosinski
4201+
status: odd fixes
42014202
collaborators:
4202-
- tgorochowik
4203-
- msobkowski
42044203
- aaronyegx
42054204
- RichardSWheatley
42064205
files:
@@ -4513,6 +4512,8 @@ West:
45134512
maintainers:
45144513
- d3zd3z
45154514
- ceolin
4515+
collaborators:
4516+
- ithinuel
45164517
files:
45174518
- modules/mbedtls/
45184519
labels:
@@ -4679,6 +4680,7 @@ West:
46794680
- d3zd3z
46804681
collaborators:
46814682
- SebastianBoe
4683+
- ithinuel
46824684
files:
46834685
- modules/trusted-firmware-m/
46844686
labels:
@@ -4690,6 +4692,7 @@ West:
46904692
- d3zd3z
46914693
collaborators:
46924694
- SebastianBoe
4695+
- ithinuel
46934696
files: []
46944697
labels:
46954698
- "area: TF-M"
@@ -4701,6 +4704,7 @@ West:
47014704
- sgrrzhf
47024705
collaborators:
47034706
- carlocaione
4707+
- ithinuel
47044708
files:
47054709
- modules/trusted-firmware-a/
47064710
labels:
@@ -4712,6 +4716,7 @@ West:
47124716
- d3zd3z
47134717
collaborators:
47144718
- SebastianBoe
4719+
- ithinuel
47154720
files: []
47164721
labels:
47174722
- "area: TF-M"

‎arch/arc/core/fault.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,8 @@ static const struct z_exc_handle exceptions[] = {
5353
*/
5454
static bool z_check_thread_stack_fail(const uint32_t fault_addr, uint32_t sp)
5555
{
56-
uint32_t guard_end, guard_start;
57-
5856
#if defined(CONFIG_MULTITHREADING)
57+
uint32_t guard_end, guard_start;
5958
const struct k_thread *thread = _current;
6059

6160
if (!thread) {
@@ -90,7 +89,6 @@ static bool z_check_thread_stack_fail(const uint32_t fault_addr, uint32_t sp)
9089
guard_end = thread->stack_info.start;
9190
guard_start = guard_end - Z_ARC_STACK_GUARD_SIZE;
9291
}
93-
#endif /* CONFIG_MULTITHREADING */
9492

9593
/* treat any MPU exceptions within the guard region as a stack
9694
* overflow.As some instrustions
@@ -101,6 +99,7 @@ static bool z_check_thread_stack_fail(const uint32_t fault_addr, uint32_t sp)
10199
if (fault_addr < guard_end && fault_addr >= guard_start) {
102100
return true;
103101
}
102+
#endif /* CONFIG_MULTITHREADING */
104103

105104
return false;
106105
}

‎arch/xtensa/core/ptables.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,8 @@ static uint32_t *dup_table(uint32_t *source_table)
737737
for (i = 0; i < XTENSA_L1_PAGE_TABLE_ENTRIES; i++) {
738738
uint32_t *l2_table, *src_l2_table;
739739

740-
if (is_pte_illegal(source_table[i])) {
740+
if (is_pte_illegal(source_table[i]) ||
741+
(i == XTENSA_MMU_L1_POS(XTENSA_MMU_PTEVADDR))) {
741742
dst_table[i] = XTENSA_MMU_PTE_ILLEGAL;
742743
continue;
743744
}

‎boards/ite/it82xx2_evb/Kconfig.it82xx2_evb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
config BOARD_IT82XX2_EVB
5-
select SOC_IT82202_AX
5+
select SOC_IT82202AX

‎boards/ite/it8xxx2_evb/Kconfig.it8xxx2_evb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
config BOARD_IT8XXX2_EVB
5-
select SOC_IT81302_BX
5+
select SOC_IT81302BX

‎boards/m5stack/m5stickc_plus/m5stickc_plus-pinctrl.dtsi‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,24 +37,18 @@
3737
pinmux = <SPIM2_CSEL_GPIO16>;
3838
};
3939

40-
spim3_miso_gpio25: spim3_miso_gpio25 {
41-
pinmux = <SPIM3_MISO_GPIO25>;
42-
};
43-
44-
spim3_mosi_gpio15: spim3_mosi_gpio15 {
45-
pinmux = <SPIM3_MOSI_GPIO15>;
46-
output-low;
47-
};
48-
49-
spim3_sclk_gpio13: spim3_sclk_gpio13 {
50-
pinmux = <SPIM3_SCLK_GPIO13>;
51-
};
52-
53-
spim3_csel_gpio5: spim3_csel_gpio5 {
54-
pinmux = <SPIM3_CSEL_GPIO5>;
40+
spim3_default: spim3_default {
41+
group1 {
42+
pinmux = <SPIM3_MISO_GPIO36>,
43+
<SPIM3_SCLK_GPIO13>,
44+
<SPIM3_CSEL_GPIO5>;
45+
};
46+
group2 {
47+
pinmux = <SPIM3_MOSI_GPIO15>;
48+
output-low;
49+
};
5550
};
5651

57-
5852
i2c0_default: i2c0_default {
5953
group1 {
6054
pinmux = <I2C0_SDA_GPIO21>,

0 commit comments

Comments
 (0)