Skip to content

Commit

Permalink
Merge branch 'zephyrproject-rtos:main' into f75303
Browse files Browse the repository at this point in the history
  • Loading branch information
panikiel authored Jul 31, 2023
2 parents 7588a61 + a0a9539 commit 5d315d5
Show file tree
Hide file tree
Showing 492 changed files with 14,920 additions and 2,518 deletions.
29 changes: 15 additions & 14 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
/soc/arm64/arm/fvp_aemv8a/ @carlocaione
/soc/arm64/intel_socfpga/* @siclim
/soc/Kconfig @tejlmand @galak @nashif @nordicjm
/submanifests/* @mbolivar-nordic
/submanifests/* @mbolivar-ampere
/arch/x86/ @jhedberg @nashif
/arch/nios2/ @nashif
/arch/posix/ @aescolar @daor-oti
Expand Down Expand Up @@ -111,6 +111,7 @@
/boards/arm/cc26x2r1_launchxl/ @bwitherspoon
/boards/arm/cc3220sf_launchxl/ @vanti
/boards/arm/cy8ckit_062_ble/ @ifyall @npal-cy
/boards/arm/cy8ckit_062s4/ @DaWei8823
/boards/arm/cy8ckit_062_wifi_bt/ @ifyall @npal-cy
/boards/arm/cy8cproto_062_4343w/ @ifyall @npal-cy
/boards/arm/disco_l475_iot1/ @erwango
Expand Down Expand Up @@ -166,7 +167,7 @@
/boards/arm/rcar_h3ulcb/ @aaillet @pmarzin
/boards/arm/ubx_bmd345eval_nrf52840/ @Navin-Sankar @brec-u-blox
/boards/arm/nrf5340_audio_dk_nrf5340 @koffes @alexsven @erikrobstad @rick1082 @gWacey
/boards/common/ @mbolivar-nordic
/boards/common/ @mbolivar-ampere
/boards/deprecated.cmake @tejlmand
/boards/mips/ @frantony
/boards/nios2/ @nashif
Expand Down Expand Up @@ -215,7 +216,7 @@
/doc/CMakeLists.txt @carlescufi
/doc/_scripts/ @carlescufi
/doc/connectivity/bluetooth/ @alwa-nordic @jhedberg @Vudentz
/doc/build/dts/ @galak @mbolivar-nordic
/doc/build/dts/ @galak @mbolivar-ampere
/doc/build/sysbuild/ @tejlmand @nordicjm
/doc/hardware/peripherals/canbus/ @alexanderwachter @henrikbrixandersen
/doc/security/ @ceolin @d3zd3z
Expand Down Expand Up @@ -321,8 +322,8 @@
/drivers/i2c/Kconfig.i2c_emul @sjg20
/drivers/i2c/Kconfig.it8xxx2 @GTLin08
/drivers/i2c/target/*eeprom* @henrikbrixandersen
/drivers/i2c/Kconfig.test @mbolivar-nordic
/drivers/i2c/i2c_test.c @mbolivar-nordic
/drivers/i2c/Kconfig.test @mbolivar-ampere
/drivers/i2c/i2c_test.c @mbolivar-ampere
/drivers/i2c/*rcar* @aaillet
/drivers/i2s/*litex* @mateusz-holenko @kgugala @pgielda
/drivers/i2s/i2s_ll_stm32* @avisconti
Expand Down Expand Up @@ -353,7 +354,7 @@
/drivers/kscan/*ft5336* @MaureenHelm
/drivers/kscan/*ht16k33* @henrikbrixandersen
/drivers/led/ @Mani-Sadhasivam
/drivers/led_strip/ @mbolivar-nordic
/drivers/led_strip/ @mbolivar-ampere
/drivers/lora/ @Mani-Sadhasivam
/drivers/mbox/ @carlocaione
/drivers/misc/ @tejlmand
Expand Down Expand Up @@ -611,7 +612,7 @@
/include/zephyr/drivers/pcie/ @dcpleung
/include/zephyr/drivers/hwinfo.h @alexanderwachter
/include/zephyr/drivers/led.h @Mani-Sadhasivam
/include/zephyr/drivers/led_strip.h @mbolivar-nordic
/include/zephyr/drivers/led_strip.h @mbolivar-ampere
/include/zephyr/drivers/sensor.h @MaureenHelm
/include/zephyr/drivers/smbus.h @finikorg
/include/zephyr/drivers/spi.h @tbursztyka
Expand Down Expand Up @@ -769,7 +770,7 @@
/scripts/build/gen_app_partitions.py @dcpleung @nashif
scripts/build/gen_image_info.py @tejlmand
/scripts/get_maintainer.py @nashif
/scripts/dts/ @mbolivar-nordic @galak
/scripts/dts/ @mbolivar-ampere @galak
/scripts/release/ @nashif
/scripts/ci/ @nashif
/scripts/ci/check_compliance.py @nashif @carlescufi
Expand All @@ -778,24 +779,24 @@ scripts/build/gen_image_info.py @tejlmand
/scripts/build/gen_kobject_list.py @dcpleung @nashif
/scripts/build/gen_kobject_placeholders.py @dcpleung
/scripts/build/gen_syscalls.py @dcpleung @nashif
/scripts/list_boards.py @mbolivar-nordic
/scripts/list_boards.py @mbolivar-ampere
/scripts/build/process_gperf.py @dcpleung @nashif
/scripts/build/gen_relocate_app.py @dcpleung
/scripts/generate_usb_vif/ @madhurimaparuchuri
/scripts/requirements*.txt @mbolivar-nordic @galak @nashif
/scripts/requirements*.txt @mbolivar-ampere @galak @nashif
/scripts/tests/build/test_subfolder_list.py @rmstoi
/scripts/tracing/ @nashif
/scripts/pylib/twister/ @nashif
/scripts/twister @nashif
/scripts/series-push-hook.sh @erwango
/scripts/utils/pinctrl_nrf_migrate.py @gmarull
/scripts/utils/migrate_mcumgr_kconfigs.py @de-nordic
/scripts/west_commands/ @mbolivar-nordic
/scripts/west_commands/ @mbolivar-ampere
/scripts/west_commands/blobs.py @carlescufi
/scripts/west_commands/fetchers/ @carlescufi
/scripts/west_commands/runners/gd32isp.py @mbolivar-nordic @nandojve
/scripts/west_commands/tests/test_gd32isp.py @mbolivar-nordic @nandojve
/scripts/west-commands.yml @mbolivar-nordic
/scripts/west_commands/runners/gd32isp.py @mbolivar-ampere @nandojve
/scripts/west_commands/tests/test_gd32isp.py @mbolivar-ampere @nandojve
/scripts/west-commands.yml @mbolivar-ampere
/scripts/zephyr_module.py @tejlmand
/scripts/build/uf2conv.py @petejohanson
/scripts/build/user_wordsize.py @cfriedt
Expand Down
2 changes: 1 addition & 1 deletion Kconfig.zephyr
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ menu "Build and Link Features"

menu "Linker Options"

choice
choice LINKER_ORPHAN_CONFIGURATION
prompt "Linker Orphan Section Handling"
default LINKER_ORPHAN_SECTION_WARN

Expand Down
6 changes: 3 additions & 3 deletions MAINTAINERS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ DFU:
Devicetree:
status: maintained
maintainers:
- mbolivar-nordic
- mbolivar-ampere
- galak
files:
- scripts/dts/
Expand Down Expand Up @@ -1088,7 +1088,7 @@ Release Notes:
"Drivers: LED Strip":
status: maintained
maintainers:
- mbolivar-nordic
- mbolivar-ampere
- simonguinot
files:
- drivers/led_strip/
Expand Down Expand Up @@ -2755,7 +2755,7 @@ VFS:
West:
status: maintained
maintainers:
- mbolivar-nordic
- mbolivar-ampere
collaborators:
- carlescufi
- swinslow
Expand Down
20 changes: 20 additions & 0 deletions arch/posix/core/posix_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
#define ERPREFIX PREFIX"error on "
#define NO_MEM_ERR PREFIX"Can't allocate memory\n"

#define PC_ENABLE_CANCEL 0 /* See Note.c1 */
#define PC_ALLOC_CHUNK_SIZE 64
#define PC_REUSE_ABORTED_ENTRIES 0
/* tests/kernel/threads/scheduling/schedule_api fails when setting
Expand Down Expand Up @@ -363,6 +364,10 @@ int posix_new_thread(void *ptr)
threads_table[t_slot].thead_cnt = thread_create_count++;
threads_table[t_slot].t_status = ptr;

/*
* Note: If you are here due to a valgrind reported memory leak in
* pthread_create() please use the provided valgrind.supp suppression file.
*/
PC_SAFE_CALL(pthread_create(&threads_table[t_slot].thread,
NULL,
posix_thread_starter,
Expand Down Expand Up @@ -422,6 +427,7 @@ void posix_arch_clean_up(void)

terminate = true;

#if (PC_ENABLE_CANCEL)
for (int i = 0; i < threads_table_size; i++) {
if (threads_table[i].state != USED) {
continue;
Expand All @@ -435,6 +441,7 @@ void posix_arch_clean_up(void)
}
/* LCOV_EXCL_STOP */
}
#endif

free(threads_table);
threads_table = NULL;
Expand Down Expand Up @@ -516,4 +523,17 @@ int posix_arch_get_unique_thread_id(int thread_idx)
* Some other code will never or only very rarely trigger and is therefore
* excluded with LCOV_EXCL_LINE
*
*
* Notes about (memory) cleanup:
*
* Note.c1:
*
* In some very rare cases in very loaded machines, a race in the glibc pthread_cancel()
* seems to be triggered.
* In this, the cancelled thread cleanup overtakes the pthread_cancel() code, and frees the
* pthread structure before pthread_cancel() has finished, resulting in a dereference into already
* free'd memory, and therefore a segfault.
* Calling pthread_cancel() during cleanup is not required beyond preventing a valgrind
* memory leak report (all threads will be canceled immediately on exit).
* Therefore we do not do this, to avoid this very rare crashes.
*/
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
};
};

&usb0 {
zephyr_udc0: &usb0 {
status = "okay";

pinctrl-0 = <&usb_dc_default>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

/ {
model = "Adafruit Feather STM32F405 Express";
compatible = "st,adafruit_feather_stm32f405", "st,stm32f405";
compatible = "adafruit,adafruit_feather_stm32f405", "st,stm32f405";

chosen {
zephyr,console = &usart3;
Expand Down
6 changes: 0 additions & 6 deletions boards/arm/b_g474e_dpow1/b_g474e_dpow1.dts
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,6 @@
};
};

cpus {
cpu@0 {
cpu-power-states = <&stop0 &stop1>;
};
};

aliases {
led0 = &blue_led_2;
led1 = &orange_led_3;
Expand Down
4 changes: 0 additions & 4 deletions boards/arm/b_u585i_iot02a/b_u585i_iot02a-common.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,6 @@
apb3-prescaler = <1>;
};

&cpu0 {
cpu-power-states = <&stop0 &stop1 &stop2>;
};

&lptim1 {
clocks = <&rcc STM32_CLOCK_BUS_APB3 0x00000800>,
<&rcc STM32_SRC_LSE LPTIM1_SEL(3)>;
Expand Down
2 changes: 1 addition & 1 deletion boards/arm/black_f407ve/black_f407ve.dts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

/ {
model = "black_f407ve board";
compatible = "st,stm32f407";
compatible = "black-stm32f407";

chosen {
zephyr,console = &usart1;
Expand Down
6 changes: 6 additions & 0 deletions boards/arm/cy8ckit_062s4/Kconfig.board
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Copyright (c) 2023 David Ullmann
# SPDX-License-Identifier: Apache-2.0

config BOARD_CY8CKIT_062S4_M4
bool "PSoC 62S4 pioneer kit"
depends on SOC_CY8C6244LQI_S4D92
10 changes: 10 additions & 0 deletions boards/arm/cy8ckit_062s4/Kconfig.defconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Copyright (c) 2023 David Ullmann
# SPDX-License-Identifier: Apache-2.0

if BOARD_CY8CKIT_062S4_M4

config BOARD
default "cy8ckit_062s4_m4" if BOARD_CY8CKIT_062S4_M4


endif #BOARD_CY8CKIT_062S4_M4
5 changes: 5 additions & 0 deletions boards/arm/cy8ckit_062s4/board.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Copyright (c) 2023 David Ullmann
# spdx-license-identifier: apache-2.0

board_runner_args(pyocd "--target=cy8c6xxa")
include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
57 changes: 57 additions & 0 deletions boards/arm/cy8ckit_062s4/cy8ckit_062s4_m4.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
/*
* Copyright (c) 2023 David Ullmann
* SPDX-License-Identifier: Apache-2.0
*/

/dts-v1/;
#include <infineon/psoc6/mpns/CY8C6244LQI_S4D92.dtsi>

/ {
model = "Infineon PSoC 62S4 Pioneer Kit";
compatible ="cypress,psoc6";
chosen {
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,console = &uart2;
zephyr,shell-uart = &uart2;
};

aliases {
led0 = &user_led;
};

leds {
compatible = "gpio-leds";
user_led: led_0 {
label = "LED_0";
gpios = <&gpio_prt2 5 GPIO_ACTIVE_HIGH>;
};

};

};

&p3_1_scb2_uart_tx {
drive-push-pull;
};

&p3_0_scb2_uart_rx {
input-enable;
};


uart2: &scb2 {
compatible = "infineon,cat1-uart";
status = "okay";
current-speed = <115200>;
pinctrl-0 = <&p3_0_scb2_uart_rx &p3_1_scb2_uart_tx>;
pinctrl-names = "default";
};

&gpio_prt3 {
status = "okay";
};

&gpio_prt2 {
status = "okay";
};
14 changes: 14 additions & 0 deletions boards/arm/cy8ckit_062s4/cy8ckit_062s4_m4.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# SPDX-License-Identifier: Apache-2.0
# Copyright (c) 2023 David Ullmann

identifier: cy8ckit_062s4_m4
name: CY8CKIT-062S4 PSoC 62S4
type: mcu
arch: arm
ram: 128
flash: 256
toolchain:
- zephyr
- gnuarmemb
supported:
- gpio
16 changes: 16 additions & 0 deletions boards/arm/cy8ckit_062s4/cy8ckit_062s4_m4_defconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# SPDX-License-Identifier: Apache-2.0
# Copyright (c) 2023 David Ullmann

CONFIG_SOC_SERIES_PSOC_62=y
CONFIG_BOARD_CY8CKIT_062S4_M4=y
CONFIG_SOC_CY8C6244LQI_S4D92=y
CONFIG_CONSOLE=y
CONFIG_UART_CONSOLE=y
CONFIG_SERIAL=y

CONFIG_PINCTRL=y
CONFIG_SOC_PSOC6_CM0P_IMAGE_SLEEP=y

CONFIG_BUILD_OUTPUT_HEX=y
CONFIG_CORTEX_M_SYSTICK=y
CONFIG_XIP=y
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 5d315d5

Please sign in to comment.