Skip to content

Commit

Permalink
fpmcu: migrate to the new posix options
Browse files Browse the repository at this point in the history
Upstream migrated to a new set of posix options in
zephyrproject-rtos/zephyr#73047.

Change the fpmcu options to match the new ones, get rid of few
deprecation messages:

warning: Deprecated symbol GETENTROPY is enabled.
warning: Deprecated symbol POSIX_CLOCK is enabled.
warning: Deprecated symbol PTHREAD is enabled.
warning: Deprecated symbol PTHREAD_IPC is enabled.
warning: Deprecated symbol PTHREAD_KEY is enabled.
warning: Deprecated symbol PTHREAD_MUTEX is enabled.

BUG=none
TEST=cq dry run

Change-Id: I092bc50c37611023eff394478470e9a2af6e2059
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/5604463
Code-Coverage: Zoss <[email protected]>
Tested-by: Fabio Baltieri <[email protected]>
Commit-Queue: Fabio Baltieri <[email protected]>
Reviewed-by: Patryk Duda <[email protected]>
  • Loading branch information
fabiobaltieri authored and Chromeos LUCI committed Jun 6, 2024
1 parent 0d7c329 commit f7c19ae
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 18 deletions.
2 changes: 1 addition & 1 deletion third_party/boringssl/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ if BORINGSSL_CRYPTO
config BORINGSSL_HARDWARE_ENTROPY
bool "Provide entropy from hardware RNG"
default y
depends on GETENTROPY
depends on POSIX_C_LIB_EXT
help
This option enables support for providing entropy to BoringSSL.
Entropy comes from hardware RNG selected in DTS.
Expand Down
21 changes: 5 additions & 16 deletions zephyr/program/fpmcu/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -98,26 +98,15 @@ CONFIG_HEAP_MEM_POOL_SIZE=64

# Enable POSIX API.
CONFIG_POSIX_API=y
CONFIG_POSIX_CLOCK=y
CONFIG_PTHREAD=y
CONFIG_PTHREAD_IPC=y
CONFIG_PTHREAD_KEY=y
CONFIG_PTHREAD_MUTEX=y
CONFIG_GETENTROPY=y
CONFIG_POSIX_TIMERS=y
CONFIG_POSIX_THREADS=y
CONFIG_POSIX_C_LIB_EXT=y
# Disable unused part of the POSIX API.
CONFIG_POSIX_CONFSTR=n
CONFIG_POSIX_MQUEUE=n
CONFIG_POSIX_MESSAGE_PASSING=n
CONFIG_POSIX_PRIORITY_SCHEDULING=n
CONFIG_POSIX_PUTMSG=n
CONFIG_POSIX_SIGNAL=n
CONFIG_POSIX_SYSCONF=n
CONFIG_XOPEN_STREAMS=n
CONFIG_POSIX_SYSCONF_IMPL_MACRO=y
CONFIG_POSIX_SYSLOG=n
CONFIG_POSIX_UNAME=n
CONFIG_PTHREAD_BARRIER=n
CONFIG_PTHREAD_COND=n
CONFIG_PTHREAD_RWLOCK=n
CONFIG_PTHREAD_SPINLOCK=n

# C++
CONFIG_CPP=y
Expand Down
2 changes: 1 addition & 1 deletion zephyr/test/boringssl/prj.conf
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ CONFIG_BORINGSSL_HARDWARE_ENTROPY=y
CONFIG_COMMON_LIBC_MALLOC=y
CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=196608
CONFIG_ENTROPY_GENERATOR=y
CONFIG_GETENTROPY=y
CONFIG_POSIX_C_LIB_EXT=y
CONFIG_POSIX_API=y

0 comments on commit f7c19ae

Please sign in to comment.