summaryrefslogtreecommitdiff
path: root/src/security
diff options
context:
space:
mode:
authorNico Huber <nico.h@gmx.de>2018-10-04 23:42:42 +0200
committerNico Huber <nico.h@gmx.de>2018-10-08 16:57:27 +0000
commitd44221f9c8f3686e040ff9481829315068b321a3 (patch)
tree76337bf1cae88feda44e3c63dd7e32e964e8767d /src/security
parent834543c0c71544b547194b093b8e1da990722762 (diff)
downloadcoreboot-d44221f9c8f3686e040ff9481829315068b321a3.tar.xz
Move compiler.h to commonlib
Its spreading copies got out of sync. And as it is not a standard header but used in commonlib code, it belongs into commonlib. While we are at it, always include it via GCC's `-include` switch. Some Windows and BSD quirk handling went into the util copies. We always guard from redefinitions now to prevent further issues. Change-Id: I850414e6db1d799dce71ff2dc044e6a000ad2552 Signed-off-by: Nico Huber <nico.h@gmx.de> Reviewed-on: https://review.coreboot.org/28927 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/security')
-rw-r--r--src/security/tpm/tss/tcg-2.0/tss_structures.h1
-rw-r--r--src/security/vboot/Makefile.inc6
-rw-r--r--src/security/vboot/bootmode.c1
-rw-r--r--src/security/vboot/vboot_common.c1
-rw-r--r--src/security/vboot/vboot_common.h1
-rw-r--r--src/security/vboot/vboot_logic.c1
-rw-r--r--src/security/vboot/verstage.c1
7 files changed, 4 insertions, 8 deletions
diff --git a/src/security/tpm/tss/tcg-2.0/tss_structures.h b/src/security/tpm/tss/tcg-2.0/tss_structures.h
index 11fb71484c..e902f3c985 100644
--- a/src/security/tpm/tss/tcg-2.0/tss_structures.h
+++ b/src/security/tpm/tss/tcg-2.0/tss_structures.h
@@ -12,7 +12,6 @@
* constants and structures needed for functions used in coreboot.
*/
#include <stdint.h>
-#include <compiler.h>
#include <types.h>
#include "../common/tss_common.h"
diff --git a/src/security/vboot/Makefile.inc b/src/security/vboot/Makefile.inc
index 2b4e7d4c64..781aa5ebd0 100644
--- a/src/security/vboot/Makefile.inc
+++ b/src/security/vboot/Makefile.inc
@@ -91,10 +91,12 @@ endif
endif # CONFIG_VBOOT_SEPARATE_VERSTAGE
VB2_LIB = $(obj)/external/vboot_reference/vboot_fw20.a
-VBOOT_CFLAGS += $(patsubst -I%,-I$(top)/%, $(filter-out -I$(obj), $(filter-out -include $(src)/include/kconfig.h, $(CPPFLAGS_verstage))))
+VBOOT_CFLAGS += $(patsubst -I%,-I$(top)/%,\
+ $(patsubst $(src)/%.h,$(top)/$(src)/%.h,\
+ $(filter-out -I$(obj), $(CPPFLAGS_verstage))))
VBOOT_CFLAGS += $(CFLAGS_verstage)
VBOOT_CFLAGS += $(verstage-c-ccopts)
-VBOOT_CFLAGS += -I$(abspath $(obj)) -include $(top)/src/include/kconfig.h -Wno-missing-prototypes
+VBOOT_CFLAGS += -I$(abspath $(obj)) -Wno-missing-prototypes
VBOOT_CFLAGS += -DVBOOT_DEBUG
$(VB2_LIB): $(obj)/config.h
diff --git a/src/security/vboot/bootmode.c b/src/security/vboot/bootmode.c
index ba7edff501..24b8f9524f 100644
--- a/src/security/vboot/bootmode.c
+++ b/src/security/vboot/bootmode.c
@@ -17,7 +17,6 @@
#include <bootmode.h>
#include <bootstate.h>
#include <cbmem.h>
-#include <compiler.h>
#include <rules.h>
#include <string.h>
#include <vb2_api.h>
diff --git a/src/security/vboot/vboot_common.c b/src/security/vboot/vboot_common.c
index ae5bdb634a..901f126ca4 100644
--- a/src/security/vboot/vboot_common.c
+++ b/src/security/vboot/vboot_common.c
@@ -16,7 +16,6 @@
#include <boot/coreboot_tables.h>
#include <boot_device.h>
#include <cbmem.h>
-#include <compiler.h>
#include <console/cbmem_console.h>
#include <console/console.h>
#include <fmap.h>
diff --git a/src/security/vboot/vboot_common.h b/src/security/vboot/vboot_common.h
index 8f03788cb6..61f5931fe5 100644
--- a/src/security/vboot/vboot_common.h
+++ b/src/security/vboot/vboot_common.h
@@ -17,7 +17,6 @@
#include <commonlib/region.h>
#include <stdint.h>
-#include <compiler.h>
#include <vboot_api.h>
#include <vboot_struct.h>
diff --git a/src/security/vboot/vboot_logic.c b/src/security/vboot/vboot_logic.c
index a0e6a3210d..2fc20fabd4 100644
--- a/src/security/vboot/vboot_logic.c
+++ b/src/security/vboot/vboot_logic.c
@@ -16,7 +16,6 @@
#include <arch/exception.h>
#include <assert.h>
#include <bootmode.h>
-#include <compiler.h>
#include <console/console.h>
#include <console/vtxprintf.h>
#include <delay.h>
diff --git a/src/security/vboot/verstage.c b/src/security/vboot/verstage.c
index fd75250bb4..afd73f11e0 100644
--- a/src/security/vboot/verstage.c
+++ b/src/security/vboot/verstage.c
@@ -15,7 +15,6 @@
#include <arch/exception.h>
#include <arch/hlt.h>
-#include <compiler.h>
#include <console/console.h>
#include <program_loading.h>
#include <security/vboot/vboot_common.h>