Skip to content

Commit

Permalink
Merge branch 'zephyrproject-rtos:main' into ra8-support-1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
thaoluonguw authored Apr 30, 2024
2 parents 5fb5250 + 262af56 commit 7e78180
Show file tree
Hide file tree
Showing 320 changed files with 6,664 additions and 1,460 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coding_guidelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Install Packages
run: |
sudo apt-get update || true
sudo apt-get update
sudo apt-get install coccinelle
- name: Run Coding Guildeines Checks
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doc-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
- name: install-pkgs
run: |
sudo apt-get update || true
sudo apt-get update
sudo apt-get install -y wget python3-pip git ninja-build graphviz lcov
wget --no-verbose "https://github.com/doxygen/doxygen/releases/download/Release_${DOXYGEN_VERSION//./_}/doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz"
sudo tar xf doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz -C /opt
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/footprint-tracking.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
- name: Install packages
run: |
sudo apt-get update || true
sudo apt-get update
sudo apt-get install -y python3-venv
sudo pip3 install -U setuptools wheel pip gitpython
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/issue_count.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: install-packages
run: |
sudo apt-get update || true
sudo apt-get update
sudo apt-get install discount
- uses: brcrista/summarize-issues@v4
Expand Down
29 changes: 17 additions & 12 deletions MAINTAINERS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -190,14 +190,18 @@ ARM64 arch:
- arch.arm64

ARM Platforms:
status: odd fixes
status: maintained
maintainers:
- ithinuel
files:
- boards/arm/mps*/
- boards/arm/v2m_*/
- boards/arm/fvp_base*/
- soc/arm/mps*/
- soc/arm/musca/
- soc/arm/beetle/
- soc/arm/fvp_aemv8r/aarch32/
- soc/arm/designstart/
- soc/arm/fvp_aemv8*/
- dts/arm/armv*.dtsi
labels:
- "platform: ARM"
Expand Down Expand Up @@ -237,12 +241,8 @@ MIPS arch:
- arch.mips

Ambiq Platforms:
status: maintained
maintainers:
- fkokosinski
status: odd fixes
collaborators:
- tgorochowik
- msobkowski
- aaronyegx
- RichardSWheatley
files:
Expand Down Expand Up @@ -2410,6 +2410,8 @@ Mbed TLS:
maintainers:
- d3zd3z
- ceolin
collaborators:
- ithinuel
files:
- tests/crypto/mbedtls/
- doc/services/crypto/
Expand Down Expand Up @@ -3821,6 +3823,7 @@ TF-M Integration:
- d3zd3z
collaborators:
- SebastianBoe
- ithinuel
files:
- samples/tfm_integration/
- modules/trusted-firmware-m/
Expand Down Expand Up @@ -4195,12 +4198,8 @@ West:
- "platform: Altera"

"West project: hal_ambiq":
status: maintained
maintainers:
- fkokosinski
status: odd fixes
collaborators:
- tgorochowik
- msobkowski
- aaronyegx
- RichardSWheatley
files:
Expand Down Expand Up @@ -4513,6 +4512,8 @@ West:
maintainers:
- d3zd3z
- ceolin
collaborators:
- ithinuel
files:
- modules/mbedtls/
labels:
Expand Down Expand Up @@ -4679,6 +4680,7 @@ West:
- d3zd3z
collaborators:
- SebastianBoe
- ithinuel
files:
- modules/trusted-firmware-m/
labels:
Expand All @@ -4690,6 +4692,7 @@ West:
- d3zd3z
collaborators:
- SebastianBoe
- ithinuel
files: []
labels:
- "area: TF-M"
Expand All @@ -4701,6 +4704,7 @@ West:
- sgrrzhf
collaborators:
- carlocaione
- ithinuel
files:
- modules/trusted-firmware-a/
labels:
Expand All @@ -4712,6 +4716,7 @@ West:
- d3zd3z
collaborators:
- SebastianBoe
- ithinuel
files: []
labels:
- "area: TF-M"
Expand Down
5 changes: 2 additions & 3 deletions arch/arc/core/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,8 @@ static const struct z_exc_handle exceptions[] = {
*/
static bool z_check_thread_stack_fail(const uint32_t fault_addr, uint32_t sp)
{
uint32_t guard_end, guard_start;

#if defined(CONFIG_MULTITHREADING)
uint32_t guard_end, guard_start;
const struct k_thread *thread = _current;

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

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

return false;
}
Expand Down
3 changes: 2 additions & 1 deletion arch/xtensa/core/ptables.c
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,8 @@ static uint32_t *dup_table(uint32_t *source_table)
for (i = 0; i < XTENSA_L1_PAGE_TABLE_ENTRIES; i++) {
uint32_t *l2_table, *src_l2_table;

if (is_pte_illegal(source_table[i])) {
if (is_pte_illegal(source_table[i]) ||
(i == XTENSA_MMU_L1_POS(XTENSA_MMU_PTEVADDR))) {
dst_table[i] = XTENSA_MMU_PTE_ILLEGAL;
continue;
}
Expand Down
2 changes: 1 addition & 1 deletion boards/ite/it82xx2_evb/Kconfig.it82xx2_evb
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# SPDX-License-Identifier: Apache-2.0

config BOARD_IT82XX2_EVB
select SOC_IT82202_AX
select SOC_IT82202AX
2 changes: 1 addition & 1 deletion boards/ite/it8xxx2_evb/Kconfig.it8xxx2_evb
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# SPDX-License-Identifier: Apache-2.0

config BOARD_IT8XXX2_EVB
select SOC_IT81302_BX
select SOC_IT81302BX
26 changes: 10 additions & 16 deletions boards/m5stack/m5stickc_plus/m5stickc_plus-pinctrl.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -37,24 +37,18 @@
pinmux = <SPIM2_CSEL_GPIO16>;
};

spim3_miso_gpio25: spim3_miso_gpio25 {
pinmux = <SPIM3_MISO_GPIO25>;
};

spim3_mosi_gpio15: spim3_mosi_gpio15 {
pinmux = <SPIM3_MOSI_GPIO15>;
output-low;
};

spim3_sclk_gpio13: spim3_sclk_gpio13 {
pinmux = <SPIM3_SCLK_GPIO13>;
};

spim3_csel_gpio5: spim3_csel_gpio5 {
pinmux = <SPIM3_CSEL_GPIO5>;
spim3_default: spim3_default {
group1 {
pinmux = <SPIM3_MISO_GPIO36>,
<SPIM3_SCLK_GPIO13>,
<SPIM3_CSEL_GPIO5>;
};
group2 {
pinmux = <SPIM3_MOSI_GPIO15>;
output-low;
};
};


i2c0_default: i2c0_default {
group1 {
pinmux = <I2C0_SDA_GPIO21>,
Expand Down
32 changes: 30 additions & 2 deletions boards/m5stack/m5stickc_plus/m5stickc_plus_procpu.dts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
zephyr,flash = &flash0;
zephyr,code-partition = &slot0_partition;
zephyr,rtc = &bm8563;
zephyr,display = &st7789v;
};

leds {
Expand Down Expand Up @@ -157,9 +158,36 @@
#address-cells = <1>;
#size-cells = <0>;
status = "okay";
pinctrl-0 = <&spim3_miso_gpio25 &spim3_mosi_gpio15
&spim3_sclk_gpio13 &spim3_csel_gpio5>;
pinctrl-0 = <&spim3_default>;
pinctrl-names = "default";
st7789v: st7789v@0 {
compatible = "sitronix,st7789v";
reg = <0>;
spi-max-frequency = <20000000>;
cmd-data-gpios = <&gpio0 23 GPIO_ACTIVE_LOW>;
reset-gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;

width = <135>;
height = <240>;
x-offset = <53>;
y-offset = <40>;

vcom = <0x28>;
gctrl = <0x35>;
vrhs = <0x10>;
vdvs = <0x20>;
mdac = <0x00>;
gamma = <0x01>;
colmod = <0x55>;
lcm = <0x2c>;
porch-param = [0c 0c 00 33 33];
cmd2en-param = [5a 69 02 00];
pwctrl1-param = [a4 a1];
pvgam-param = [d0 00 02 07 0a 28 32 44 42 06 0e 12 14 17];
nvgam-param = [d0 00 02 07 0a 28 31 54 47 0e 1c 17 1b 1e];
ram-param = [00 F0];
rgb-param = [40 02 14];
};
};

&timer0 {
Expand Down
1 change: 1 addition & 0 deletions boards/m5stack/m5stickc_plus/m5stickc_plus_procpu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ supported:
- pinmux
- nvs
- regulator
- display
testing:
ignore_tags:
- net
Expand Down
22 changes: 0 additions & 22 deletions boards/native/native_posix/Kconfig.defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,6 @@ choice BT_HCI_BUS_TYPE
depends on BT_HCI
endchoice

if LOG

# For native_posix we can log synchronously without any problem
# Doing so will be nicer for debugging
choice LOG_MODE
default LOG_MODE_IMMEDIATE
endchoice

endif # LOG

if CONSOLE

config POSIX_ARCH_CONSOLE
Expand All @@ -47,18 +37,6 @@ config UART_CONSOLE

endif # CONSOLE

config FLASH_SIMULATOR
default y
depends on FLASH

config USB_NATIVE_POSIX
default y
depends on USB_DEVICE_DRIVER

config EEPROM_SIMULATOR
default y
depends on EEPROM

if I2C

config EMUL
Expand Down
22 changes: 0 additions & 22 deletions boards/native/native_sim/Kconfig.defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,6 @@ choice BT_HCI_BUS_TYPE
depends on BT_HCI
endchoice

if LOG

# For native_sim we can log synchronously without any problem
# Doing so will be nicer for debugging
choice LOG_MODE
default LOG_MODE_IMMEDIATE
endchoice

endif # LOG

if CONSOLE

config POSIX_ARCH_CONSOLE
Expand All @@ -47,18 +37,6 @@ config UART_CONSOLE

endif # CONSOLE

config FLASH_SIMULATOR
default y
depends on FLASH

config USB_NATIVE_POSIX
default y
depends on USB_DEVICE_DRIVER

config EEPROM_SIMULATOR
default y
depends on EEPROM

if I2C

config EMUL
Expand Down
10 changes: 0 additions & 10 deletions boards/native/nrf_bsim/Kconfig.defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,6 @@ endif # BOARD_NRF5340BSIM_NRF5340_CPUAPP
config NRF_802154_ENCRYPTION
default n

if LOG

# For this board we can log synchronously without any problem
# Doing so will be nicer for debugging
choice LOG_MODE
default LOG_MODE_IMMEDIATE
endchoice

endif # LOG

if CONSOLE

config POSIX_ARCH_CONSOLE
Expand Down
12 changes: 6 additions & 6 deletions boards/nxp/frdm_mcxn947/frdm_mcxn947.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -92,18 +92,18 @@
label = "mcuboot";
reg = <0x00000000 DT_SIZE_K(64)>;
};
/* Note slot 0 has one additional sector,
* this is intended for use with the swap move algorithm
*/
slot0_partition: partition@10000 {
label = "image-0";
reg = <0x00010000 DT_SIZE_K(960)>;
reg = <0x00010000 DT_SIZE_K(992)>;
};
slot1_partition: partition@100000 {
label = "image-1";
reg = <0x00100000 DT_SIZE_K(960)>;
};
scratch_partition: partition@1f0000 {
label = "image-scratch";
reg = <0x001f0000 DT_SIZE_K(64)>;
reg = <0x00108000 DT_SIZE_K(984)>;
};
/* storage_partition is placed in WINBOND flash memory*/
};
};

Expand Down
Loading

0 comments on commit 7e78180

Please sign in to comment.