[coreboot-gerrit] Change in coreboot[master]: vendorcode/amd/pi/00670F00: Halt build if headers aren't wrapped
Martin Roth (Code Review)
gerrit at coreboot.org
Fri Nov 17 07:17:38 CET 2017
Martin Roth has uploaded this change for review. ( https://review.coreboot.org/22500
Change subject: vendorcode/amd/pi/00670F00: Halt build if headers aren't wrapped
......................................................................
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 <martinroth at google.com>
---
M src/vendorcode/amd/pi/00670F00/AGESA.h
M src/vendorcode/amd/pi/00670F00/AMD.h
M src/vendorcode/amd/pi/00670F00/Include/Ids.h
M src/vendorcode/amd/pi/00670F00/Include/IdsPerf.h
M src/vendorcode/amd/pi/00670F00/Include/PlatformMemoryConfiguration.h
M src/vendorcode/amd/pi/00670F00/Include/Topology.h
M src/vendorcode/amd/pi/00670F00/Lib/amdlib.h
M src/vendorcode/amd/pi/00670F00/Porting.h
M src/vendorcode/amd/pi/00670F00/Proc/CPU/Family/cpuFamRegisters.h
M src/vendorcode/amd/pi/00670F00/Proc/CPU/Table.h
M src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuFamilyTranslation.h
M src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuRegisters.h
M src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuServices.h
M src/vendorcode/amd/pi/00670F00/Proc/CPU/heapManager.h
M src/vendorcode/amd/pi/00670F00/Proc/Common/AmdFch.h
M src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/AcpiLib.h
M src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchBiosRamUsage.h
M src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchCommonCfg.h
M src/vendorcode/amd/pi/00670F00/Proc/Fch/Common/FchDef.h
M src/vendorcode/amd/pi/00670F00/Proc/Fch/Fch.h
M src/vendorcode/amd/pi/00670F00/Proc/Fch/FchPlatform.h
M src/vendorcode/amd/pi/00670F00/Proc/Psp/PspBaseLib/PspBaseLib.h
M src/vendorcode/amd/pi/00670F00/Proc/Psp/PspBaseLib/PspDirectory.h
M src/vendorcode/amd/pi/00670F00/agesa_headers.h
M src/vendorcode/amd/pi/00670F00/binaryPI/OptionsIds.h
M src/vendorcode/amd/pi/00670F00/gcc-intrin.h
26 files changed, 100 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/00/22500/1
diff --git a/src/vendorcode/amd/pi/00670F00/AGESA.h b/src/vendorcode/amd/pi/00670F00/AGESA.h
index ee9c629..33115cd 100644
--- a/src/vendorcode/amd/pi/00670F00/AGESA.h
+++ b/src/vendorcode/amd/pi/00670F00/AGESA.h
@@ -40,6 +40,9 @@
*
***************************************************************************/
+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA
+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h
+#endif
#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 731b9c1..697994e 100644
--- a/src/vendorcode/amd/pi/00670F00/AMD.h
+++ b/src/vendorcode/amd/pi/00670F00/AMD.h
@@ -40,6 +40,10 @@
*
***************************************************************************/
+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA
+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h
+#endif
+
#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 69c06ec..c31c442 100644
--- a/src/vendorcode/amd/pi/00670F00/Include/Ids.h
+++ b/src/vendorcode/amd/pi/00670F00/Include/Ids.h
@@ -43,6 +43,10 @@
/* Macros to aid debugging */
/* These definitions expand to zero (0) bytes of code when disabled */
+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA
+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h
+#endif
+
#ifndef _IDS_H_
#define _IDS_H_
diff --git a/src/vendorcode/amd/pi/00670F00/Include/IdsPerf.h b/src/vendorcode/amd/pi/00670F00/Include/IdsPerf.h
index 4663f8c..4c7c38d 100644
--- a/src/vendorcode/amd/pi/00670F00/Include/IdsPerf.h
+++ b/src/vendorcode/amd/pi/00670F00/Include/IdsPerf.h
@@ -39,6 +39,11 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
***************************************************************************/
+
+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA
+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h
+#endif
+
#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 6a8a017..ae99315 100644
--- a/src/vendorcode/amd/pi/00670F00/Include/PlatformMemoryConfiguration.h
+++ b/src/vendorcode/amd/pi/00670F00/Include/PlatformMemoryConfiguration.h
@@ -41,6 +41,10 @@
*
***************************************************************************/
+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA
+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h
+#endif
+
#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 11f4945..bf145af 100644
--- a/src/vendorcode/amd/pi/00670F00/Include/Topology.h
+++ b/src/vendorcode/amd/pi/00670F00/Include/Topology.h
@@ -41,6 +41,10 @@
*
***************************************************************************/
+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA
+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h
+#endif
+
#ifndef _TOPOLOGY_H_
#define _TOPOLOGY_H_
diff --git a/src/vendorcode/amd/pi/00670F00/Lib/amdlib.h b/src/vendorcode/amd/pi/00670F00/Lib/amdlib.h
index f5eab0a..3f7fbbd 100644
--- a/src/vendorcode/amd/pi/00670F00/Lib/amdlib.h
+++ b/src/vendorcode/amd/pi/00670F00/Lib/amdlib.h
@@ -46,8 +46,7 @@
#ifndef _AMD_LIB_H_
#define _AMD_LIB_H_
-#include "Porting.h"
-#include "AMD.h"
+#include <agesa_headers.h>
#define IOCF8 0xCF8
#define IOCFC 0xCFC
diff --git a/src/vendorcode/amd/pi/00670F00/Porting.h b/src/vendorcode/amd/pi/00670F00/Porting.h
index ed1a9c7..75e109f 100644
--- a/src/vendorcode/amd/pi/00670F00/Porting.h
+++ b/src/vendorcode/amd/pi/00670F00/Porting.h
@@ -40,6 +40,10 @@
*
***************************************************************************/
+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA
+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h
+#endif
+
#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 4883434..a5d4c8e 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,10 @@
*
***************************************************************************/
+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA
+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h
+#endif
+
#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 fe3b3c0..0e31d80 100644
--- a/src/vendorcode/amd/pi/00670F00/Proc/CPU/Table.h
+++ b/src/vendorcode/amd/pi/00670F00/Proc/CPU/Table.h
@@ -41,6 +41,10 @@
*
***************************************************************************/
+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA
+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h
+#endif
+
#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 743b5f6..6b3d27c 100644
--- a/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuFamilyTranslation.h
+++ b/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuFamilyTranslation.h
@@ -40,6 +40,10 @@
*
***************************************************************************/
+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA
+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h
+#endif
+
#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 3ef723c..f4e1d83 100644
--- a/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuRegisters.h
+++ b/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuRegisters.h
@@ -41,6 +41,10 @@
*
***************************************************************************/
+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA
+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h
+#endif
+
#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 6614181..c4e4ddf 100644
--- a/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuServices.h
+++ b/src/vendorcode/amd/pi/00670F00/Proc/CPU/cpuServices.h
@@ -41,6 +41,10 @@
*
***************************************************************************/
+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA
+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h
+#endif
+
#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 c5f9529..a7119cd 100644
--- a/src/vendorcode/amd/pi/00670F00/Proc/CPU/heapManager.h
+++ b/src/vendorcode/amd/pi/00670F00/Proc/CPU/heapManager.h
@@ -41,6 +41,10 @@
*
***************************************************************************/
+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA
+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h
+#endif
+
#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 57bfabb..6fb5c01 100644
--- a/src/vendorcode/amd/pi/00670F00/Proc/Common/AmdFch.h
+++ b/src/vendorcode/amd/pi/00670F00/Proc/Common/AmdFch.h
@@ -41,6 +41,10 @@
*
***************************************************************************/
+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA
+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h
+#endif
+
#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 fe1803d..b3f464a 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,10 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
***************************************************************************/
+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA
+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h
+#endif
+
#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 84cd94c..744afac 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,10 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
***************************************************************************/
+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA
+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h
+#endif
+
#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 cc080c7..91f959d 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,10 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
***************************************************************************/
+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA
+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h
+#endif
+
#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 e1d0def..d9849b6 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,10 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
***************************************************************************/
+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA
+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h
+#endif
+
#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 4413e2e..08aed28 100644
--- a/src/vendorcode/amd/pi/00670F00/Proc/Fch/Fch.h
+++ b/src/vendorcode/amd/pi/00670F00/Proc/Fch/Fch.h
@@ -40,6 +40,11 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
***************************************************************************/
+
+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA
+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h
+#endif
+
#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 e7fff23..9db2cec 100644
--- a/src/vendorcode/amd/pi/00670F00/Proc/Fch/FchPlatform.h
+++ b/src/vendorcode/amd/pi/00670F00/Proc/Fch/FchPlatform.h
@@ -40,6 +40,10 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
***************************************************************************/
+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA
+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h
+#endif
+
#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 3af9c3d..11ebbf4 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,10 @@
*
***************************************************************************/
+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA
+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h
+#endif
+
#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 e3fdd8d..d904525 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,10 @@
*
***************************************************************************/
+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA
+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h
+#endif
+
#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 721da3f..73ca1e0 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 bd39fce..a401331 100644
--- a/src/vendorcode/amd/pi/00670F00/binaryPI/OptionsIds.h
+++ b/src/vendorcode/amd/pi/00670F00/binaryPI/OptionsIds.h
@@ -41,6 +41,10 @@
***************************************************************************/
#include "Ids.h"
+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA
+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h
+#endif
+
#ifndef _OPTION_IDS_H_
#define _OPTION_IDS_H_
diff --git a/src/vendorcode/amd/pi/00670F00/gcc-intrin.h b/src/vendorcode/amd/pi/00670F00/gcc-intrin.h
index 44e91d2..1bad8cc 100644
--- a/src/vendorcode/amd/pi/00670F00/gcc-intrin.h
+++ b/src/vendorcode/amd/pi/00670F00/gcc-intrin.h
@@ -26,6 +26,10 @@
*
*/
+#if !defined AGESA_HEADERS_ARE_WRAPPED && !ENV_LIBAGESA
+#error AGESA headers should be included by agesawrapper.h or agesa_headers.h
+#endif
+
#if defined (__GNUC__)
#include <stdint.h>
/* I/O intrin functions. */
--
To view, visit https://review.coreboot.org/22500
To unsubscribe, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d6d94872ebf76a9df2850ed0452cf6b1a446ffd
Gerrit-Change-Number: 22500
Gerrit-PatchSet: 1
Gerrit-Owner: Martin Roth <martinroth at google.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20171117/c65fc4e3/attachment-0001.html>
More information about the coreboot-gerrit
mailing list