From ae01634e47326f83f74e5d3d729130343eb78f32 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Thu, 16 Nov 2017 22:46:56 -0700 Subject: vendorcode/amd/pi/00670F00: Halt build if headers aren't wrapped Make sure that AGESA headers don't get pulled directly into coreboot files again. BUG=b:66818758 TEST=Build gardenia; Build & boot kahlee; Include AGESA.h into files verify that the build fails. Change-Id: I8d6d94872ebf76a9df2850ed0452cf6b1a446ffd Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/22500 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Aaron Durbin --- src/vendorcode/amd/pi/00670F00/AGESA.h | 1 + src/vendorcode/amd/pi/00670F00/AMD.h | 2 ++ src/vendorcode/amd/pi/00670F00/Include/Ids.h | 2 ++ src/vendorcode/amd/pi/00670F00/Include/IdsPerf.h | 3 +++ .../00670F00/Include/PlatformMemoryConfiguration.h | 2 ++ src/vendorcode/amd/pi/00670F00/Include/Topology.h | 2 ++ src/vendorcode/amd/pi/00670F00/Porting.h | 2 ++ .../pi/00670F00/Proc/CPU/Family/cpuFamRegisters.h | 2 ++ src/vendorcode/amd/pi/00670F00/Proc/CPU/Table.h | 2 ++ .../amd/pi/00670F00/Proc/CPU/cpuFamilyTranslation.h | 2 ++ .../amd/pi/00670F00/Proc/CPU/cpuRegisters.h | 2 ++ .../amd/pi/00670F00/Proc/CPU/cpuServices.h | 2 ++ .../amd/pi/00670F00/Proc/CPU/heapManager.h | 2 ++ src/vendorcode/amd/pi/00670F00/Proc/Common/AmdFch.h | 2 ++ .../amd/pi/00670F00/Proc/Fch/Common/AcpiLib.h | 3 +++ .../pi/00670F00/Proc/Fch/Common/FchBiosRamUsage.h | 3 +++ .../amd/pi/00670F00/Proc/Fch/Common/FchCommonCfg.h | 3 +++ .../amd/pi/00670F00/Proc/Fch/Common/FchDef.h | 3 +++ src/vendorcode/amd/pi/00670F00/Proc/Fch/Fch.h | 3 +++ .../amd/pi/00670F00/Proc/Fch/FchPlatform.h | 3 +++ .../pi/00670F00/Proc/Psp/PspBaseLib/PspBaseLib.h | 2 ++ .../pi/00670F00/Proc/Psp/PspBaseLib/PspDirectory.h | 2 ++ src/vendorcode/amd/pi/00670F00/agesa_headers.h | 2 ++ .../amd/pi/00670F00/binaryPI/OptionsIds.h | 3 +++ src/vendorcode/amd/pi/00670F00/check_for_wrapper.h | 21 +++++++++++++++++++++ src/vendorcode/amd/pi/00670F00/gcc-intrin.h | 2 ++ 26 files changed, 78 insertions(+) create mode 100644 src/vendorcode/amd/pi/00670F00/check_for_wrapper.h (limited to 'src/vendorcode/amd') diff --git a/src/vendorcode/amd/pi/00670F00/AGESA.h b/src/vendorcode/amd/pi/00670F00/AGESA.h index ee9c629ac0..09a1680ef4 100644 --- a/src/vendorcode/amd/pi/00670F00/AGESA.h +++ b/src/vendorcode/amd/pi/00670F00/AGESA.h @@ -40,6 +40,7 @@ * ***************************************************************************/ +#include "check_for_wrapper.h" #ifndef _AGESA_H_ #define _AGESA_H_ diff --git a/src/vendorcode/amd/pi/00670F00/AMD.h b/src/vendorcode/amd/pi/00670F00/AMD.h index 731b9c189c..c4d56c9293 100644 --- a/src/vendorcode/amd/pi/00670F00/AMD.h +++ b/src/vendorcode/amd/pi/00670F00/AMD.h @@ -40,6 +40,8 @@ * ***************************************************************************/ +#include "check_for_wrapper.h" + #ifndef _AMD_H_ #define _AMD_H_ diff --git a/src/vendorcode/amd/pi/00670F00/Include/Ids.h b/src/vendorcode/amd/pi/00670F00/Include/Ids.h index 69c06ec9c3..96943cf40f 100644 --- a/src/vendorcode/amd/pi/00670F00/Include/Ids.h +++ b/src/vendorcode/amd/pi/00670F00/Include/Ids.h @@ -40,6 +40,8 @@ * ***************************************************************************/ +#include + /* Macros to aid debugging */ /* These definitions expand to zero (0) bytes of code when disabled */ diff --git a/src/vendorcode/amd/pi/00670F00/Include/IdsPerf.h b/src/vendorcode/amd/pi/00670F00/Include/IdsPerf.h index 4663f8c35c..40feef605e 100644 --- a/src/vendorcode/amd/pi/00670F00/Include/IdsPerf.h +++ b/src/vendorcode/amd/pi/00670F00/Include/IdsPerf.h @@ -39,6 +39,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ***************************************************************************/ + +#include + #ifndef _IDS_PERFORMANCE_DATA_POINT #define _IDS_PERFORMANCE_DATA_POINT diff --git a/src/vendorcode/amd/pi/00670F00/Include/PlatformMemoryConfiguration.h b/src/vendorcode/amd/pi/00670F00/Include/PlatformMemoryConfiguration.h index 6a8a01789e..539da1507f 100644 --- a/src/vendorcode/amd/pi/00670F00/Include/PlatformMemoryConfiguration.h +++ b/src/vendorcode/amd/pi/00670F00/Include/PlatformMemoryConfiguration.h @@ -41,6 +41,8 @@ * ***************************************************************************/ +#include + #ifndef _PLATFORM_MEMORY_CONFIGURATION_H_ #define _PLATFORM_MEMORY_CONFIGURATION_H_ diff --git a/src/vendorcode/amd/pi/00670F00/Include/Topology.h b/src/vendorcode/amd/pi/00670F00/Include/Topology.h index 11f49454d1..3dc19368b3 100644 --- a/src/vendorcode/amd/pi/00670F00/Include/Topology.h +++ b/src/vendorcode/amd/pi/00670F00/Include/Topology.h @@ -41,6 +41,8 @@ * ***************************************************************************/ +#include + #ifndef _TOPOLOGY_H_ #define _TOPOLOGY_H_ diff --git a/src/vendorcode/amd/pi/00670F00/Porting.h b/src/vendorcode/amd/pi/00670F00/Porting.h index ed1a9c707e..ecefc81ca7 100644 --- a/src/vendorcode/amd/pi/00670F00/Porting.h +++ b/src/vendorcode/amd/pi/00670F00/Porting.h @@ -40,6 +40,8 @@ * ***************************************************************************/ +#include + #ifndef _PORTING_H_ #define _PORTING_H_ diff --git a/src/vendorcode/amd/pi/00670F00/Proc/CPU/Family/cpuFamRegisters.h b/src/vendorcode/amd/pi/00670F00/Proc/CPU/Family/cpuFamRegisters.h index 4883434002..4378876476 100644 --- a/src/vendorcode/amd/pi/00670F00/Proc/CPU/Family/cpuFamRegisters.h +++ b/src/vendorcode/amd/pi/00670F00/Proc/CPU/Family/cpuFamRegisters.h @@ -41,6 +41,8 @@ * ***************************************************************************/ +#include + #ifndef _CPU_FAM_REGISTERS_H_ #define _CPU_FAM_REGISTERS_H_ diff --git a/src/vendorcode/amd/pi/00670F00/Proc/CPU/Table.h b/src/vendorcode/amd/pi/00670F00/Proc/CPU/Table.h index fe3b3c07e2..75169cb62e 100644 --- a/src/vendorcode/amd/pi/00670F00/Proc/CPU/Table.h +++ b/src/vendorcode/amd/pi/00670F00/Proc/CPU/Table.h @@ -41,6 +41,8 @@ * ***************************************************************************/ +#include + #ifndef _CPU_TABLE_H_ #define _CPU_TABLE_H_ diff --git a/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuFamilyTranslation.h b/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuFamilyTranslation.h index 743b5f678d..f4ffd49efe 100644 --- a/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuFamilyTranslation.h +++ b/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuFamilyTranslation.h @@ -40,6 +40,8 @@ * ***************************************************************************/ +#include + #ifndef _CPU_FAMILY_TRANSLATION_H_ #define _CPU_FAMILY_TRANSLATION_H_ diff --git a/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuRegisters.h b/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuRegisters.h index 3ef723cd4f..4d10b42a6c 100644 --- a/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuRegisters.h +++ b/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuRegisters.h @@ -41,6 +41,8 @@ * ***************************************************************************/ +#include + #ifndef _CPU_REGISTERS_H_ #define _CPU_REGISTERS_H_ diff --git a/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuServices.h b/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuServices.h index 66141818cd..d2fe6f487b 100644 --- a/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuServices.h +++ b/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuServices.h @@ -41,6 +41,8 @@ * ***************************************************************************/ +#include + #ifndef _CPU_SERVICES_H_ #define _CPU_SERVICES_H_ diff --git a/src/vendorcode/amd/pi/00670F00/Proc/CPU/heapManager.h b/src/vendorcode/amd/pi/00670F00/Proc/CPU/heapManager.h index c5f9529204..c367bb8541 100644 --- a/src/vendorcode/amd/pi/00670F00/Proc/CPU/heapManager.h +++ b/src/vendorcode/amd/pi/00670F00/Proc/CPU/heapManager.h @@ -41,6 +41,8 @@ * ***************************************************************************/ +#include + #ifndef _HEAP_MANAGER_H_ #define _HEAP_MANAGER_H_ diff --git a/src/vendorcode/amd/pi/00670F00/Proc/Common/AmdFch.h b/src/vendorcode/amd/pi/00670F00/Proc/Common/AmdFch.h index 57bfabbd03..9f3d5bc520 100644 --- a/src/vendorcode/amd/pi/00670F00/Proc/Common/AmdFch.h +++ b/src/vendorcode/amd/pi/00670F00/Proc/Common/AmdFch.h @@ -41,6 +41,8 @@ * ***************************************************************************/ +#include + #ifndef _AMD_FCH_H_ #define _AMD_FCH_H_ diff --git a/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/AcpiLib.h b/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/AcpiLib.h index fe1803d88a..c84bd00096 100644 --- a/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/AcpiLib.h +++ b/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/AcpiLib.h @@ -40,6 +40,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ***************************************************************************/ + +#include + #ifndef _FCH_ACPILIB_H_ #define _FCH_ACPILIB_H_ /// diff --git a/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchBiosRamUsage.h b/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchBiosRamUsage.h index 84cd94c64c..82082949c3 100644 --- a/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchBiosRamUsage.h +++ b/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchBiosRamUsage.h @@ -40,6 +40,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ***************************************************************************/ + +#include + #ifndef _FCH_BIOS_RAM_USAGE_H_ #define _FCH_BIOS_RAM_USAGE_H_ diff --git a/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchCommonCfg.h b/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchCommonCfg.h index cc080c7680..46e5b172bf 100644 --- a/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchCommonCfg.h +++ b/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchCommonCfg.h @@ -40,6 +40,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ***************************************************************************/ + +#include + #ifndef _FCH_COMMON_CFG_H_ #define _FCH_COMMON_CFG_H_ diff --git a/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchDef.h b/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchDef.h index e1d0def2ef..45453a80e6 100644 --- a/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchDef.h +++ b/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchDef.h @@ -40,6 +40,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ***************************************************************************/ + +#include + #ifndef _FCH_DEF_H_ #define _FCH_DEF_H_ diff --git a/src/vendorcode/amd/pi/00670F00/Proc/Fch/Fch.h b/src/vendorcode/amd/pi/00670F00/Proc/Fch/Fch.h index 4413e2ec04..ee8c961e96 100644 --- a/src/vendorcode/amd/pi/00670F00/Proc/Fch/Fch.h +++ b/src/vendorcode/amd/pi/00670F00/Proc/Fch/Fch.h @@ -40,6 +40,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ***************************************************************************/ + +#include + #define FCH_REVISION "0.0.5.0" #define FCH_ID "FCH_A05" #define FCH_VERSION 0x0000 diff --git a/src/vendorcode/amd/pi/00670F00/Proc/Fch/FchPlatform.h b/src/vendorcode/amd/pi/00670F00/Proc/Fch/FchPlatform.h index e7fff2320b..304ed23fcc 100644 --- a/src/vendorcode/amd/pi/00670F00/Proc/Fch/FchPlatform.h +++ b/src/vendorcode/amd/pi/00670F00/Proc/Fch/FchPlatform.h @@ -40,6 +40,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ***************************************************************************/ + +#include + #ifndef _FCH_PLATFORM_H_ #define _FCH_PLATFORM_H_ diff --git a/src/vendorcode/amd/pi/00670F00/Proc/Psp/PspBaseLib/PspBaseLib.h b/src/vendorcode/amd/pi/00670F00/Proc/Psp/PspBaseLib/PspBaseLib.h index 3af9c3dd99..4a37f8016f 100644 --- a/src/vendorcode/amd/pi/00670F00/Proc/Psp/PspBaseLib/PspBaseLib.h +++ b/src/vendorcode/amd/pi/00670F00/Proc/Psp/PspBaseLib/PspBaseLib.h @@ -41,6 +41,8 @@ * ***************************************************************************/ +#include + #ifndef _PSP_BASE_LIB_H_ #define _PSP_BASE_LIB_H_ diff --git a/src/vendorcode/amd/pi/00670F00/Proc/Psp/PspBaseLib/PspDirectory.h b/src/vendorcode/amd/pi/00670F00/Proc/Psp/PspBaseLib/PspDirectory.h index e3fdd8d115..f35901e6a6 100644 --- a/src/vendorcode/amd/pi/00670F00/Proc/Psp/PspBaseLib/PspDirectory.h +++ b/src/vendorcode/amd/pi/00670F00/Proc/Psp/PspBaseLib/PspDirectory.h @@ -39,6 +39,8 @@ * ***************************************************************************/ +#include + #ifndef _PSP_DIRECTORY_H_ #define _PSP_DIRECTORY_H_ diff --git a/src/vendorcode/amd/pi/00670F00/agesa_headers.h b/src/vendorcode/amd/pi/00670F00/agesa_headers.h index 721da3f89c..73ca1e081b 100644 --- a/src/vendorcode/amd/pi/00670F00/agesa_headers.h +++ b/src/vendorcode/amd/pi/00670F00/agesa_headers.h @@ -16,6 +16,7 @@ #ifndef __AGESA_HEADERS_H__ #define __AGESA_HEADERS_H__ +#define AGESA_HEADERS_ARE_WRAPPED #pragma pack(push) #include "Porting.h" #include "AGESA.h" @@ -29,5 +30,6 @@ #include "Proc/CPU/heapManager.h" #include "Proc/Psp/PspBaseLib/PspBaseLib.h" #pragma pack(pop) +#undef AGESA_HEADERS_ARE_WRAPPED #endif diff --git a/src/vendorcode/amd/pi/00670F00/binaryPI/OptionsIds.h b/src/vendorcode/amd/pi/00670F00/binaryPI/OptionsIds.h index bd39fcef20..016d822bb8 100644 --- a/src/vendorcode/amd/pi/00670F00/binaryPI/OptionsIds.h +++ b/src/vendorcode/amd/pi/00670F00/binaryPI/OptionsIds.h @@ -39,6 +39,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ***************************************************************************/ + +#include + #include "Ids.h" #ifndef _OPTION_IDS_H_ diff --git a/src/vendorcode/amd/pi/00670F00/check_for_wrapper.h b/src/vendorcode/amd/pi/00670F00/check_for_wrapper.h new file mode 100644 index 0000000000..86d3b3904b --- /dev/null +++ b/src/vendorcode/amd/pi/00670F00/check_for_wrapper.h @@ -0,0 +1,21 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2017 Google, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/* Do not use header guards on this file */ + +/* This header should be included *BEFORE* any guards in the AGESA header */ +#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA +#error AGESA headers should be included by agesawrapper.h or agesa_headers.h +#endif diff --git a/src/vendorcode/amd/pi/00670F00/gcc-intrin.h b/src/vendorcode/amd/pi/00670F00/gcc-intrin.h index 44e91d28b6..bc8f805d0f 100644 --- a/src/vendorcode/amd/pi/00670F00/gcc-intrin.h +++ b/src/vendorcode/amd/pi/00670F00/gcc-intrin.h @@ -26,6 +26,8 @@ * */ +#include + #if defined (__GNUC__) #include /* I/O intrin functions. */ -- cgit v1.2.3