espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 04:04:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'contrib/github_pr_7971' into 'master'

Browse Source 
bugfix: Conflicting declaration error when include<rom/secure_boot.h>

Closes IDFGH-6308

See merge request espressif/esp-idf!16202
This commit is contained in:
Mahavir Jain
2021-12-01 11:59:20 +00:00
parent 73ee08c09b f667b1039b
commit b9b55bc32b
7 changed files with 30 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,21 +1,12 @@
// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// You may obtain a copy of the License at */
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#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 +119,3 @@ bool ets_use_secure_boot_v2(void);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _ROM_SECURE_BOOT_H_ */

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

@@ -1,19 +1,10 @@
// Copyright 2020 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// You may obtain a copy of the License at */
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// 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 +15,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 +115,3 @@ struct ets_secure_boot_key_digests {
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _ROM_SECURE_BOOT_H_ */

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

@@ -1,19 +1,10 @@
// Copyright 2020 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// You may obtain a copy of the License at */
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// 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 +15,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 +115,3 @@ struct ets_secure_boot_key_digests {
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _ROM_SECURE_BOOT_H_ */

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

@@ -1,19 +1,10 @@
// Copyright 2020 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// You may obtain a copy of the License at */
// http://www.apache.org/licenses/LICENSE-2.0 #pragma once
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef _ROM_SECURE_BOOT_H_
#define _ROM_SECURE_BOOT_H_
#include <stdint.h> #include <stdint.h>
#include "ets_sys.h" #include "ets_sys.h"
@@ -23,9 +14,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 +114,3 @@ struct ets_secure_boot_key_digests {
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _ROM_SECURE_BOOT_H_ */

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

@@ -1,16 +1,8 @@
// Copyright 2015-2020 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// You may obtain a copy of the License at */
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once #pragma once
@@ -23,9 +15,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;

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

@@ -4,8 +4,7 @@
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#ifndef _ROM_SECURE_BOOT_H_ #pragma once
#define _ROM_SECURE_BOOT_H_
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
@@ -16,9 +15,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;
@@ -119,5 +115,3 @@ struct ets_secure_boot_key_digests {
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _ROM_SECURE_BOOT_H_ */

5
tools/ci/check_copyright_ignore.txt
View File

@@ -747,7 +747,6 @@ components/esp_rom/include/esp32/rom/md5_hash.h
components/esp_rom/include/esp32/rom/miniz.h components/esp_rom/include/esp32/rom/miniz.h
components/esp_rom/include/esp32/rom/rsa_pss.h components/esp_rom/include/esp32/rom/rsa_pss.h
components/esp_rom/include/esp32/rom/rtc.h components/esp_rom/include/esp32/rom/rtc.h
components/esp_rom/include/esp32/rom/secure_boot.h
components/esp_rom/include/esp32/rom/sha.h components/esp_rom/include/esp32/rom/sha.h
components/esp_rom/include/esp32/rom/spi_flash.h components/esp_rom/include/esp32/rom/spi_flash.h
components/esp_rom/include/esp32/rom/tbconsole.h components/esp_rom/include/esp32/rom/tbconsole.h
@@ -771,7 +770,6 @@ components/esp_rom/include/esp32c3/rom/miniz.h
components/esp_rom/include/esp32c3/rom/rom_layout.h components/esp_rom/include/esp32c3/rom/rom_layout.h
components/esp_rom/include/esp32c3/rom/rsa_pss.h components/esp_rom/include/esp32c3/rom/rsa_pss.h
components/esp_rom/include/esp32c3/rom/rtc.h components/esp_rom/include/esp32c3/rom/rtc.h
components/esp_rom/include/esp32c3/rom/secure_boot.h
components/esp_rom/include/esp32c3/rom/sha.h components/esp_rom/include/esp32c3/rom/sha.h
components/esp_rom/include/esp32c3/rom/spi_flash.h components/esp_rom/include/esp32c3/rom/spi_flash.h
components/esp_rom/include/esp32c3/rom/tjpgd.h components/esp_rom/include/esp32c3/rom/tjpgd.h
@@ -794,7 +792,6 @@ components/esp_rom/include/esp32h2/rom/miniz.h
components/esp_rom/include/esp32h2/rom/rom_layout.h components/esp_rom/include/esp32h2/rom/rom_layout.h
components/esp_rom/include/esp32h2/rom/rsa_pss.h components/esp_rom/include/esp32h2/rom/rsa_pss.h
components/esp_rom/include/esp32h2/rom/rtc.h components/esp_rom/include/esp32h2/rom/rtc.h
components/esp_rom/include/esp32h2/rom/secure_boot.h
components/esp_rom/include/esp32h2/rom/sha.h components/esp_rom/include/esp32h2/rom/sha.h
components/esp_rom/include/esp32h2/rom/spi_flash.h components/esp_rom/include/esp32h2/rom/spi_flash.h
components/esp_rom/include/esp32h2/rom/tjpgd.h components/esp_rom/include/esp32h2/rom/tjpgd.h
@@ -815,7 +812,6 @@ components/esp_rom/include/esp32s2/rom/miniz.h
components/esp_rom/include/esp32s2/rom/opi_flash.h components/esp_rom/include/esp32s2/rom/opi_flash.h
components/esp_rom/include/esp32s2/rom/rsa_pss.h components/esp_rom/include/esp32s2/rom/rsa_pss.h
components/esp_rom/include/esp32s2/rom/rtc.h components/esp_rom/include/esp32s2/rom/rtc.h
components/esp_rom/include/esp32s2/rom/secure_boot.h
components/esp_rom/include/esp32s2/rom/sha.h components/esp_rom/include/esp32s2/rom/sha.h
components/esp_rom/include/esp32s2/rom/spi_flash.h components/esp_rom/include/esp32s2/rom/spi_flash.h
components/esp_rom/include/esp32s2/rom/uart.h components/esp_rom/include/esp32s2/rom/uart.h
@@ -846,7 +842,6 @@ components/esp_rom/include/esp32s3/rom/miniz.h
components/esp_rom/include/esp32s3/rom/opi_flash.h components/esp_rom/include/esp32s3/rom/opi_flash.h
components/esp_rom/include/esp32s3/rom/rom_layout.h components/esp_rom/include/esp32s3/rom/rom_layout.h
components/esp_rom/include/esp32s3/rom/rsa_pss.h components/esp_rom/include/esp32s3/rom/rsa_pss.h
components/esp_rom/include/esp32s3/rom/secure_boot.h
components/esp_rom/include/esp32s3/rom/sha.h components/esp_rom/include/esp32s3/rom/sha.h
components/esp_rom/include/esp32s3/rom/spi_flash.h components/esp_rom/include/esp32s3/rom/spi_flash.h
components/esp_rom/include/esp32s3/rom/tjpgd.h components/esp_rom/include/esp32s3/rom/tjpgd.h