Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump third_party/pigweed/repo from 73cac22 to b88cd71 #26133

Merged
merged 21 commits into from
Apr 24, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Clean up for review
  • Loading branch information
tehampson committed Apr 24, 2023
commit fcbf6f50413764cc6dde7082e96cd62f55f8a95e
2 changes: 1 addition & 1 deletion examples/all-clusters-app/nxp/mw320/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ mw320_executable("shell_mw320") {
"${chip_root}/src/setup_payload",
]

deps = [ "${examples_plat_dir}:syscalls_stub" ]
deps = [ "${chip_root}/src/platform:syscalls_stub" ]

include_dirs = [
"${chip_root}/src/platform/nxp/mw320",
Expand Down
2 changes: 1 addition & 1 deletion examples/contact-sensor-app/nxp/k32w/k32w0/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,9 @@ k32w0_executable("contact_sensor_app") {
"${chip_root}/examples/contact-sensor-app/contact-sensor-common",
"${chip_root}/examples/providers:device_info_provider",
"${chip_root}/src/lib",
"${chip_root}/src/platform:syscalls_stub",
"${chip_root}/third_party/mbedtls:mbedtls",
"${k32w0_platform_dir}/app/support:freertos_mbedtls_utils",
"${k32w0_platform_dir}/common:syscalls_stub",
]

if (chip_openthread_ftd) {
Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/nxp/k32w/k32w0/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ k32w0_executable("light_app") {
"${chip_root}/examples/lighting-app/nxp/zap/",
"${chip_root}/examples/providers:device_info_provider",
"${chip_root}/src/lib",
"${chip_root}/src/platform:syscalls_stub",
"${chip_root}/third_party/mbedtls:mbedtls",
"${k32w0_platform_dir}/app/support:freertos_mbedtls_utils",
"${k32w0_platform_dir}/common:syscalls_stub",
]

if (chip_openthread_ftd) {
Expand Down
2 changes: 1 addition & 1 deletion examples/lock-app/nxp/k32w/k32w0/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@ k32w0_executable("lock_app") {
"${chip_root}/examples/providers:device_info_provider",
"${chip_root}/src/crypto",
"${chip_root}/src/lib",
"${chip_root}/src/platform:syscalls_stub",
"${chip_root}/third_party/mbedtls:mbedtls",
"${chip_root}/third_party/simw-top-mini:se05x",
"${k32w0_platform_dir}/app/support:freertos_mbedtls_utils",
"${k32w0_platform_dir}/common:syscalls_stub",
]

if (chip_openthread_ftd) {
Expand Down
19 changes: 0 additions & 19 deletions examples/platform/nxp/k32w/k32w0/common/BUILD.gn

This file was deleted.

31 changes: 0 additions & 31 deletions examples/platform/nxp/mw320/BUILD.gn

This file was deleted.

212 changes: 0 additions & 212 deletions examples/platform/nxp/mw320/syscalls_stubs.cpp

This file was deleted.

2 changes: 1 addition & 1 deletion examples/shell/nxp/k32w/k32w0/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ k32w0_executable("shell_app") {
"${chip_root}/examples/common/QRCode",
"${chip_root}/examples/lock-app/lock-common",
"${chip_root}/examples/shell/shell_common:shell_common",
"${chip_root}/src/platform:syscalls_stub",
"${chip_root}/third_party/mbedtls:mbedtls",
"${chip_root}/third_party/simw-top-mini:se05x",
"${k32w0_platform_dir}/app/support:freertos_mbedtls_utils",
"${k32w0_platform_dir}/common:syscalls_stub",
]

cflags = [ "-Wconversion" ]
Expand Down
4 changes: 4 additions & 0 deletions src/platform/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -487,3 +487,7 @@ if (chip_device_platform != "none") {
public_deps = [ ":platform_buildconfig" ]
}
}

source_set("syscalls_stub") {
sources = ["SyscallStubs.cpp"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,22 @@ int _lseek(int file, int ptr, int dir);
int _read(int file, char * ptr, int len);
int _write(int file, const char * ptr, int len);

/**************************************************************************
* @brief
* Open a file.
*
* @param[in] file
* File you want to open.
*
* @return
* Returns -1 since there is not logic here to open file.
**************************************************************************/
int __attribute__((weak)) _open(const char * pathname, int flags, int mode)
{
(void) pathname;
(void) flags;
(void) mode;
return 0;
return -1;
}

/**************************************************************************
Expand Down
4 changes: 2 additions & 2 deletions third_party/infineon/cyw30739_sdk/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ declare_args() {

assert(cyw30739_sdk_target != "", "cyw30739_sdk_target must be specified")

config("cyw30739_sdk_special_linker_config") {
config("cyw30739_sdk_no_warn_rwx") {
ldflags = [ "-Wl,--no-warn-rwx-segment" ]
}

group("cyw30739_sdk") {
public_deps = [ cyw30739_sdk_target ]
all_dependent_configs = [ ":cyw30739_sdk_special_linker_config" ]
all_dependent_configs = [ ":cyw30739_sdk_no_warn_rwx" ]
}

config("mbedtls_cyw30739_config") {
Expand Down
12 changes: 11 additions & 1 deletion third_party/infineon/psoc6/syscalls_stubs.cpp
tehampson marked this conversation as resolved.
Show resolved Hide resolved
andy31415 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,22 @@ int _lseek(int file, int ptr, int dir);
int _read(int file, char * ptr, int len);
int _write(int file, const char * ptr, int len);

/**************************************************************************
* @brief
* Open a file.
*
* @param[in] file
* File you want to open.
*
* @return
* Returns -1 since there is not logic here to open file.
**************************************************************************/
int __attribute__((weak)) _open(const char * pathname, int flags, int mode)
{
(void) pathname;
(void) flags;
(void) mode;
return 0;
return -1;
}

/**************************************************************************
Expand Down
Loading