Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46049 )
Change subject: security/intel/txt: Clean up includes ......................................................................
security/intel/txt: Clean up includes
Sort them alphabetically, and use <types.h> everywhere.
Change-Id: Ib8f3339e5969cf8552984164fa7e08e070987a24 Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/security/intel/txt/common.c M src/security/intel/txt/getsec.c M src/security/intel/txt/logging.c M src/security/intel/txt/ramstage.c M src/security/intel/txt/txt_getsec.h M src/security/intel/txt/txt_register.h 6 files changed, 13 insertions(+), 14 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/49/46049/1
diff --git a/src/security/intel/txt/common.c b/src/security/intel/txt/common.c index 738cd54..e73defb 100644 --- a/src/security/intel/txt/common.c +++ b/src/security/intel/txt/common.c @@ -1,15 +1,15 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <arch/mmio.h> -#include <string.h> #include <console/console.h> -#include <types.h> #include <cbfs.h> -#include <cpu/x86/lapic.h> #include <cpu/x86/cr.h> +#include <cpu/x86/lapic.h> #include <cpu/x86/mp.h> #include <lib.h> #include <smp/node.h> +#include <string.h> +#include <types.h>
#if CONFIG(SOC_INTEL_COMMON_BLOCK_SA) #include <soc/intel/common/reset.h> diff --git a/src/security/intel/txt/getsec.c b/src/security/intel/txt/getsec.c index 412e243..422f10d 100644 --- a/src/security/intel/txt/getsec.c +++ b/src/security/intel/txt/getsec.c @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <stdint.h> #include <cpu/x86/lapic.h> #include <cpu/x86/cr.h> #include <cpu/x86/cache.h> #include <cpu/x86/mp.h> +#include <types.h>
#include "txt_register.h" #include "txt_getsec.h" diff --git a/src/security/intel/txt/logging.c b/src/security/intel/txt/logging.c index cf14b55..3cf2cea 100644 --- a/src/security/intel/txt/logging.c +++ b/src/security/intel/txt/logging.c @@ -1,13 +1,14 @@ /* SPDX-License-Identifier: GPL-2.0-only */
+#include <arch/mmio.h> #include <console/console.h> +#include <string.h> +#include <types.h> + #if CONFIG(SOC_INTEL_COMMON_BLOCK_SA) #include <intelblocks/systemagent.h> #endif
-#include <arch/mmio.h> -#include <string.h> - #include "txt.h" #include "txt_register.h"
diff --git a/src/security/intel/txt/ramstage.c b/src/security/intel/txt/ramstage.c index 145182f..fb84777e 100644 --- a/src/security/intel/txt/ramstage.c +++ b/src/security/intel/txt/ramstage.c @@ -1,16 +1,15 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/mmio.h> #include <acpi/acpi.h> -#include <bootstate.h> +#include <arch/mmio.h> #include <bootmem.h> -#include <console/console.h> -#include <stdint.h> +#include <bootstate.h> #include <cbfs.h> +#include <console/console.h> #include <cpu/intel/common/common.h> #include <cpu/x86/msr.h> - #include <device/pci_ops.h> +#include <types.h>
#include "txt.h" #include "txt_register.h" diff --git a/src/security/intel/txt/txt_getsec.h b/src/security/intel/txt/txt_getsec.h index 7c4a1a4..8e663d5 100644 --- a/src/security/intel/txt/txt_getsec.h +++ b/src/security/intel/txt/txt_getsec.h @@ -3,7 +3,7 @@ #ifndef SECURITY_INTEL_TXT_GETSEC_H_ #define SECURITY_INTEL_TXT_GETSEC_H_
-#include <stdint.h> +#include <types.h>
bool getsec_parameter(uint32_t *version_mask, uint32_t *version_numbers_supported, diff --git a/src/security/intel/txt/txt_register.h b/src/security/intel/txt/txt_register.h index c7f1575..bd546b5 100644 --- a/src/security/intel/txt/txt_register.h +++ b/src/security/intel/txt/txt_register.h @@ -4,7 +4,6 @@ #define SECURITY_INTEL_TXT_REGISTER_H_
#include <types.h> -#include <stddef.h>
/* * Document: 315168-016
Hello build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/46049
to look at the new patch set (#2).
Change subject: security/intel/txt: Clean up includes ......................................................................
security/intel/txt: Clean up includes
Sort them alphabetically, and use <types.h> everywhere. Drop unused <intelblocks/systemagent.h> header, too.
Change-Id: Ib8f3339e5969cf8552984164fa7e08e070987a24 Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/security/intel/txt/common.c M src/security/intel/txt/getsec.c M src/security/intel/txt/logging.c M src/security/intel/txt/ramstage.c M src/security/intel/txt/txt_getsec.h M src/security/intel/txt/txt_register.h 6 files changed, 11 insertions(+), 16 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/49/46049/2
Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46049 )
Change subject: security/intel/txt: Clean up includes ......................................................................
Patch Set 2: Code-Review+2
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/46049 )
Change subject: security/intel/txt: Clean up includes ......................................................................
security/intel/txt: Clean up includes
Sort them alphabetically, and use <types.h> everywhere. Drop unused <intelblocks/systemagent.h> header, too.
Change-Id: Ib8f3339e5969cf8552984164fa7e08e070987a24 Signed-off-by: Angel Pons th3fanbus@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/46049 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Patrick Rudolph siro@das-labor.org --- M src/security/intel/txt/common.c M src/security/intel/txt/getsec.c M src/security/intel/txt/logging.c M src/security/intel/txt/ramstage.c M src/security/intel/txt/txt_getsec.h M src/security/intel/txt/txt_register.h 6 files changed, 11 insertions(+), 16 deletions(-)
Approvals: build bot (Jenkins): Verified Patrick Rudolph: Looks good to me, approved
diff --git a/src/security/intel/txt/common.c b/src/security/intel/txt/common.c index 738cd54..e73defb 100644 --- a/src/security/intel/txt/common.c +++ b/src/security/intel/txt/common.c @@ -1,15 +1,15 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <arch/mmio.h> -#include <string.h> #include <console/console.h> -#include <types.h> #include <cbfs.h> -#include <cpu/x86/lapic.h> #include <cpu/x86/cr.h> +#include <cpu/x86/lapic.h> #include <cpu/x86/mp.h> #include <lib.h> #include <smp/node.h> +#include <string.h> +#include <types.h>
#if CONFIG(SOC_INTEL_COMMON_BLOCK_SA) #include <soc/intel/common/reset.h> diff --git a/src/security/intel/txt/getsec.c b/src/security/intel/txt/getsec.c index 412e243..422f10d 100644 --- a/src/security/intel/txt/getsec.c +++ b/src/security/intel/txt/getsec.c @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <stdint.h> #include <cpu/x86/lapic.h> #include <cpu/x86/cr.h> #include <cpu/x86/cache.h> #include <cpu/x86/mp.h> +#include <types.h>
#include "txt_register.h" #include "txt_getsec.h" diff --git a/src/security/intel/txt/logging.c b/src/security/intel/txt/logging.c index f329cf9..24def33 100644 --- a/src/security/intel/txt/logging.c +++ b/src/security/intel/txt/logging.c @@ -1,12 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <console/console.h> -#if CONFIG(SOC_INTEL_COMMON_BLOCK_SA) -#include <intelblocks/systemagent.h> -#endif - #include <arch/mmio.h> +#include <console/console.h> #include <string.h> +#include <types.h>
#include "txt.h" #include "txt_register.h" diff --git a/src/security/intel/txt/ramstage.c b/src/security/intel/txt/ramstage.c index 145182f..fb84777e 100644 --- a/src/security/intel/txt/ramstage.c +++ b/src/security/intel/txt/ramstage.c @@ -1,16 +1,15 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <arch/mmio.h> #include <acpi/acpi.h> -#include <bootstate.h> +#include <arch/mmio.h> #include <bootmem.h> -#include <console/console.h> -#include <stdint.h> +#include <bootstate.h> #include <cbfs.h> +#include <console/console.h> #include <cpu/intel/common/common.h> #include <cpu/x86/msr.h> - #include <device/pci_ops.h> +#include <types.h>
#include "txt.h" #include "txt_register.h" diff --git a/src/security/intel/txt/txt_getsec.h b/src/security/intel/txt/txt_getsec.h index 7c4a1a4..8e663d5 100644 --- a/src/security/intel/txt/txt_getsec.h +++ b/src/security/intel/txt/txt_getsec.h @@ -3,7 +3,7 @@ #ifndef SECURITY_INTEL_TXT_GETSEC_H_ #define SECURITY_INTEL_TXT_GETSEC_H_
-#include <stdint.h> +#include <types.h>
bool getsec_parameter(uint32_t *version_mask, uint32_t *version_numbers_supported, diff --git a/src/security/intel/txt/txt_register.h b/src/security/intel/txt/txt_register.h index c7f1575..bd546b5 100644 --- a/src/security/intel/txt/txt_register.h +++ b/src/security/intel/txt/txt_register.h @@ -4,7 +4,6 @@ #define SECURITY_INTEL_TXT_REGISTER_H_
#include <types.h> -#include <stddef.h>
/* * Document: 315168-016
-
Angel Pons (Code Review) -
Patrick Georgi (Code Review)
-
Patrick Rudolph (Code Review)