<p>Martin Roth has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22500">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vendorcode/amd/pi/00670F00: Halt build if headers aren't wrapped<br><br>Make sure that AGESA headers don't get pulled directly into coreboot<br>files again.<br><br>BUG=b:66818758<br>TEST=Build gardenia; Build & boot kahlee; Include AGESA.h into files<br>verify that the build fails.<br><br>Change-Id: I8d6d94872ebf76a9df2850ed0452cf6b1a446ffd<br>Signed-off-by: Martin Roth <martinroth@google.com><br>---<br>M src/vendorcode/amd/pi/00670F00/AGESA.h<br>M src/vendorcode/amd/pi/00670F00/AMD.h<br>M src/vendorcode/amd/pi/00670F00/Include/Ids.h<br>M src/vendorcode/amd/pi/00670F00/Include/IdsPerf.h<br>M src/vendorcode/amd/pi/00670F00/Include/PlatformMemoryConfiguration.h<br>M src/vendorcode/amd/pi/00670F00/Include/Topology.h<br>M src/vendorcode/amd/pi/00670F00/Lib/amdlib.h<br>M src/vendorcode/amd/pi/00670F00/Porting.h<br>M src/vendorcode/amd/pi/00670F00/Proc/CPU/Family/cpuFamRegisters.h<br>M src/vendorcode/amd/pi/00670F00/Proc/CPU/Table.h<br>M src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuFamilyTranslation.h<br>M src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuRegisters.h<br>M src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuServices.h<br>M src/vendorcode/amd/pi/00670F00/Proc/CPU/heapManager.h<br>M src/vendorcode/amd/pi/00670F00/Proc/Common/AmdFch.h<br>M src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/AcpiLib.h<br>M src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchBiosRamUsage.h<br>M src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchCommonCfg.h<br>M src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchDef.h<br>M src/vendorcode/amd/pi/00670F00/Proc/Fch/Fch.h<br>M src/vendorcode/amd/pi/00670F00/Proc/Fch/FchPlatform.h<br>M src/vendorcode/amd/pi/00670F00/Proc/Psp/PspBaseLib/PspBaseLib.h<br>M src/vendorcode/amd/pi/00670F00/Proc/Psp/PspBaseLib/PspDirectory.h<br>M src/vendorcode/amd/pi/00670F00/agesa_headers.h<br>M src/vendorcode/amd/pi/00670F00/binaryPI/OptionsIds.h<br>M src/vendorcode/amd/pi/00670F00/gcc-intrin.h<br>26 files changed, 100 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/00/22500/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/vendorcode/amd/pi/00670F00/AGESA.h b/src/vendorcode/amd/pi/00670F00/AGESA.h<br>index ee9c629..33115cd 100644<br>--- a/src/vendorcode/amd/pi/00670F00/AGESA.h<br>+++ b/src/vendorcode/amd/pi/00670F00/AGESA.h<br>@@ -40,6 +40,9 @@<br>  *<br>  ***************************************************************************/<br> <br>+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA<br>+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h<br>+#endif<br> <br> #ifndef _AGESA_H_<br> #define _AGESA_H_<br>diff --git a/src/vendorcode/amd/pi/00670F00/AMD.h b/src/vendorcode/amd/pi/00670F00/AMD.h<br>index 731b9c1..697994e 100644<br>--- a/src/vendorcode/amd/pi/00670F00/AMD.h<br>+++ b/src/vendorcode/amd/pi/00670F00/AMD.h<br>@@ -40,6 +40,10 @@<br>  *<br>  ***************************************************************************/<br> <br>+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA<br>+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h<br>+#endif<br>+<br> #ifndef _AMD_H_<br> #define _AMD_H_<br> <br>diff --git a/src/vendorcode/amd/pi/00670F00/Include/Ids.h b/src/vendorcode/amd/pi/00670F00/Include/Ids.h<br>index 69c06ec..c31c442 100644<br>--- a/src/vendorcode/amd/pi/00670F00/Include/Ids.h<br>+++ b/src/vendorcode/amd/pi/00670F00/Include/Ids.h<br>@@ -43,6 +43,10 @@<br>   /* Macros to aid debugging */<br>   /* These definitions expand to zero (0) bytes of code when disabled */<br> <br>+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA<br>+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h<br>+#endif<br>+<br> #ifndef _IDS_H_<br> #define _IDS_H_<br> <br>diff --git a/src/vendorcode/amd/pi/00670F00/Include/IdsPerf.h b/src/vendorcode/amd/pi/00670F00/Include/IdsPerf.h<br>index 4663f8c..4c7c38d 100644<br>--- a/src/vendorcode/amd/pi/00670F00/Include/IdsPerf.h<br>+++ b/src/vendorcode/amd/pi/00670F00/Include/IdsPerf.h<br>@@ -39,6 +39,11 @@<br>  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.<br>  *<br>  ***************************************************************************/<br>+<br>+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA<br>+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h<br>+#endif<br>+<br> #ifndef _IDS_PERFORMANCE_DATA_POINT<br> <br>   #define _IDS_PERFORMANCE_DATA_POINT<br>diff --git a/src/vendorcode/amd/pi/00670F00/Include/PlatformMemoryConfiguration.h b/src/vendorcode/amd/pi/00670F00/Include/PlatformMemoryConfiguration.h<br>index 6a8a017..ae99315 100644<br>--- a/src/vendorcode/amd/pi/00670F00/Include/PlatformMemoryConfiguration.h<br>+++ b/src/vendorcode/amd/pi/00670F00/Include/PlatformMemoryConfiguration.h<br>@@ -41,6 +41,10 @@<br>  *<br>  ***************************************************************************/<br> <br>+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA<br>+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h<br>+#endif<br>+<br> #ifndef _PLATFORM_MEMORY_CONFIGURATION_H_<br> #define _PLATFORM_MEMORY_CONFIGURATION_H_<br> <br>diff --git a/src/vendorcode/amd/pi/00670F00/Include/Topology.h b/src/vendorcode/amd/pi/00670F00/Include/Topology.h<br>index 11f4945..bf145af 100644<br>--- a/src/vendorcode/amd/pi/00670F00/Include/Topology.h<br>+++ b/src/vendorcode/amd/pi/00670F00/Include/Topology.h<br>@@ -41,6 +41,10 @@<br>  *<br>  ***************************************************************************/<br> <br>+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA<br>+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h<br>+#endif<br>+<br> #ifndef _TOPOLOGY_H_<br> #define _TOPOLOGY_H_<br> <br>diff --git a/src/vendorcode/amd/pi/00670F00/Lib/amdlib.h b/src/vendorcode/amd/pi/00670F00/Lib/amdlib.h<br>index f5eab0a..3f7fbbd 100644<br>--- a/src/vendorcode/amd/pi/00670F00/Lib/amdlib.h<br>+++ b/src/vendorcode/amd/pi/00670F00/Lib/amdlib.h<br>@@ -46,8 +46,7 @@<br> #ifndef _AMD_LIB_H_<br> #define _AMD_LIB_H_<br> <br>-#include "Porting.h"<br>-#include "AMD.h"<br>+#include <agesa_headers.h><br> <br> #define IOCF8 0xCF8<br> #define IOCFC 0xCFC<br>diff --git a/src/vendorcode/amd/pi/00670F00/Porting.h b/src/vendorcode/amd/pi/00670F00/Porting.h<br>index ed1a9c7..75e109f 100644<br>--- a/src/vendorcode/amd/pi/00670F00/Porting.h<br>+++ b/src/vendorcode/amd/pi/00670F00/Porting.h<br>@@ -40,6 +40,10 @@<br>  *<br>  ***************************************************************************/<br> <br>+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA<br>+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h<br>+#endif<br>+<br> #ifndef _PORTING_H_<br> #define _PORTING_H_<br> <br>diff --git a/src/vendorcode/amd/pi/00670F00/Proc/CPU/Family/cpuFamRegisters.h b/src/vendorcode/amd/pi/00670F00/Proc/CPU/Family/cpuFamRegisters.h<br>index 4883434..a5d4c8e 100644<br>--- a/src/vendorcode/amd/pi/00670F00/Proc/CPU/Family/cpuFamRegisters.h<br>+++ b/src/vendorcode/amd/pi/00670F00/Proc/CPU/Family/cpuFamRegisters.h<br>@@ -41,6 +41,10 @@<br>  *<br>  ***************************************************************************/<br> <br>+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA<br>+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h<br>+#endif<br>+<br> #ifndef _CPU_FAM_REGISTERS_H_<br> #define _CPU_FAM_REGISTERS_H_<br> <br>diff --git a/src/vendorcode/amd/pi/00670F00/Proc/CPU/Table.h b/src/vendorcode/amd/pi/00670F00/Proc/CPU/Table.h<br>index fe3b3c0..0e31d80 100644<br>--- a/src/vendorcode/amd/pi/00670F00/Proc/CPU/Table.h<br>+++ b/src/vendorcode/amd/pi/00670F00/Proc/CPU/Table.h<br>@@ -41,6 +41,10 @@<br>  *<br>  ***************************************************************************/<br> <br>+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA<br>+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h<br>+#endif<br>+<br> #ifndef _CPU_TABLE_H_<br> #define _CPU_TABLE_H_<br> <br>diff --git a/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuFamilyTranslation.h b/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuFamilyTranslation.h<br>index 743b5f6..6b3d27c 100644<br>--- a/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuFamilyTranslation.h<br>+++ b/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuFamilyTranslation.h<br>@@ -40,6 +40,10 @@<br>  *<br>  ***************************************************************************/<br> <br>+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA<br>+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h<br>+#endif<br>+<br> #ifndef _CPU_FAMILY_TRANSLATION_H_<br> #define _CPU_FAMILY_TRANSLATION_H_<br> <br>diff --git a/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuRegisters.h b/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuRegisters.h<br>index 3ef723c..f4e1d83 100644<br>--- a/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuRegisters.h<br>+++ b/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuRegisters.h<br>@@ -41,6 +41,10 @@<br>  *<br>  ***************************************************************************/<br> <br>+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA<br>+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h<br>+#endif<br>+<br> #ifndef _CPU_REGISTERS_H_<br> #define _CPU_REGISTERS_H_<br> <br>diff --git a/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuServices.h b/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuServices.h<br>index 6614181..c4e4ddf 100644<br>--- a/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuServices.h<br>+++ b/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuServices.h<br>@@ -41,6 +41,10 @@<br>  *<br>  ***************************************************************************/<br> <br>+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA<br>+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h<br>+#endif<br>+<br> #ifndef _CPU_SERVICES_H_<br> #define _CPU_SERVICES_H_<br> <br>diff --git a/src/vendorcode/amd/pi/00670F00/Proc/CPU/heapManager.h b/src/vendorcode/amd/pi/00670F00/Proc/CPU/heapManager.h<br>index c5f9529..a7119cd 100644<br>--- a/src/vendorcode/amd/pi/00670F00/Proc/CPU/heapManager.h<br>+++ b/src/vendorcode/amd/pi/00670F00/Proc/CPU/heapManager.h<br>@@ -41,6 +41,10 @@<br>  *<br>  ***************************************************************************/<br> <br>+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA<br>+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h<br>+#endif<br>+<br> #ifndef _HEAP_MANAGER_H_<br> #define _HEAP_MANAGER_H_<br> <br>diff --git a/src/vendorcode/amd/pi/00670F00/Proc/Common/AmdFch.h b/src/vendorcode/amd/pi/00670F00/Proc/Common/AmdFch.h<br>index 57bfabb..6fb5c01 100644<br>--- a/src/vendorcode/amd/pi/00670F00/Proc/Common/AmdFch.h<br>+++ b/src/vendorcode/amd/pi/00670F00/Proc/Common/AmdFch.h<br>@@ -41,6 +41,10 @@<br>  *<br>  ***************************************************************************/<br> <br>+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA<br>+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h<br>+#endif<br>+<br> #ifndef _AMD_FCH_H_<br> #define _AMD_FCH_H_<br> <br>diff --git a/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/AcpiLib.h b/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/AcpiLib.h<br>index fe1803d..b3f464a 100644<br>--- a/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/AcpiLib.h<br>+++ b/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/AcpiLib.h<br>@@ -40,6 +40,10 @@<br>  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.<br>  *<br>  ***************************************************************************/<br>+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA<br>+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h<br>+#endif<br>+<br> #ifndef _FCH_ACPILIB_H_<br> #define _FCH_ACPILIB_H_<br> ///<br>diff --git a/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchBiosRamUsage.h b/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchBiosRamUsage.h<br>index 84cd94c..744afac 100644<br>--- a/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchBiosRamUsage.h<br>+++ b/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchBiosRamUsage.h<br>@@ -40,6 +40,10 @@<br>  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.<br>  *<br>  ***************************************************************************/<br>+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA<br>+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h<br>+#endif<br>+<br> #ifndef _FCH_BIOS_RAM_USAGE_H_<br> #define _FCH_BIOS_RAM_USAGE_H_<br> <br>diff --git a/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchCommonCfg.h b/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchCommonCfg.h<br>index cc080c7..91f959d 100644<br>--- a/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchCommonCfg.h<br>+++ b/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchCommonCfg.h<br>@@ -40,6 +40,10 @@<br>  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.<br>  *<br>  ***************************************************************************/<br>+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA<br>+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h<br>+#endif<br>+<br> #ifndef _FCH_COMMON_CFG_H_<br> #define _FCH_COMMON_CFG_H_<br> <br>diff --git a/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchDef.h b/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchDef.h<br>index e1d0def..d9849b6 100644<br>--- a/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchDef.h<br>+++ b/src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchDef.h<br>@@ -40,6 +40,10 @@<br>  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.<br>  *<br>  ***************************************************************************/<br>+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA<br>+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h<br>+#endif<br>+<br> #ifndef _FCH_DEF_H_<br> #define _FCH_DEF_H_<br> <br>diff --git a/src/vendorcode/amd/pi/00670F00/Proc/Fch/Fch.h b/src/vendorcode/amd/pi/00670F00/Proc/Fch/Fch.h<br>index 4413e2e..08aed28 100644<br>--- a/src/vendorcode/amd/pi/00670F00/Proc/Fch/Fch.h<br>+++ b/src/vendorcode/amd/pi/00670F00/Proc/Fch/Fch.h<br>@@ -40,6 +40,11 @@<br>  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.<br>  *<br>  ***************************************************************************/<br>+<br>+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA<br>+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h<br>+#endif<br>+<br> #define FCH_REVISION       "0.0.5.0"<br> #define FCH_ID             "FCH_A05"<br> #define FCH_VERSION        0x0000<br>diff --git a/src/vendorcode/amd/pi/00670F00/Proc/Fch/FchPlatform.h b/src/vendorcode/amd/pi/00670F00/Proc/Fch/FchPlatform.h<br>index e7fff23..9db2cec 100644<br>--- a/src/vendorcode/amd/pi/00670F00/Proc/Fch/FchPlatform.h<br>+++ b/src/vendorcode/amd/pi/00670F00/Proc/Fch/FchPlatform.h<br>@@ -40,6 +40,10 @@<br>  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.<br>  *<br>  ***************************************************************************/<br>+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA<br>+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h<br>+#endif<br>+<br> #ifndef  _FCH_PLATFORM_H_<br> #define  _FCH_PLATFORM_H_<br> <br>diff --git a/src/vendorcode/amd/pi/00670F00/Proc/Psp/PspBaseLib/PspBaseLib.h b/src/vendorcode/amd/pi/00670F00/Proc/Psp/PspBaseLib/PspBaseLib.h<br>index 3af9c3d..11ebbf4 100644<br>--- a/src/vendorcode/amd/pi/00670F00/Proc/Psp/PspBaseLib/PspBaseLib.h<br>+++ b/src/vendorcode/amd/pi/00670F00/Proc/Psp/PspBaseLib/PspBaseLib.h<br>@@ -41,6 +41,10 @@<br>  *<br>  ***************************************************************************/<br> <br>+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA<br>+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h<br>+#endif<br>+<br> #ifndef _PSP_BASE_LIB_H_<br> #define _PSP_BASE_LIB_H_<br> <br>diff --git a/src/vendorcode/amd/pi/00670F00/Proc/Psp/PspBaseLib/PspDirectory.h b/src/vendorcode/amd/pi/00670F00/Proc/Psp/PspBaseLib/PspDirectory.h<br>index e3fdd8d..d904525 100644<br>--- a/src/vendorcode/amd/pi/00670F00/Proc/Psp/PspBaseLib/PspDirectory.h<br>+++ b/src/vendorcode/amd/pi/00670F00/Proc/Psp/PspBaseLib/PspDirectory.h<br>@@ -39,6 +39,10 @@<br>  *<br>  ***************************************************************************/<br> <br>+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA<br>+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h<br>+#endif<br>+<br> #ifndef _PSP_DIRECTORY_H_<br> #define _PSP_DIRECTORY_H_<br> <br>diff --git a/src/vendorcode/amd/pi/00670F00/agesa_headers.h b/src/vendorcode/amd/pi/00670F00/agesa_headers.h<br>index 721da3f..73ca1e0 100644<br>--- a/src/vendorcode/amd/pi/00670F00/agesa_headers.h<br>+++ b/src/vendorcode/amd/pi/00670F00/agesa_headers.h<br>@@ -16,6 +16,7 @@<br> #ifndef __AGESA_HEADERS_H__<br> #define __AGESA_HEADERS_H__<br> <br>+#define AGESA_HEADERS_ARE_WRAPPED<br> #pragma pack(push)<br> #include "Porting.h"<br> #include "AGESA.h"<br>@@ -29,5 +30,6 @@<br> #include "Proc/CPU/heapManager.h"<br> #include "Proc/Psp/PspBaseLib/PspBaseLib.h"<br> #pragma pack(pop)<br>+#undef AGESA_HEADERS_ARE_WRAPPED<br> <br> #endif<br>diff --git a/src/vendorcode/amd/pi/00670F00/binaryPI/OptionsIds.h b/src/vendorcode/amd/pi/00670F00/binaryPI/OptionsIds.h<br>index bd39fce..a401331 100644<br>--- a/src/vendorcode/amd/pi/00670F00/binaryPI/OptionsIds.h<br>+++ b/src/vendorcode/amd/pi/00670F00/binaryPI/OptionsIds.h<br>@@ -41,6 +41,10 @@<br>  ***************************************************************************/<br> #include "Ids.h"<br> <br>+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA<br>+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h<br>+#endif<br>+<br> #ifndef _OPTION_IDS_H_<br> #define _OPTION_IDS_H_<br> <br>diff --git a/src/vendorcode/amd/pi/00670F00/gcc-intrin.h b/src/vendorcode/amd/pi/00670F00/gcc-intrin.h<br>index 44e91d2..1bad8cc 100644<br>--- a/src/vendorcode/amd/pi/00670F00/gcc-intrin.h<br>+++ b/src/vendorcode/amd/pi/00670F00/gcc-intrin.h<br>@@ -26,6 +26,10 @@<br>  *<br>  */<br> <br>+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA<br>+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h<br>+#endif<br>+<br> #if defined (__GNUC__)<br> #include <stdint.h><br> /* I/O intrin functions.  */<br></pre><p>To view, visit <a href="https://review.coreboot.org/22500">change 22500</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/22500"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I8d6d94872ebf76a9df2850ed0452cf6b1a446ffd </div>
<div style="display:none"> Gerrit-Change-Number: 22500 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>