cmake: fix source list issues

diff --git a/components/app_trace/CMakeLists.txt b/components/app_trace/CMakeLists.txt
index 56ad263699618e0360fb0f3ede7fd941694e78c1..711a50e50a7ef1c69e5bba423a81a6f603f74a1f 100644 (file)
--- a/components/app_trace/CMakeLists.txt
+++ b/components/app_trace/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(COMPONENT_SRCS "app_trace.c"
                    "app_trace_util.c"
-                   "gcov/gcov_rtio.c"
-                   "host_file_io.c")
+                   "host_file_io.c"
+                   "gcov/gcov_rtio.c")
 set(COMPONENT_ADD_INCLUDEDIRS "include")
 
 if(CONFIG_SYSVIEW_ENABLE)
@@ -10,10 +10,10 @@ if(CONFIG_SYSVIEW_ENABLE)
         sys_view/SEGGER
         sys_view/Sample/OS)
 
-    set(COMPONENT_SRCS "SEGGER/SEGGER_SYSVIEW.c"
-                    "esp32/SEGGER_RTT_esp32.c"
-                    "Sample/Config/SEGGER_SYSVIEW_Config_FreeRTOS.c"
-                    "Sample/OS/SEGGER_SYSVIEW_FreeRTOS.c")
+    list(APPEND COMPONENT_SRCS "sys_view/SEGGER/SEGGER_SYSVIEW.c"
+                   "sys_view/Sample/Config/SEGGER_SYSVIEW_Config_FreeRTOS.c"
+                   "sys_view/Sample/OS/SEGGER_SYSVIEW_FreeRTOS.c"
+                   "sys_view/esp32/SEGGER_RTT_esp32.c")
 endif()
 
 set(COMPONENT_REQUIRES)

diff --git a/components/coap/CMakeLists.txt b/components/coap/CMakeLists.txt
index da064b19a004b6816ec9e15f80ba23e9f8bdf403..225745e8c43a1ea9a310bd00591fe5d1b4370ef6 100644 (file)
--- a/components/coap/CMakeLists.txt
+++ b/components/coap/CMakeLists.txt
@@ -1,23 +1,21 @@
 set(COMPONENT_ADD_INCLUDEDIRS port/include port/include/coap libcoap/include libcoap/include/coap)
 
-set(COMPONENT_SRCS
-    libcoap/src/address.c
-    libcoap/src/async.c
-    libcoap/src/block.c
-    libcoap/src/coap_time.c
-    libcoap/src/debug.c
-    libcoap/src/encode.c
-    libcoap/src/hashkey.c
-    libcoap/src/mem.c
-    libcoap/src/net.c
-    libcoap/src/option.c
-    libcoap/src/pdu.c
-    libcoap/src/resource.c
-    libcoap/src/str.c
-    libcoap/src/subscribe.c
-    libcoap/src/uri.c
-    port/coap_io_socket.c
-    )
+set(COMPONENT_SRCS "libcoap/src/address.c"
+                   "libcoap/src/async.c"
+                   "libcoap/src/block.c"
+                   "libcoap/src/coap_time.c"
+                   "libcoap/src/debug.c"
+                   "libcoap/src/encode.c"
+                   "libcoap/src/hashkey.c"
+                   "libcoap/src/mem.c"
+                   "libcoap/src/net.c"
+                   "libcoap/src/option.c"
+                   "libcoap/src/pdu.c"
+                   "libcoap/src/resource.c"
+                   "libcoap/src/str.c"
+                   "libcoap/src/subscribe.c"
+                   "libcoap/src/uri.c"
+                   "port/coap_io_socket.c")
 
 set(COMPONENT_REQUIRES lwip)
 

diff --git a/components/console/CMakeLists.txt b/components/console/CMakeLists.txt
index 1aa4ce020de78fafbfbbd621d426d6f7f280bd3d..31fb1ed97be9bc78f852817f47e1766083c7e925 100644 (file)
--- a/components/console/CMakeLists.txt
+++ b/components/console/CMakeLists.txt
@@ -1,8 +1,8 @@
 set(COMPONENT_ADD_INCLUDEDIRS .)
-set(COMPONENT_SRCS "argtable3/argtable3.c"
-                   "commands.c"
-                   "linenoise/linenoise.c"
-                   "split_argv.c")
+set(COMPONENT_SRCS "commands.c"
+                   "split_argv.c"
+                   "argtable3/argtable3.c"
+                   "linenoise/linenoise.c")
 
 set(COMPONENT_REQUIRES)
 

diff --git a/components/esp32/CMakeLists.txt b/components/esp32/CMakeLists.txt
index 56e311c3aee90028109aa932762c8c4c2c73958c..8577dc434025645bb92fa9eb856da724846d436f 100644 (file)
--- a/components/esp32/CMakeLists.txt
+++ b/components/esp32/CMakeLists.txt
@@ -37,8 +37,6 @@ else()
                    "freertos_hooks.c"
                    "gdbstub.c"
                    "hw_random.c"
-                   "hwcrypto/aes.c"
-                   "hwcrypto/sha.c"
                    "int_wdt.c"
                    "intr_alloc.c"
                    "ipc.c"
@@ -57,7 +55,9 @@ else()
                    "system_api.c"
                    "task_wdt.c"
                    "wifi_init.c"
-                   "wifi_os_adapter.c")
+                   "wifi_os_adapter.c"
+                   "hwcrypto/aes.c"
+                   "hwcrypto/sha.c")
     set(COMPONENT_ADD_INCLUDEDIRS "include")
 
     set(COMPONENT_REQUIRES driver tcpip_adapter)

diff --git a/components/heap/CMakeLists.txt b/components/heap/CMakeLists.txt
index f71ed9d84056b5815b5d87aef74f1ed4c3d78855..6492aefd512c139ed2b8160e90fdd898eebb824b 100644 (file)
--- a/components/heap/CMakeLists.txt
+++ b/components/heap/CMakeLists.txt
@@ -4,7 +4,7 @@ set(COMPONENT_SRCS "heap_caps.c"
                    "multi_heap.c")
 
 if(NOT CONFIG_HEAP_POISONING_DISABLED)
-    set(COMPONENT_SRCS ${COMPONENT_SRCS} multi_heap_poisoning.c)
+    list(APPEND COMPONENT_SRCS "multi_heap_poisoning.c")
 endif()
 
 set(COMPONENT_ADD_INCLUDEDIRS "include")

diff --git a/components/libsodium/CMakeLists.txt b/components/libsodium/CMakeLists.txt
index abc7d7be34ba1d07d928b24323be0b060a1fea42..2ed003f13dd93dc48da6c7439f232199c9768c1c 100644 (file)
--- a/components/libsodium/CMakeLists.txt
+++ b/components/libsodium/CMakeLists.txt
@@ -2,217 +2,128 @@ set(SRC libsodium/src/libsodium)
 
 set(COMPONENT_REQUIRES "mbedtls")
 
-set(COMPONENT_SRCS
-    "port/randombytes_esp32.c"
-    "port/crypto_hash_mbedtls/crypto_hash_sha512_mbedtls.c"
-    "port/crypto_hash_mbedtls/crypto_hash_sha256_mbedtls.c"
-
-    # Derived from libsodium/src/libsodium/Makefile.am
-    # (ignoring the !MINIMAL set)
-    "${SRC}/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c"
-    "${SRC}/crypto_aead/xchacha20poly1305/sodium/aead_xchacha20poly1305.c"
-    "${SRC}/crypto_auth/crypto_auth.c"
-    "${SRC}/crypto_auth/hmacsha256/auth_hmacsha256.c"
-    "${SRC}/crypto_auth/hmacsha512/auth_hmacsha512.c"
-    "${SRC}/crypto_auth/hmacsha512256/auth_hmacsha512256.c"
-    "${SRC}/crypto_auth/hmacsha256/auth_hmacsha256.c"
-    "${SRC}/crypto_auth/hmacsha512/auth_hmacsha512.c"
-    "${SRC}/crypto_auth/hmacsha512256/auth_hmacsha512256.c"
-    "${SRC}/crypto_box/crypto_box.c"
-    "${SRC}/crypto_box/crypto_box_seal.c"
-    "${SRC}/crypto_box/crypto_box_easy.c"
-    "${SRC}/crypto_box/curve25519xchacha20poly1305/box_curve25519xchacha20poly1305.c"
-    "${SRC}/crypto_box/curve25519xsalsa20poly1305/box_curve25519xsalsa20poly1305.c"
-    "${SRC}/crypto_box/curve25519xsalsa20poly1305/box_curve25519xsalsa20poly1305.c"
-    "${SRC}/crypto_core/curve25519/ref10/curve25519_ref10.c"
-    "${SRC}/crypto_core/hchacha20/core_hchacha20.c"
-    "${SRC}/crypto_core/hsalsa20/ref2/core_hsalsa20_ref2.c"
-    "${SRC}/crypto_core/hsalsa20/core_hsalsa20.c"
-    "${SRC}/crypto_core/hsalsa20/ref2/core_hsalsa20_ref2.c"
-    "${SRC}/crypto_core/salsa/ref/core_salsa_ref.c"
-    "${SRC}/crypto_generichash/crypto_generichash.c"
-    "${SRC}/crypto_generichash/blake2b/generichash_blake2.c"
-    "${SRC}/crypto_generichash/blake2b/ref/blake2b-ref.c"
-    "${SRC}/crypto_generichash/blake2b/ref/blake2b-compress-sse41.c"
-    "${SRC}/crypto_generichash/blake2b/ref/generichash_blake2b.c"
-    "${SRC}/crypto_generichash/blake2b/ref/blake2b-compress-ssse3.c"
-    "${SRC}/crypto_generichash/blake2b/ref/blake2b-compress-avx2.c"
-    "${SRC}/crypto_generichash/blake2b/ref/blake2b-compress-ref.c"
-    "${SRC}/crypto_generichash/blake2b/generichash_blake2.c"
-    "${SRC}/crypto_generichash/blake2b/ref/blake2b-ref.c"
-    "${SRC}/crypto_generichash/blake2b/ref/blake2b-compress-sse41.c"
-    "${SRC}/crypto_generichash/blake2b/ref/generichash_blake2b.c"
-    "${SRC}/crypto_generichash/blake2b/ref/blake2b-compress-ssse3.c"
-    "${SRC}/crypto_generichash/blake2b/ref/blake2b-compress-avx2.c"
-    "${SRC}/crypto_generichash/blake2b/ref/blake2b-compress-ref.c"
-    "${SRC}/crypto_generichash/blake2b/ref/blake2b-ref.c"
-    "${SRC}/crypto_generichash/blake2b/ref/blake2b-compress-sse41.c"
-    "${SRC}/crypto_generichash/blake2b/ref/generichash_blake2b.c"
-    "${SRC}/crypto_generichash/blake2b/ref/blake2b-compress-ssse3.c"
-    "${SRC}/crypto_generichash/blake2b/ref/blake2b-compress-avx2.c"
-    "${SRC}/crypto_generichash/blake2b/ref/blake2b-compress-ref.c"
-    "${SRC}/crypto_hash/crypto_hash.c"
-    "${SRC}/crypto_hash/sha512/hash_sha512.c"
-    "${SRC}/crypto_hash/sha256/hash_sha256.c"
-    "${SRC}/crypto_hash/sha512/cp/hash_sha512_cp.c"
-    "${SRC}/crypto_hash/sha256/cp/hash_sha256_cp.c"
-    "${SRC}/crypto_hash/sha256/hash_sha256.c"
-    "${SRC}/crypto_hash/sha256/cp/hash_sha256_cp.c"
-    "${SRC}/crypto_hash/sha512/hash_sha512.c"
-    "${SRC}/crypto_hash/sha512/cp/hash_sha512_cp.c"
-    "${SRC}/crypto_kdf/blake2b/kdf_blake2b.c"
-    "${SRC}/crypto_kdf/crypto_kdf.c"
-    "${SRC}/crypto_kdf/blake2b/kdf_blake2b.c"
-    "${SRC}/crypto_kx/crypto_kx.c"
-    "${SRC}/crypto_onetimeauth/crypto_onetimeauth.c"
-    "${SRC}/crypto_onetimeauth/poly1305/onetimeauth_poly1305.c"
-    "${SRC}/crypto_onetimeauth/poly1305/sse2/poly1305_sse2.c"
-    "${SRC}/crypto_onetimeauth/poly1305/donna/poly1305_donna.c"
-    "${SRC}/crypto_onetimeauth/poly1305/onetimeauth_poly1305.c"
-    "${SRC}/crypto_onetimeauth/poly1305/sse2/poly1305_sse2.c"
-    "${SRC}/crypto_onetimeauth/poly1305/donna/poly1305_donna.c"
-    "${SRC}/crypto_onetimeauth/poly1305/donna/poly1305_donna.c"
-    "${SRC}/crypto_pwhash/argon2/argon2-encoding.c"
-    "${SRC}/crypto_pwhash/argon2/argon2-fill-block-ssse3.c"
-    "${SRC}/crypto_pwhash/argon2/blake2b-long.c"
-    "${SRC}/crypto_pwhash/argon2/pwhash_argon2i.c"
-    "${SRC}/crypto_pwhash/argon2/argon2.c"
-    "${SRC}/crypto_pwhash/argon2/argon2-fill-block-ref.c"
-    "${SRC}/crypto_pwhash/argon2/argon2-core.c"
-    "${SRC}/crypto_pwhash/crypto_pwhash.c"
-    "${SRC}/crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.c"
-    "${SRC}/crypto_pwhash/scryptsalsa208sha256/scrypt_platform.c"
-    "${SRC}/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c"
-    "${SRC}/crypto_pwhash/scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c"
-    "${SRC}/crypto_pwhash/argon2/argon2-encoding.c"
-    "${SRC}/crypto_pwhash/argon2/argon2-fill-block-ssse3.c"
-    "${SRC}/crypto_pwhash/argon2/blake2b-long.c"
-    "${SRC}/crypto_pwhash/argon2/pwhash_argon2i.c"
-    "${SRC}/crypto_pwhash/argon2/argon2.c"
-    "${SRC}/crypto_pwhash/argon2/argon2-fill-block-ref.c"
-    "${SRC}/crypto_pwhash/argon2/argon2-core.c"
-    "${SRC}/crypto_pwhash/scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c"
-    "${SRC}/crypto_pwhash/scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c"
-    "${SRC}/crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.c"
-    "${SRC}/crypto_pwhash/scryptsalsa208sha256/scrypt_platform.c"
-    "${SRC}/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c"
-    "${SRC}/crypto_pwhash/scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c"
-    "${SRC}/crypto_pwhash/scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c"
-    "${SRC}/crypto_pwhash/scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c"
-    "${SRC}/crypto_pwhash/scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c"
-    "${SRC}/crypto_scalarmult/crypto_scalarmult.c"
-    "${SRC}/crypto_scalarmult/curve25519/scalarmult_curve25519.c"
-    "${SRC}/crypto_scalarmult/curve25519/sandy2x/fe_frombytes_sandy2x.c"
-    "${SRC}/crypto_scalarmult/curve25519/sandy2x/curve25519_sandy2x.c"
-    "${SRC}/crypto_scalarmult/curve25519/sandy2x/fe51_invert.c"
-    "${SRC}/crypto_scalarmult/curve25519/donna_c64/curve25519_donna_c64.c"
-    "${SRC}/crypto_scalarmult/curve25519/ref10/x25519_ref10.c"
-    "${SRC}/crypto_scalarmult/curve25519/sandy2x/fe51_pack.S"
-    "${SRC}/crypto_scalarmult/curve25519/sandy2x/fe51_mul.S"
-    "${SRC}/crypto_scalarmult/curve25519/sandy2x/ladder_base.S"
-    "${SRC}/crypto_scalarmult/curve25519/sandy2x/sandy2x.S"
-    "${SRC}/crypto_scalarmult/curve25519/sandy2x/ladder.S"
-    "${SRC}/crypto_scalarmult/curve25519/sandy2x/consts.S"
-    "${SRC}/crypto_scalarmult/curve25519/sandy2x/fe51_nsquare.S"
-    "${SRC}/crypto_scalarmult/curve25519/scalarmult_curve25519.c"
-    "${SRC}/crypto_scalarmult/curve25519/sandy2x/fe_frombytes_sandy2x.c"
-    "${SRC}/crypto_scalarmult/curve25519/sandy2x/curve25519_sandy2x.c"
-    "${SRC}/crypto_scalarmult/curve25519/sandy2x/fe51_invert.c"
-    "${SRC}/crypto_scalarmult/curve25519/donna_c64/curve25519_donna_c64.c"
-    "${SRC}/crypto_scalarmult/curve25519/ref10/x25519_ref10.c"
-    "${SRC}/crypto_scalarmult/curve25519/sandy2x/fe51_pack.S"
-    "${SRC}/crypto_scalarmult/curve25519/sandy2x/fe51_mul.S"
-    "${SRC}/crypto_scalarmult/curve25519/sandy2x/ladder_base.S"
-    "${SRC}/crypto_scalarmult/curve25519/sandy2x/sandy2x.S"
-    "${SRC}/crypto_scalarmult/curve25519/sandy2x/ladder.S"
-    "${SRC}/crypto_scalarmult/curve25519/sandy2x/consts.S"
-    "${SRC}/crypto_scalarmult/curve25519/sandy2x/fe51_nsquare.S"
-    "${SRC}/crypto_scalarmult/curve25519/ref10/x25519_ref10.c"
-    "${SRC}/crypto_secretbox/crypto_secretbox_easy.c"
-    "${SRC}/crypto_secretbox/crypto_secretbox.c"
-    "${SRC}/crypto_secretbox/xsalsa20poly1305/secretbox_xsalsa20poly1305.c"
-    "${SRC}/crypto_secretbox/xchacha20poly1305/secretbox_xchacha20poly1305.c"
-    "${SRC}/crypto_secretbox/xsalsa20poly1305/secretbox_xsalsa20poly1305.c"
-    "${SRC}/crypto_shorthash/crypto_shorthash.c"
-    "${SRC}/crypto_shorthash/siphash24/shorthash_siphashx24.c"
-    "${SRC}/crypto_shorthash/siphash24/shorthash_siphash24.c"
-    "${SRC}/crypto_shorthash/siphash24/ref/shorthash_siphashx24_ref.c"
-    "${SRC}/crypto_shorthash/siphash24/ref/shorthash_siphash24_ref.c"
-    "${SRC}/crypto_shorthash/siphash24/shorthash_siphashx24.c"
-    "${SRC}/crypto_shorthash/siphash24/shorthash_siphash24.c"
-    "${SRC}/crypto_shorthash/siphash24/ref/shorthash_siphashx24_ref.c"
-    "${SRC}/crypto_shorthash/siphash24/ref/shorthash_siphash24_ref.c"
-    "${SRC}/crypto_shorthash/siphash24/ref/shorthash_siphashx24_ref.c"
-    "${SRC}/crypto_shorthash/siphash24/ref/shorthash_siphash24_ref.c"
-    "${SRC}/crypto_sign/crypto_sign.c"
-    "${SRC}/crypto_sign/ed25519/sign_ed25519.c"
-    "${SRC}/crypto_sign/ed25519/ref10/obsolete.c"
-    "${SRC}/crypto_sign/ed25519/ref10/open.c"
-    "${SRC}/crypto_sign/ed25519/ref10/keypair.c"
-    "${SRC}/crypto_sign/ed25519/ref10/sign.c"
-    "${SRC}/crypto_sign/ed25519/sign_ed25519.c"
-    "${SRC}/crypto_sign/ed25519/ref10/obsolete.c"
-    "${SRC}/crypto_sign/ed25519/ref10/open.c"
-    "${SRC}/crypto_sign/ed25519/ref10/keypair.c"
-    "${SRC}/crypto_sign/ed25519/ref10/sign.c"
-    "${SRC}/crypto_sign/ed25519/ref10/obsolete.c"
-    "${SRC}/crypto_sign/ed25519/ref10/open.c"
-    "${SRC}/crypto_sign/ed25519/ref10/keypair.c"
-    "${SRC}/crypto_sign/ed25519/ref10/sign.c"
-    "${SRC}/crypto_stream/chacha20/stream_chacha20.c"
-    "${SRC}/crypto_stream/chacha20/ref/chacha20_ref.c"
-    "${SRC}/crypto_stream/chacha20/dolbeau/chacha20_dolbeau-ssse3.c"
-    "${SRC}/crypto_stream/chacha20/dolbeau/chacha20_dolbeau-avx2.c"
-    "${SRC}/crypto_stream/chacha20/ref/chacha20_ref.c"
-    "${SRC}/crypto_stream/crypto_stream.c"
-    "${SRC}/crypto_stream/salsa20/stream_salsa20.c"
-    "${SRC}/crypto_stream/salsa208/stream_salsa208.c"
-    "${SRC}/crypto_stream/salsa2012/stream_salsa2012.c"
-    "${SRC}/crypto_stream/chacha20/stream_chacha20.c"
-    "${SRC}/crypto_stream/aes128ctr/stream_aes128ctr.c"
-    "${SRC}/crypto_stream/xsalsa20/stream_xsalsa20.c"
-    "${SRC}/crypto_stream/xchacha20/stream_xchacha20.c"
-    "${SRC}/crypto_stream/salsa20/ref/salsa20_ref.c"
-    "${SRC}/crypto_stream/salsa20/xmm6/salsa20_xmm6.c"
-    "${SRC}/crypto_stream/salsa20/xmm6int/salsa20_xmm6int-avx2.c"
-    "${SRC}/crypto_stream/salsa20/xmm6int/salsa20_xmm6int-sse2.c"
-    "${SRC}/crypto_stream/salsa208/ref/stream_salsa208_ref.c"
-    "${SRC}/crypto_stream/salsa2012/ref/stream_salsa2012_ref.c"
-    "${SRC}/crypto_stream/chacha20/ref/chacha20_ref.c"
-    "${SRC}/crypto_stream/chacha20/dolbeau/chacha20_dolbeau-ssse3.c"
-    "${SRC}/crypto_stream/chacha20/dolbeau/chacha20_dolbeau-avx2.c"
-    "${SRC}/crypto_stream/aes128ctr/nacl/consts_aes128ctr.c"
-    "${SRC}/crypto_stream/aes128ctr/nacl/stream_aes128ctr_nacl.c"
-    "${SRC}/crypto_stream/aes128ctr/nacl/beforenm_aes128ctr.c"
-    "${SRC}/crypto_stream/aes128ctr/nacl/afternm_aes128ctr.c"
-    "${SRC}/crypto_stream/aes128ctr/nacl/xor_afternm_aes128ctr.c"
-    "${SRC}/crypto_stream/aes128ctr/nacl/int128_aes128ctr.c"
-    "${SRC}/crypto_stream/salsa20/xmm6/salsa20_xmm6-asm.S"
-    "${SRC}/crypto_stream/salsa20/stream_salsa20.c"
-    "${SRC}/crypto_stream/salsa20/ref/salsa20_ref.c"
-    "${SRC}/crypto_stream/salsa20/xmm6/salsa20_xmm6.c"
-    "${SRC}/crypto_stream/salsa20/xmm6int/salsa20_xmm6int-avx2.c"
-    "${SRC}/crypto_stream/salsa20/xmm6int/salsa20_xmm6int-sse2.c"
-    "${SRC}/crypto_stream/salsa20/xmm6/salsa20_xmm6-asm.S"
-    "${SRC}/crypto_stream/salsa20/ref/salsa20_ref.c"
-    "${SRC}/crypto_stream/xsalsa20/stream_xsalsa20.c"
-    "${SRC}/crypto_verify/sodium/verify.c"
-    "${SRC}/randombytes/randombytes.c"
-    "${SRC}/randombytes/sysrandom/randombytes_sysrandom.c"
-    "${SRC}/randombytes/salsa20/randombytes_salsa20_random.c"
-    "${SRC}/randombytes/nativeclient/randombytes_nativeclient.c"
-    "${SRC}/sodium/runtime.c"
-    "${SRC}/sodium/utils.c"
-    "${SRC}/sodium/core.c"
-    "${SRC}/sodium/version.c"
-    )
+# Derived from libsodium/src/libsodium/Makefile.am
+# (ignoring the !MINIMAL set)
+set(COMPONENT_SRCS "${SRC}/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c"
+                   "${SRC}/crypto_aead/xchacha20poly1305/sodium/aead_xchacha20poly1305.c"
+                   "${SRC}/crypto_auth/crypto_auth.c"
+                   "${SRC}/crypto_auth/hmacsha256/auth_hmacsha256.c"
+                   "${SRC}/crypto_auth/hmacsha512/auth_hmacsha512.c"
+                   "${SRC}/crypto_auth/hmacsha512256/auth_hmacsha512256.c"
+                   "${SRC}/crypto_box/crypto_box.c"
+                   "${SRC}/crypto_box/crypto_box_easy.c"
+                   "${SRC}/crypto_box/crypto_box_seal.c"
+                   "${SRC}/crypto_box/curve25519xchacha20poly1305/box_curve25519xchacha20poly1305.c"
+                   "${SRC}/crypto_box/curve25519xsalsa20poly1305/box_curve25519xsalsa20poly1305.c"
+                   "${SRC}/crypto_core/curve25519/ref10/curve25519_ref10.c"
+                   "${SRC}/crypto_core/hchacha20/core_hchacha20.c"
+                   "${SRC}/crypto_core/hsalsa20/core_hsalsa20.c"
+                   "${SRC}/crypto_core/hsalsa20/ref2/core_hsalsa20_ref2.c"
+                   "${SRC}/crypto_core/salsa/ref/core_salsa_ref.c"
+                   "${SRC}/crypto_generichash/crypto_generichash.c"
+                   "${SRC}/crypto_generichash/blake2b/generichash_blake2.c"
+                   "${SRC}/crypto_generichash/blake2b/ref/blake2b-compress-avx2.c"
+                   "${SRC}/crypto_generichash/blake2b/ref/blake2b-compress-ref.c"
+                   "${SRC}/crypto_generichash/blake2b/ref/blake2b-compress-sse41.c"
+                   "${SRC}/crypto_generichash/blake2b/ref/blake2b-compress-ssse3.c"
+                   "${SRC}/crypto_generichash/blake2b/ref/blake2b-ref.c"
+                   "${SRC}/crypto_generichash/blake2b/ref/generichash_blake2b.c"
+                   "${SRC}/crypto_hash/crypto_hash.c"
+                   "${SRC}/crypto_hash/sha256/hash_sha256.c"
+                   "${SRC}/crypto_hash/sha256/cp/hash_sha256_cp.c"
+                   "${SRC}/crypto_hash/sha512/hash_sha512.c"
+                   "${SRC}/crypto_hash/sha512/cp/hash_sha512_cp.c"
+                   "${SRC}/crypto_kdf/crypto_kdf.c"
+                   "${SRC}/crypto_kdf/blake2b/kdf_blake2b.c"
+                   "${SRC}/crypto_kx/crypto_kx.c"
+                   "${SRC}/crypto_onetimeauth/crypto_onetimeauth.c"
+                   "${SRC}/crypto_onetimeauth/poly1305/onetimeauth_poly1305.c"
+                   "${SRC}/crypto_onetimeauth/poly1305/donna/poly1305_donna.c"
+                   "${SRC}/crypto_onetimeauth/poly1305/sse2/poly1305_sse2.c"
+                   "${SRC}/crypto_pwhash/crypto_pwhash.c"
+                   "${SRC}/crypto_pwhash/argon2/argon2-core.c"
+                   "${SRC}/crypto_pwhash/argon2/argon2-encoding.c"
+                   "${SRC}/crypto_pwhash/argon2/argon2-fill-block-ref.c"
+                   "${SRC}/crypto_pwhash/argon2/argon2-fill-block-ssse3.c"
+                   "${SRC}/crypto_pwhash/argon2/argon2.c"
+                   "${SRC}/crypto_pwhash/argon2/blake2b-long.c"
+                   "${SRC}/crypto_pwhash/argon2/pwhash_argon2i.c"
+                   "${SRC}/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c"
+                   "${SRC}/crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.c"
+                   "${SRC}/crypto_pwhash/scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c"
+                   "${SRC}/crypto_pwhash/scryptsalsa208sha256/scrypt_platform.c"
+                   "${SRC}/crypto_pwhash/scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c"
+                   "${SRC}/crypto_pwhash/scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c"
+                   "${SRC}/crypto_scalarmult/crypto_scalarmult.c"
+                   "${SRC}/crypto_scalarmult/curve25519/scalarmult_curve25519.c"
+                   "${SRC}/crypto_scalarmult/curve25519/donna_c64/curve25519_donna_c64.c"
+                   "${SRC}/crypto_scalarmult/curve25519/ref10/x25519_ref10.c"
+                   "${SRC}/crypto_scalarmult/curve25519/sandy2x/consts.S"
+                   "${SRC}/crypto_scalarmult/curve25519/sandy2x/curve25519_sandy2x.c"
+                   "${SRC}/crypto_scalarmult/curve25519/sandy2x/fe51_invert.c"
+                   "${SRC}/crypto_scalarmult/curve25519/sandy2x/fe51_mul.S"
+                   "${SRC}/crypto_scalarmult/curve25519/sandy2x/fe51_nsquare.S"
+                   "${SRC}/crypto_scalarmult/curve25519/sandy2x/fe51_pack.S"
+                   "${SRC}/crypto_scalarmult/curve25519/sandy2x/fe_frombytes_sandy2x.c"
+                   "${SRC}/crypto_scalarmult/curve25519/sandy2x/ladder.S"
+                   "${SRC}/crypto_scalarmult/curve25519/sandy2x/ladder_base.S"
+                   "${SRC}/crypto_scalarmult/curve25519/sandy2x/sandy2x.S"
+                   "${SRC}/crypto_secretbox/crypto_secretbox.c"
+                   "${SRC}/crypto_secretbox/crypto_secretbox_easy.c"
+                   "${SRC}/crypto_secretbox/xchacha20poly1305/secretbox_xchacha20poly1305.c"
+                   "${SRC}/crypto_secretbox/xsalsa20poly1305/secretbox_xsalsa20poly1305.c"
+                   "${SRC}/crypto_shorthash/crypto_shorthash.c"
+                   "${SRC}/crypto_shorthash/siphash24/shorthash_siphash24.c"
+                   "${SRC}/crypto_shorthash/siphash24/shorthash_siphashx24.c"
+                   "${SRC}/crypto_shorthash/siphash24/ref/shorthash_siphash24_ref.c"
+                   "${SRC}/crypto_shorthash/siphash24/ref/shorthash_siphashx24_ref.c"
+                   "${SRC}/crypto_sign/crypto_sign.c"
+                   "${SRC}/crypto_sign/ed25519/sign_ed25519.c"
+                   "${SRC}/crypto_sign/ed25519/ref10/keypair.c"
+                   "${SRC}/crypto_sign/ed25519/ref10/obsolete.c"
+                   "${SRC}/crypto_sign/ed25519/ref10/open.c"
+                   "${SRC}/crypto_sign/ed25519/ref10/sign.c"
+                   "${SRC}/crypto_stream/crypto_stream.c"
+                   "${SRC}/crypto_stream/aes128ctr/stream_aes128ctr.c"
+                   "${SRC}/crypto_stream/aes128ctr/nacl/afternm_aes128ctr.c"
+                   "${SRC}/crypto_stream/aes128ctr/nacl/beforenm_aes128ctr.c"
+                   "${SRC}/crypto_stream/aes128ctr/nacl/consts_aes128ctr.c"
+                   "${SRC}/crypto_stream/aes128ctr/nacl/int128_aes128ctr.c"
+                   "${SRC}/crypto_stream/aes128ctr/nacl/stream_aes128ctr_nacl.c"
+                   "${SRC}/crypto_stream/aes128ctr/nacl/xor_afternm_aes128ctr.c"
+                   "${SRC}/crypto_stream/chacha20/stream_chacha20.c"
+                   "${SRC}/crypto_stream/chacha20/dolbeau/chacha20_dolbeau-avx2.c"
+                   "${SRC}/crypto_stream/chacha20/dolbeau/chacha20_dolbeau-ssse3.c"
+                   "${SRC}/crypto_stream/chacha20/ref/chacha20_ref.c"
+                   "${SRC}/crypto_stream/salsa20/stream_salsa20.c"
+                   "${SRC}/crypto_stream/salsa20/ref/salsa20_ref.c"
+                   "${SRC}/crypto_stream/salsa20/xmm6/salsa20_xmm6-asm.S"
+                   "${SRC}/crypto_stream/salsa20/xmm6/salsa20_xmm6.c"
+                   "${SRC}/crypto_stream/salsa20/xmm6int/salsa20_xmm6int-avx2.c"
+                   "${SRC}/crypto_stream/salsa20/xmm6int/salsa20_xmm6int-sse2.c"
+                   "${SRC}/crypto_stream/salsa2012/stream_salsa2012.c"
+                   "${SRC}/crypto_stream/salsa2012/ref/stream_salsa2012_ref.c"
+                   "${SRC}/crypto_stream/salsa208/stream_salsa208.c"
+                   "${SRC}/crypto_stream/salsa208/ref/stream_salsa208_ref.c"
+                   "${SRC}/crypto_stream/xchacha20/stream_xchacha20.c"
+                   "${SRC}/crypto_stream/xsalsa20/stream_xsalsa20.c"
+                   "${SRC}/crypto_verify/sodium/verify.c"
+                   "${SRC}/randombytes/randombytes.c"
+                   "${SRC}/randombytes/nativeclient/randombytes_nativeclient.c"
+                   "${SRC}/randombytes/salsa20/randombytes_salsa20_random.c"
+                   "${SRC}/randombytes/sysrandom/randombytes_sysrandom.c"
+                   "${SRC}/sodium/core.c"
+                   "${SRC}/sodium/runtime.c"
+                   "${SRC}/sodium/utils.c"
+                   "${SRC}/sodium/version.c"
+                   "port/randombytes_esp32.c")
 
 if(CONFIG_LIBSODIUM_USE_MBEDTLS_SHA)
-    set(COMPONENT_SRCS "port/crypto_hash_mbedtls/crypto_hash_sha256_mbedtls.c"
+    list(APPEND COMPONENT_SRCS "port/crypto_hash_mbedtls/crypto_hash_sha256_mbedtls.c"
                    "port/crypto_hash_mbedtls/crypto_hash_sha512_mbedtls.c")
 else()
-    set(COMPONENT_SRCS "port/crypto_hash_mbedtls/crypto_hash_sha256_mbedtls.c"
-                   "port/crypto_hash_mbedtls/crypto_hash_sha512_mbedtls.c")
+    list(APPEND COMPONENT_SRCS "${SRC}/crypto_hash/sha256/cp/hash_sha256_cp.c"
+                   "${SRC}/crypto_hash/sha512/cp/hash_sha512_cp.c")
 endif()
 
 set(COMPONENT_ADD_INCLUDEDIRS ${SRC}/include port_include)

diff --git a/components/lwip/CMakeLists.txt b/components/lwip/CMakeLists.txt
index 63930f6fe095962514d701a7af40151ea115fc3d..068d8a5c4bb94b2387cd47e91591684bd137c86e 100644 (file)
--- a/components/lwip/CMakeLists.txt
+++ b/components/lwip/CMakeLists.txt
@@ -22,6 +22,18 @@ set(COMPONENT_SRCS "apps/dhcpserver/dhcpserver.c"
                    "lwip/src/core/inet_chksum.c"
                    "lwip/src/core/init.c"
                    "lwip/src/core/ip.c"
+                   "lwip/src/core/mem.c"
+                   "lwip/src/core/memp.c"
+                   "lwip/src/core/netif.c"
+                   "lwip/src/core/pbuf.c"
+                   "lwip/src/core/raw.c"
+                   "lwip/src/core/stats.c"
+                   "lwip/src/core/sys.c"
+                   "lwip/src/core/tcp.c"
+                   "lwip/src/core/tcp_in.c"
+                   "lwip/src/core/tcp_out.c"
+                   "lwip/src/core/timeouts.c"
+                   "lwip/src/core/udp.c"
                    "lwip/src/core/ipv4/autoip.c"
                    "lwip/src/core/ipv4/dhcp.c"
                    "lwip/src/core/ipv4/etharp.c"
@@ -39,21 +51,10 @@ set(COMPONENT_SRCS "apps/dhcpserver/dhcpserver.c"
                    "lwip/src/core/ipv6/ip6_frag.c"
                    "lwip/src/core/ipv6/mld6.c"
                    "lwip/src/core/ipv6/nd6.c"
-                   "lwip/src/core/mem.c"
-                   "lwip/src/core/memp.c"
-                   "lwip/src/core/netif.c"
-                   "lwip/src/core/pbuf.c"
-                   "lwip/src/core/raw.c"
-                   "lwip/src/core/stats.c"
-                   "lwip/src/core/sys.c"
-                   "lwip/src/core/tcp.c"
-                   "lwip/src/core/tcp_in.c"
-                   "lwip/src/core/tcp_out.c"
-                   "lwip/src/core/timeouts.c"
-                   "lwip/src/core/udp.c"
                    "lwip/src/netif/ethernet.c"
                    "lwip/src/netif/ethernetif.c"
                    "lwip/src/netif/lowpan6.c"
+                   "lwip/src/netif/slipif.c"
                    "lwip/src/netif/ppp/auth.c"
                    "lwip/src/netif/ppp/ccp.c"
                    "lwip/src/netif/ppp/chap-md5.c"
@@ -79,12 +80,11 @@ set(COMPONENT_SRCS "apps/dhcpserver/dhcpserver.c"
                    "lwip/src/netif/ppp/upap.c"
                    "lwip/src/netif/ppp/utils.c"
                    "lwip/src/netif/ppp/vj.c"
-                   "lwip/src/netif/slipif.c"
+                   "port/esp32/vfs_lwip.c"
                    "port/esp32/debug/lwip_debug.c"
                    "port/esp32/freertos/sys_arch.c"
                    "port/esp32/netif/ethernetif.c"
-                   "port/esp32/netif/wlanif.c"
-                   "port/esp32/vfs_lwip.c")
+                   "port/esp32/netif/wlanif.c")
 
 if(CONFIG_PPP_SUPPORT)
     list(APPEND COMPONENT_SRCS "lwip/src/netif/ppp/auth.c"
@@ -103,11 +103,6 @@ if(CONFIG_PPP_SUPPORT)
                    "lwip/src/netif/ppp/magic.c"
                    "lwip/src/netif/ppp/mppe.c"
                    "lwip/src/netif/ppp/multilink.c"
-                   "lwip/src/netif/ppp/polarssl/arc4.c"
-                   "lwip/src/netif/ppp/polarssl/des.c"
-                   "lwip/src/netif/ppp/polarssl/md4.c"
-                   "lwip/src/netif/ppp/polarssl/md5.c"
-                   "lwip/src/netif/ppp/polarssl/sha1.c"
                    "lwip/src/netif/ppp/ppp.c"
                    "lwip/src/netif/ppp/pppapi.c"
                    "lwip/src/netif/ppp/pppcrypt.c"
@@ -116,7 +111,12 @@ if(CONFIG_PPP_SUPPORT)
                    "lwip/src/netif/ppp/pppos.c"
                    "lwip/src/netif/ppp/upap.c"
                    "lwip/src/netif/ppp/utils.c"
-                   "lwip/src/netif/ppp/vj.c")
+                   "lwip/src/netif/ppp/vj.c"
+                   "lwip/src/netif/ppp/polarssl/arc4.c"
+                   "lwip/src/netif/ppp/polarssl/des.c"
+                   "lwip/src/netif/ppp/polarssl/md4.c"
+                   "lwip/src/netif/ppp/polarssl/md5.c"
+                   "lwip/src/netif/ppp/polarssl/sha1.c")
 endif()
 
 set(COMPONENT_REQUIRES vfs)

diff --git a/components/newlib/CMakeLists.txt b/components/newlib/CMakeLists.txt
index a1d6d33676117c1824e9075bb31e679850f646a3..a58cddeb7119c67dce8e707a0a81adcb80433283 100644 (file)
--- a/components/newlib/CMakeLists.txt
+++ b/components/newlib/CMakeLists.txt
@@ -5,6 +5,7 @@ set(COMPONENT_SRCS "locks.c"
                    "select.c"
                    "syscall_table.c"
                    "syscalls.c"
+                   "termios.c"
                    "time.c")
 set(COMPONENT_ADD_INCLUDEDIRS platform_include include)
 

diff --git a/components/spiffs/CMakeLists.txt b/components/spiffs/CMakeLists.txt
index c0903655d89e2ea70c0c8cc6a64028337f2b0aee..17e5a5587bbe76e537146ae36e2622917671d8de 100644 (file)
--- a/components/spiffs/CMakeLists.txt
+++ b/components/spiffs/CMakeLists.txt
@@ -1,12 +1,12 @@
 set(COMPONENT_ADD_INCLUDEDIRS "include")
 set(COMPONENT_PRIV_INCLUDEDIRS "." "spiffs/src")
 set(COMPONENT_SRCS "esp_spiffs.c"
+                   "spiffs_api.c"
                    "spiffs/src/spiffs_cache.c"
                    "spiffs/src/spiffs_check.c"
                    "spiffs/src/spiffs_gc.c"
                    "spiffs/src/spiffs_hydrogen.c"
-                   "spiffs/src/spiffs_nucleus.c"
-                   "spiffs_api.c")
+                   "spiffs/src/spiffs_nucleus.c")
 
 set(COMPONENT_REQUIRES spi_flash)
 set(COMPONENT_PRIV_REQUIRES bootloader_support)

diff --git a/examples/wifi/simple_wifi/main/CMakeLists.txt b/examples/wifi/simple_wifi/main/CMakeLists.txt
deleted file mode 100644 (file)
index e7c00ec..0000000
--- a/examples/wifi/simple_wifi/main/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-set(COMPONENT_SRCS "simple_wifi.c")
-set(COMPONENT_ADD_INCLUDEDIRS ".")
-
-register_component()