diff options
| author | Nico Huber <nico.h@gmx.de> | 2018-10-04 23:42:42 +0200 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2018-10-08 16:57:27 +0000 |
| commit | d44221f9c8f3686e040ff9481829315068b321a3 (patch) | |
| tree | 76337bf1cae88feda44e3c63dd7e32e964e8767d /src/vendorcode | |
| parent | 834543c0c71544b547194b093b8e1da990722762 (diff) | |
| download | coreboot-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/vendorcode')
| -rw-r--r-- | src/vendorcode/amd/pi/00670F00/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/vendorcode/amd/pi/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/vendorcode/google/chromeos/gnvs.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/vendorcode/amd/pi/00670F00/Makefile.inc b/src/vendorcode/amd/pi/00670F00/Makefile.inc index 61d0480785..0e6f2afd1c 100644 --- a/src/vendorcode/amd/pi/00670F00/Makefile.inc +++ b/src/vendorcode/amd/pi/00670F00/Makefile.inc @@ -79,6 +79,7 @@ $(call src-to-obj,libagesa,$1): $(agesa_src_path)/$(notdir $1) $(obj)/config.h $ $(AGESA_INC) \ -include $(src)/include/rules.h \ -include $(src)/include/kconfig.h \ + -include $(src)/commonlib/include/commonlib/compiler.h \ -o $$@ \ $(agesa_src_path)/$(notdir $1) diff --git a/src/vendorcode/amd/pi/Makefile.inc b/src/vendorcode/amd/pi/Makefile.inc index 19fd5d09a9..4c8db6ab50 100644 --- a/src/vendorcode/amd/pi/Makefile.inc +++ b/src/vendorcode/amd/pi/Makefile.inc @@ -100,7 +100,9 @@ $(call src-to-obj,libagesa,$1): $(agesa_src_path)/$(notdir $1) $(obj)/config.h $ @printf " CC $$(subst $(obj)/,,$$(@))\n" $(CC_libagesa) -c -MMD $(CFLAGS_libagesa) $(AGESA_CFLAGS) \ $(AGESA_INC) \ - -include $(src)/include/rules.h -include $(src)/include/kconfig.h \ + -include $(src)/include/rules.h \ + -include $(src)/include/kconfig.h \ + -include $(src)/commonlib/include/commonlib/compiler.h \ -o $$@ \ $(agesa_src_path)/$(notdir $1) diff --git a/src/vendorcode/google/chromeos/gnvs.h b/src/vendorcode/google/chromeos/gnvs.h index 77c2f0aab8..7e97bfaa75 100644 --- a/src/vendorcode/google/chromeos/gnvs.h +++ b/src/vendorcode/google/chromeos/gnvs.h @@ -16,8 +16,6 @@ #ifndef __VENDORCODE_GOOGLE_CHROMEOS_GNVS_H #define __VENDORCODE_GOOGLE_CHROMEOS_GNVS_H -#include <compiler.h> - #define BOOT_REASON_OTHER 0 #define BOOT_REASON_S3DIAG 9 |