feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

bugfix: Conflicting declaration error with include<esp_efuse.h>, and Unified secure_boot.h include guard to "pragma once".

Browse Source
This commit is contained in:
lovyan03
2021-11-26 21:04:23 +09:00
committed by Mahavir Jain
parent 214d62b9ad
commit 530a06cf61
5 changed files with 4 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/esp_rom/include/esp32/rom/secure_boot.h
View File

@@ -14,8 +14,7 @@
#include "sdkconfig.h" #include "sdkconfig.h"
#ifndef _ROM_SECURE_BOOT_H_ #pragma once
#define _ROM_SECURE_BOOT_H_
#include <stdint.h> #include <stdint.h>
#include "ets_sys.h" #include "ets_sys.h"
@@ -128,5 +127,3 @@ bool ets_use_secure_boot_v2(void);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _ROM_SECURE_BOOT_H_ */

8
components/esp_rom/include/esp32c3/rom/secure_boot.h
View File

@@ -12,8 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#ifndef _ROM_SECURE_BOOT_H_ #pragma once
#define _ROM_SECURE_BOOT_H_
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
@@ -24,9 +23,6 @@
extern "C" { extern "C" {
#endif #endif
struct ets_secure_boot_sig_block;
struct ets_secure_boot_signature_t;
typedef struct ets_secure_boot_sig_block ets_secure_boot_sig_block_t; typedef struct ets_secure_boot_sig_block ets_secure_boot_sig_block_t;
typedef struct ets_secure_boot_signature ets_secure_boot_signature_t; typedef struct ets_secure_boot_signature ets_secure_boot_signature_t;
typedef struct ets_secure_boot_key_digests ets_secure_boot_key_digests_t; typedef struct ets_secure_boot_key_digests ets_secure_boot_key_digests_t;
@@ -127,5 +123,3 @@ struct ets_secure_boot_key_digests {
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _ROM_SECURE_BOOT_H_ */

8
components/esp_rom/include/esp32h2/rom/secure_boot.h
View File

@@ -12,8 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#ifndef _ROM_SECURE_BOOT_H_ #pragma once
#define _ROM_SECURE_BOOT_H_
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
@@ -24,9 +23,6 @@
extern "C" { extern "C" {
#endif #endif
struct ets_secure_boot_sig_block;
struct ets_secure_boot_signature_t;
typedef struct ets_secure_boot_sig_block ets_secure_boot_sig_block_t; typedef struct ets_secure_boot_sig_block ets_secure_boot_sig_block_t;
typedef struct ets_secure_boot_signature ets_secure_boot_signature_t; typedef struct ets_secure_boot_signature ets_secure_boot_signature_t;
typedef struct ets_secure_boot_key_digests ets_secure_boot_key_digests_t; typedef struct ets_secure_boot_key_digests ets_secure_boot_key_digests_t;
@@ -127,5 +123,3 @@ struct ets_secure_boot_key_digests {
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _ROM_SECURE_BOOT_H_ */

8
components/esp_rom/include/esp32s2/rom/secure_boot.h
View File

@@ -12,8 +12,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#ifndef _ROM_SECURE_BOOT_H_ #pragma once
#define _ROM_SECURE_BOOT_H_
#include <stdint.h> #include <stdint.h>
#include "ets_sys.h" #include "ets_sys.h"
@@ -23,9 +22,6 @@
extern "C" { extern "C" {
#endif #endif
struct ets_secure_boot_sig_block;
struct ets_secure_boot_signature_t;
typedef struct ets_secure_boot_sig_block ets_secure_boot_sig_block_t; typedef struct ets_secure_boot_sig_block ets_secure_boot_sig_block_t;
typedef struct ets_secure_boot_signature ets_secure_boot_signature_t; typedef struct ets_secure_boot_signature ets_secure_boot_signature_t;
typedef struct ets_secure_boot_key_digests ets_secure_boot_key_digests_t; typedef struct ets_secure_boot_key_digests ets_secure_boot_key_digests_t;
@@ -126,5 +122,3 @@ struct ets_secure_boot_key_digests {
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _ROM_SECURE_BOOT_H_ */

3
components/esp_rom/include/esp32s3/rom/secure_boot.h
View File

@@ -23,9 +23,6 @@
extern "C" { extern "C" {
#endif #endif
struct ets_secure_boot_sig_block;
struct ets_secure_boot_signature_t;
typedef struct ets_secure_boot_sig_block ets_secure_boot_sig_block_t; typedef struct ets_secure_boot_sig_block ets_secure_boot_sig_block_t;
typedef struct ets_secure_boot_signature ets_secure_boot_signature_t; typedef struct ets_secure_boot_signature ets_secure_boot_signature_t;
typedef struct ets_secure_boot_key_digests ets_secure_boot_key_digests_t; typedef struct ets_secure_boot_key_digests ets_secure_boot_key_digests_t;