Merge pull request #13291 from jainvikas8/update-tfm-14Jul20

0xc0170 · web-flow · commit 8734f2aa011e · 2020-07-14T21:07:39.000+02:00
Update TF-M for ARM_MUSCA_B1
diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/VERSION.txt b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/VERSION.txt
@@ -1 +1 @@
-52261ca41663
+a630d86e91a8
diff --git a/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/crypto_client_struct.h b/features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM/include/psa/crypto_client_struct.h
@@ -40,7 +40,7 @@ struct psa_client_key_attributes_s
     uint16_t bits;
 };
 
-#define PSA_CLIENT_KEY_ATTRIBUTES_INIT {0, 0, 0, 0, 0, 0}
+#define PSA_CLIENT_KEY_ATTRIBUTES_INIT {0, 0, 0, 0, 0, 0, 0}
 
 #ifdef __cplusplus
 }
diff --git a/targets/TARGET_ARM_SSG/TARGET_MUSCA_B1/tfm_s.axf b/targets/TARGET_ARM_SSG/TARGET_MUSCA_B1/tfm_s.axf

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ struct psa_client_key_attributes_s`
`40`	`40`	`uint16_t bits;`
`41`	`41`	`};`
`42`	`42`
`43`		`-#define PSA_CLIENT_KEY_ATTRIBUTES_INIT {0, 0, 0, 0, 0, 0}`
	`43`	`+#define PSA_CLIENT_KEY_ATTRIBUTES_INIT {0, 0, 0, 0, 0, 0, 0}`
`44`	`44`
`45`	`45`	`#ifdef __cplusplus`
`46`	`46`	`}`