Skip to content
This repository has been archived by the owner on Jul 9, 2024. It is now read-only.

Commit

Permalink
fix: update from upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed Apr 29, 2023
1 parent 709e132 commit 6a6896e
Show file tree
Hide file tree
Showing 6 changed files with 247 additions and 26 deletions.
118 changes: 118 additions & 0 deletions boards/native_posix.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
#
# Copyright (c) 2022 Nordic Semiconductor ASA
#
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

# General config
CONFIG_RESET_ON_FATAL_ERROR=n

# Heap and stacks
CONFIG_INIT_STACKS=y
CONFIG_HEAP_MEM_POOL_SIZE=32768
CONFIG_MAIN_STACK_SIZE=8192
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=8192
CONFIG_CLOUD_THREAD_STACK_SIZE=8192

# nRF modem library
CONFIG_NRF_MODEM_LIB=n
CONFIG_NRF_MODEM_LIB_ON_FAULT_APPLICATION_SPECIFIC=n

# AT Host library
CONFIG_AT_HOST_LIBRARY=n

# LTE link control
CONFIG_LTE_NETWORK_MODE_LTE_M_GPS=n

# Settings - Used to store real-time device configuration to flash.
CONFIG_FLASH=y
CONFIG_FLASH_MAP=y
CONFIG_FCB=y
CONFIG_SETTINGS=y
CONFIG_SETTINGS_FCB=y

# Watchdog
CONFIG_WATCHDOG_APPLICATION=n

# CAF - Common Application Framework
CONFIG_LED=n
CONFIG_CAF_LEDS=n

# Location related configuration
CONFIG_LOCATION=n
CONFIG_LOCATION_REQUEST_DEFAULT_METHOD_FIRST_GNSS=n
CONFIG_LOCATION_REQUEST_DEFAULT_METHOD_SECOND_CELLULAR=n
CONFIG_LOCATION_DATA_DETAILS=n

# Default cloud transport service
CONFIG_HW_ID_LIBRARY=n
CONFIG_HW_ID_LIBRARY_SOURCE_IMEI=n
CONFIG_NRF_CLOUD_FOTA=n
CONFIG_CLOUD_CLIENT_ID_USE_CUSTOM=y
CONFIG_CLOUD_CLIENT_ID="cloud-id"

# Disable unsupported application modules
CONFIG_LOCATION_MODULE=n
CONFIG_SENSOR_MODULE=n
CONFIG_MODEM_MODULE=n
CONFIG_UI_MODULE=n

# Running the application in native_posix emulator requires functionality
# that is present in the debug module
CONFIG_DEBUG_MODULE=y

# Networking config
CONFIG_NET_NATIVE=y
CONFIG_NET_TCP=y
CONFIG_NET_UDP=y
CONFIG_NET_SOCKETS_OFFLOAD=n
CONFIG_NET_SOCKETS_POSIX_NAMES=y
CONFIG_NET_SOCKETS_SOCKOPT_TLS=y
CONFIG_NET_PKT_RX_COUNT=32
CONFIG_NET_PKT_TX_COUNT=32
CONFIG_NET_BUF_RX_COUNT=32
CONFIG_NET_BUF_TX_COUNT=32
CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=3
CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=4
CONFIG_NET_MAX_CONTEXTS=10
CONFIG_NET_L2_ETHERNET=y

CONFIG_ETH_NATIVE_POSIX=y
CONFIG_ETH_NATIVE_POSIX_RANDOM_MAC=y

# TLS configuration
CONFIG_MBEDTLS=y
CONFIG_MBEDTLS_BUILTIN=y
CONFIG_MBEDTLS_ENABLE_HEAP=y
CONFIG_MBEDTLS_HEAP_SIZE=40000
CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=7168

# DNS
CONFIG_DNS_RESOLVER=y
CONFIG_DNS_SERVER_IP_ADDRESSES=y
## Use CloudFlare as default DNS server
CONFIG_DNS_SERVER1="1.1.1.1"

# Network address config
CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_CONFIG_NEED_IPV4=y
CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
CONFIG_NET_CONFIG_MY_IPV4_GW="192.0.2.2"

# FOTA
CONFIG_FOTA_DOWNLOAD=n
CONFIG_DFU_TARGET=n
CONFIG_DOWNLOAD_CLIENT=n
CONFIG_DOWNLOAD_CLIENT_HTTP_FRAG_SIZE_1024=n

# MCUBOOT
CONFIG_BOOTLOADER_MCUBOOT=n
CONFIG_IMG_MANAGER=n
CONFIG_MCUBOOT_IMG_MANAGER=n
CONFIG_IMG_ERASE_PROGRESSIVELY=n
CONFIG_SECURE_BOOT=n
CONFIG_BUILD_S1_VARIANT=n

# Watchdog
CONFIG_WATCHDOG_APPLICATION=n
120 changes: 120 additions & 0 deletions boards/qemu_x86.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
#
# Copyright (c) 2022 Nordic Semiconductor ASA
#
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

# General config
CONFIG_RESET_ON_FATAL_ERROR=n
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_SSE=y

# Heap and stacks
CONFIG_HEAP_MEM_POOL_SIZE=32768
CONFIG_MAIN_STACK_SIZE=1280
CONFIG_CLOUD_THREAD_STACK_SIZE=4096
CONFIG_HW_STACK_PROTECTION=y

# nRF modem library
CONFIG_NRF_MODEM_LIB=n
CONFIG_NRF_MODEM_LIB_ON_FAULT_APPLICATION_SPECIFIC=n

# AT Host library
CONFIG_AT_HOST_LIBRARY=n

# Settings - Used to store real-time device configuration to flash.
CONFIG_FLASH=y
CONFIG_FLASH_MAP=y
CONFIG_FCB=y
CONFIG_SETTINGS=y
CONFIG_SETTINGS_FCB=y

# Watchdog
CONFIG_WATCHDOG_APPLICATION=n

# Application Event Manager
CONFIG_APP_EVENT_MANAGER_EVENT_LOG_BUF_LEN=0

# CAF - Common Application Framework
CONFIG_CAF=y
CONFIG_LED=n
CONFIG_CAF_LEDS=n

# Default cloud transport service
CONFIG_NRF_CLOUD_FOTA=n
CONFIG_HW_ID_LIBRARY=n
CONFIG_HW_ID_LIBRARY_SOURCE_IMEI=n

# Set custom cloud client ID
CONFIG_CLOUD_CLIENT_ID_USE_CUSTOM=y
CONFIG_CLOUD_CLIENT_ID="test"

# Disable unsupported application modules
CONFIG_LOCATION_MODULE=n
CONFIG_SENSOR_MODULE=n
CONFIG_MODEM_MODULE=n
CONFIG_UI_MODULE=n

# Running the application in QEMU x86 emulator requires functionality
# that is present in the debug module
CONFIG_DEBUG_MODULE=y

# LTE link control
CONFIG_LTE_NETWORK_MODE_LTE_M_GPS=n

# Networking config
CONFIG_NET_NATIVE=y
CONFIG_NET_L2_ETHERNET=y
CONFIG_NET_TCP=y
CONFIG_NET_SOCKETS_OFFLOAD=n
CONFIG_NET_SOCKETS_POSIX_NAMES=y
CONFIG_NET_SOCKETS_SOCKOPT_TLS=y
CONFIG_NET_SOCKETS_TLS_MAX_CONTEXTS=3
CONFIG_NET_CONTEXT_SNDTIMEO=y

# Run Arm MBED TLS in the application
CONFIG_MBEDTLS=y
CONFIG_MBEDTLS_BUILTIN=y
CONFIG_MBEDTLS_ENABLE_HEAP=y
CONFIG_MBEDTLS_HEAP_SIZE=120000
CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384
CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT=y
CONFIG_MBEDTLS_KEY_EXCHANGE_RSA_ENABLED=y
CONFIG_MBEDTLS_MAC_SHA256_ENABLED=y
CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED=y
CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED=y

# DNS
CONFIG_DNS_RESOLVER=y
CONFIG_DNS_SERVER_IP_ADDRESSES=y
## Use CloudFlare as default DNS server
CONFIG_DNS_SERVER1="1.1.1.1"

# Network address config
CONFIG_NET_CONFIG_SETTINGS=y
CONFIG_NET_CONFIG_NEED_IPV4=y
CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
CONFIG_NET_CONFIG_MY_IPV4_GW="192.0.2.2"

# FOTA
CONFIG_FOTA_DOWNLOAD=n
CONFIG_DFU_TARGET=n
CONFIG_DOWNLOAD_CLIENT=n

# MCUBOOT
CONFIG_BOOTLOADER_MCUBOOT=n
CONFIG_IMG_MANAGER=n
CONFIG_MCUBOOT_IMG_MANAGER=n
CONFIG_IMG_ERASE_PROGRESSIVELY=n
CONFIG_SECURE_BOOT=n
CONFIG_BUILD_S1_VARIANT=n

# Watchdog
CONFIG_WATCHDOG_APPLICATION=n

# Location related configuration
CONFIG_LOCATION=n
CONFIG_LOCATION_REQUEST_DEFAULT_METHOD_FIRST_GNSS=n
CONFIG_LOCATION_REQUEST_DEFAULT_METHOD_SECOND_CELLULAR=n
CONFIG_LOCATION_DATA_DETAILS=n
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,5 @@
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

# ZTEST
CONFIG_ZTEST=y

# cJSON
CONFIG_CJSON_LIB=y

# General
CONFIG_HEAP_MEM_POOL_SIZE=10700
CONFIG_NEWLIB_LIBC=n
CONFIG_NEWLIB_LIBC_FLOAT_PRINTF=n
6 changes: 6 additions & 0 deletions tests/location_module/boards/native_posix.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#
# Copyright (c) 2022 Nordic Semiconductor ASA
#
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#
CONFIG_NEWLIB_LIBC=n
2 changes: 1 addition & 1 deletion tests/location_module/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ CONFIG_UNITY=y
CONFIG_ASSERT=y
CONFIG_MAIN_STACK_SIZE=4096

# Manually disable modem library to avoid bringin in k_malloc()
# Manually disable modem library to avoid bringing in k_malloc()
# for which the test has a definition of
CONFIG_NRF_MODEM_LIB=n

Expand Down
17 changes: 0 additions & 17 deletions tests/location_module/prj_native_posix.conf

This file was deleted.

0 comments on commit 6a6896e

Please sign in to comment.