Skip to content

Commit

Permalink
Pull request project-chip#977: CPMS: Generator firmware upgraded to G…
Browse files Browse the repository at this point in the history
…SDK 4.3

Merge in WMN_TOOLS/matter from cpms_gsdk_upgrade_4_3 to silabs

Squashed commit of the following:

commit 0a280440404754dca0f9d03a97a46e2d98244c39
Author: Ricardo Casallas <77841255+rcasallas-silabs@users.noreply.github.com>
Date:   Thu Jul 20 14:37:32 2023 -0400

    CPMS: Generator firmware upgraded to GSDK 4.3
  • Loading branch information
rcasallas-silabs authored and jmartinez-silabs committed Mar 27, 2024
1 parent 21803b1 commit e796f68
Show file tree
Hide file tree
Showing 462 changed files with 9,226 additions and 73,484 deletions.
7,874 changes: 3,947 additions & 3,927 deletions cpms/images/efr32mg12.s37

Large diffs are not rendered by default.

7,983 changes: 4,002 additions & 3,981 deletions cpms/images/efr32mg24.s37

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions cpms/support/efr32mg12/autogen/.crc_config.crc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
SEGGER_RTT_Conf.h=-1668074135
emlib_core_debug_config.h=171843933
nvm3_default_config.h=1109545002
psa_crypto_config.h=-2070312828
sl_mbedtls_config.h=-1710232477
psa_crypto_config.h=-1777265300
sl_mbedtls_config.h=1558162130
sl_mbedtls_device_config.h=-1083250924
sl_memory_config.h=-995392215
13 changes: 12 additions & 1 deletion cpms/support/efr32mg12/autogen/linkerfile.icf
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ define block CSTACK with alignment = 8
section .stack
};

define block RAMFUNCS with alignment = 8
{
};

/* Note that "expanding size" is not used yet due to failures in 8.30.1 */
define block HEAP with alignment = 8
{
Expand Down Expand Up @@ -73,5 +77,12 @@ place at end of MAIN_FLASH_region {
block nvm,
};

"ramfuncs":
place at start of RAM_region {
block RAMFUNCS,
};

"application_ram":
place at start of RAM_region { block application_ram };
place in RAM_region {
block application_ram,
};
5 changes: 2 additions & 3 deletions cpms/support/efr32mg12/autogen/linkerfile.ld
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,7 @@ SECTIONS
end = __end__;
_end = __end__;
KEEP(*(.heap*))
. = ORIGIN(RAM) + LENGTH(RAM);
__HeapLimit = .;
__HeapLimit = ORIGIN(RAM) + LENGTH(RAM);
} > RAM

__heap_size = __HeapLimit - __HeapBase;
Expand Down Expand Up @@ -220,4 +219,4 @@ SECTIONS
ASSERT((linker_storage_begin >= (__etext + SIZEOF(.data))), "FLASH memory overflowed !")


}
}
102 changes: 0 additions & 102 deletions cpms/support/efr32mg12/autogen/psa_crypto_config_autogen.h

This file was deleted.

3 changes: 3 additions & 0 deletions cpms/support/efr32mg12/autogen/sl_event_handler.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
void sl_platform_init(void)
{
CHIP_Init();
nvm3_initDefault();
}

void sl_driver_init(void)
Expand All @@ -18,6 +19,8 @@ void sl_driver_init(void)

void sl_service_init(void)
{
sl_mbedtls_init();
psa_crypto_init();
sl_iostream_init_instances();
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// This is an autogenerated config file, any changes to this file will be overwritten

#ifndef MBEDTLS_CONFIG_AUTOGEN_H
#define MBEDTLS_CONFIG_AUTOGEN_H
#ifndef SLI_MBEDTLS_CONFIG_AUTOGEN_H
#define SLI_MBEDTLS_CONFIG_AUTOGEN_H


#define MBEDTLS_MPI_MAX_SIZE 32
Expand Down Expand Up @@ -59,22 +59,4 @@

#endif // #if defined(SL_TRUSTZONE_SECURE)

#include "config-device-acceleration.h"

// By default MBEDTLS_PLATFORM_CALLOC_MACRO and MBEDTLS_PLATFORM_FREE_MACRO are
// defined in mbedtls_platform_dynamic_memory_allocation_config_default.slcc.
// Alternative implementations can configure MBEDTLS_PLATFORM_CALLOC_MACRO and
// MBEDTLS_PLATFORM_FREE_MACRO to use other platform specific implementations.
// Alternatively some use cases may select runtime initialisation in the
// application by explicitly calling mbedtls_platform_set_calloc_free() by
// selecting mbedtls_platform_dynamic_memory_allocation_config_init_runtime.

#if defined(MBEDTLS_PLATFORM_CALLOC_MACRO) && defined(MBEDTLS_PLATFORM_FREE_MACRO)
#include <stddef.h> // size_t
extern void *MBEDTLS_PLATFORM_CALLOC_MACRO( size_t n, size_t size );
extern void MBEDTLS_PLATFORM_FREE_MACRO( void *ptr );
#endif



#endif
#endif // SLI_MBEDTLS_CONFIG_AUTOGEN_H
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// This is an autogenerated config file, any changes to this file will be overwritten

#ifndef SL_MBEDTLS_CONFIG_TRANSFORM_AUTOGEN_H
#define SL_MBEDTLS_CONFIG_TRANSFORM_AUTOGEN_H
#ifndef SLI_MBEDTLS_CONFIG_TRANSFORM_AUTOGEN_H
#define SLI_MBEDTLS_CONFIG_TRANSFORM_AUTOGEN_H

// Convert CMSIS Markup config defines to mbedTLS specific config defines

Expand Down Expand Up @@ -41,4 +41,4 @@



#endif // SL_MBEDTLS_CONFIG_TRANSFORM_AUTOGEN_H
#endif // SLI_MBEDTLS_CONFIG_TRANSFORM_AUTOGEN_H
15 changes: 15 additions & 0 deletions cpms/support/efr32mg12/autogen/sli_psa_builtin_config_autogen.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// This is an autogenerated config file, any changes to this file will be overwritten

#ifndef SLI_PSA_BUILTIN_CONFIG_AUTOGEN_H
#define SLI_PSA_BUILTIN_CONFIG_AUTOGEN_H

#define MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_PUBLIC_KEY 1
#define MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_KEY_PAIR 1
#define MBEDTLS_PSA_BUILTIN_ECC_SECP_R1_256 1
#define MBEDTLS_PSA_BUILTIN_ALG_ECDSA 1
#define MBEDTLS_PSA_BUILTIN_ALG_HMAC 1
#define MBEDTLS_PSA_BUILTIN_ALG_SHA_224 1
#define MBEDTLS_PSA_BUILTIN_ALG_SHA_256 1


#endif // SLI_PSA_BUILTIN_CONFIG_AUTOGEN_H
23 changes: 23 additions & 0 deletions cpms/support/efr32mg12/autogen/sli_psa_config_autogen.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// This is an autogenerated config file, any changes to this file will be overwritten

#ifndef SLI_PSA_CONFIG_AUTOGEN_H
#define SLI_PSA_CONFIG_AUTOGEN_H

#define PSA_WANT_KEY_TYPE_AES
#define PSA_WANT_ALG_SHA_224
#define PSA_WANT_ALG_SHA_256
#define PSA_WANT_ALG_ECB_NO_PADDING
#define PSA_WANT_ALG_ECDSA
#define PSA_WANT_KEY_TYPE_ECC_KEY_PAIR
#define PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
#define PSA_WANT_ECC_SECP_R1_256
#define PSA_WANT_ALG_HMAC
#define PSA_WANT_KEY_TYPE_HMAC
#define MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG

#define MBEDTLS_PSA_KEY_SLOT_COUNT (1 + SL_PSA_KEY_USER_SLOT_COUNT)
#ifndef SL_PSA_ITS_MAX_FILES
#define SL_PSA_ITS_MAX_FILES (1 + SL_PSA_ITS_USER_MAX_FILES)
#endif

#endif // SLI_PSA_CONFIG_AUTOGEN_H
Binary file removed cpms/support/efr32mg12/build/debug/generator.bin
Binary file not shown.
Loading

0 comments on commit e796f68

Please sign in to comment.