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>
This commit is contained in:
@@ -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"
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -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>
|
||||
|
@@ -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>
|
||||
|
@@ -17,7 +17,6 @@
|
||||
|
||||
#include <commonlib/region.h>
|
||||
#include <stdint.h>
|
||||
#include <compiler.h>
|
||||
#include <vboot_api.h>
|
||||
#include <vboot_struct.h>
|
||||
|
||||
|
@@ -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>
|
||||
|
@@ -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>
|
||||
|
Reference in New Issue
Block a user