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@google.com> Reviewed-on: https://review.coreboot.org/22500 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
		| @@ -40,6 +40,7 @@ | |||||||
|  * |  * | ||||||
|  ***************************************************************************/ |  ***************************************************************************/ | ||||||
|  |  | ||||||
|  | #include "check_for_wrapper.h" | ||||||
|  |  | ||||||
| #ifndef _AGESA_H_ | #ifndef _AGESA_H_ | ||||||
| #define _AGESA_H_ | #define _AGESA_H_ | ||||||
|   | |||||||
| @@ -40,6 +40,8 @@ | |||||||
|  * |  * | ||||||
|  ***************************************************************************/ |  ***************************************************************************/ | ||||||
|  |  | ||||||
|  | #include "check_for_wrapper.h" | ||||||
|  |  | ||||||
| #ifndef _AMD_H_ | #ifndef _AMD_H_ | ||||||
| #define _AMD_H_ | #define _AMD_H_ | ||||||
|  |  | ||||||
|   | |||||||
| @@ -40,6 +40,8 @@ | |||||||
|  * |  * | ||||||
|  ***************************************************************************/ |  ***************************************************************************/ | ||||||
|  |  | ||||||
|  | #include <check_for_wrapper.h> | ||||||
|  |  | ||||||
|   /* Macros to aid debugging */ |   /* Macros to aid debugging */ | ||||||
|   /* These definitions expand to zero (0) bytes of code when disabled */ |   /* These definitions expand to zero (0) bytes of code when disabled */ | ||||||
|  |  | ||||||
|   | |||||||
| @@ -39,6 +39,9 @@ | |||||||
|  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||||||
|  * |  * | ||||||
|  ***************************************************************************/ |  ***************************************************************************/ | ||||||
|  |  | ||||||
|  | #include <check_for_wrapper.h> | ||||||
|  |  | ||||||
| #ifndef _IDS_PERFORMANCE_DATA_POINT | #ifndef _IDS_PERFORMANCE_DATA_POINT | ||||||
|  |  | ||||||
|   #define _IDS_PERFORMANCE_DATA_POINT |   #define _IDS_PERFORMANCE_DATA_POINT | ||||||
|   | |||||||
| @@ -41,6 +41,8 @@ | |||||||
|  * |  * | ||||||
|  ***************************************************************************/ |  ***************************************************************************/ | ||||||
|  |  | ||||||
|  | #include <check_for_wrapper.h> | ||||||
|  |  | ||||||
| #ifndef _PLATFORM_MEMORY_CONFIGURATION_H_ | #ifndef _PLATFORM_MEMORY_CONFIGURATION_H_ | ||||||
| #define _PLATFORM_MEMORY_CONFIGURATION_H_ | #define _PLATFORM_MEMORY_CONFIGURATION_H_ | ||||||
|  |  | ||||||
|   | |||||||
| @@ -41,6 +41,8 @@ | |||||||
|  * |  * | ||||||
|  ***************************************************************************/ |  ***************************************************************************/ | ||||||
|  |  | ||||||
|  | #include <check_for_wrapper.h> | ||||||
|  |  | ||||||
| #ifndef _TOPOLOGY_H_ | #ifndef _TOPOLOGY_H_ | ||||||
| #define _TOPOLOGY_H_ | #define _TOPOLOGY_H_ | ||||||
|  |  | ||||||
|   | |||||||
| @@ -40,6 +40,8 @@ | |||||||
|  * |  * | ||||||
|  ***************************************************************************/ |  ***************************************************************************/ | ||||||
|  |  | ||||||
|  | #include <check_for_wrapper.h> | ||||||
|  |  | ||||||
| #ifndef _PORTING_H_ | #ifndef _PORTING_H_ | ||||||
| #define _PORTING_H_ | #define _PORTING_H_ | ||||||
|  |  | ||||||
|   | |||||||
| @@ -41,6 +41,8 @@ | |||||||
|  * |  * | ||||||
|  ***************************************************************************/ |  ***************************************************************************/ | ||||||
|  |  | ||||||
|  | #include <check_for_wrapper.h> | ||||||
|  |  | ||||||
| #ifndef _CPU_FAM_REGISTERS_H_ | #ifndef _CPU_FAM_REGISTERS_H_ | ||||||
| #define _CPU_FAM_REGISTERS_H_ | #define _CPU_FAM_REGISTERS_H_ | ||||||
|  |  | ||||||
|   | |||||||
| @@ -41,6 +41,8 @@ | |||||||
|  * |  * | ||||||
|  ***************************************************************************/ |  ***************************************************************************/ | ||||||
|  |  | ||||||
|  | #include <check_for_wrapper.h> | ||||||
|  |  | ||||||
| #ifndef _CPU_TABLE_H_ | #ifndef _CPU_TABLE_H_ | ||||||
| #define _CPU_TABLE_H_ | #define _CPU_TABLE_H_ | ||||||
|  |  | ||||||
|   | |||||||
| @@ -40,6 +40,8 @@ | |||||||
|  * |  * | ||||||
|  ***************************************************************************/ |  ***************************************************************************/ | ||||||
|  |  | ||||||
|  | #include <check_for_wrapper.h> | ||||||
|  |  | ||||||
| #ifndef _CPU_FAMILY_TRANSLATION_H_ | #ifndef _CPU_FAMILY_TRANSLATION_H_ | ||||||
| #define _CPU_FAMILY_TRANSLATION_H_ | #define _CPU_FAMILY_TRANSLATION_H_ | ||||||
|  |  | ||||||
|   | |||||||
| @@ -41,6 +41,8 @@ | |||||||
|  * |  * | ||||||
|  ***************************************************************************/ |  ***************************************************************************/ | ||||||
|  |  | ||||||
|  | #include <check_for_wrapper.h> | ||||||
|  |  | ||||||
| #ifndef _CPU_REGISTERS_H_ | #ifndef _CPU_REGISTERS_H_ | ||||||
| #define _CPU_REGISTERS_H_ | #define _CPU_REGISTERS_H_ | ||||||
|  |  | ||||||
|   | |||||||
| @@ -41,6 +41,8 @@ | |||||||
|  * |  * | ||||||
|  ***************************************************************************/ |  ***************************************************************************/ | ||||||
|  |  | ||||||
|  | #include <check_for_wrapper.h> | ||||||
|  |  | ||||||
| #ifndef _CPU_SERVICES_H_ | #ifndef _CPU_SERVICES_H_ | ||||||
| #define _CPU_SERVICES_H_ | #define _CPU_SERVICES_H_ | ||||||
|  |  | ||||||
|   | |||||||
| @@ -41,6 +41,8 @@ | |||||||
|  * |  * | ||||||
|  ***************************************************************************/ |  ***************************************************************************/ | ||||||
|  |  | ||||||
|  | #include <check_for_wrapper.h> | ||||||
|  |  | ||||||
| #ifndef _HEAP_MANAGER_H_ | #ifndef _HEAP_MANAGER_H_ | ||||||
| #define _HEAP_MANAGER_H_ | #define _HEAP_MANAGER_H_ | ||||||
|  |  | ||||||
|   | |||||||
| @@ -41,6 +41,8 @@ | |||||||
|  * |  * | ||||||
|  ***************************************************************************/ |  ***************************************************************************/ | ||||||
|  |  | ||||||
|  | #include <check_for_wrapper.h> | ||||||
|  |  | ||||||
| #ifndef _AMD_FCH_H_ | #ifndef _AMD_FCH_H_ | ||||||
| #define _AMD_FCH_H_ | #define _AMD_FCH_H_ | ||||||
|  |  | ||||||
|   | |||||||
| @@ -40,6 +40,9 @@ | |||||||
|  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||||||
|  * |  * | ||||||
|  ***************************************************************************/ |  ***************************************************************************/ | ||||||
|  |  | ||||||
|  | #include <check_for_wrapper.h> | ||||||
|  |  | ||||||
| #ifndef _FCH_ACPILIB_H_ | #ifndef _FCH_ACPILIB_H_ | ||||||
| #define _FCH_ACPILIB_H_ | #define _FCH_ACPILIB_H_ | ||||||
| /// | /// | ||||||
|   | |||||||
| @@ -40,6 +40,9 @@ | |||||||
|  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||||||
|  * |  * | ||||||
|  ***************************************************************************/ |  ***************************************************************************/ | ||||||
|  |  | ||||||
|  | #include <check_for_wrapper.h> | ||||||
|  |  | ||||||
| #ifndef _FCH_BIOS_RAM_USAGE_H_ | #ifndef _FCH_BIOS_RAM_USAGE_H_ | ||||||
| #define _FCH_BIOS_RAM_USAGE_H_ | #define _FCH_BIOS_RAM_USAGE_H_ | ||||||
|  |  | ||||||
|   | |||||||
| @@ -40,6 +40,9 @@ | |||||||
|  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||||||
|  * |  * | ||||||
|  ***************************************************************************/ |  ***************************************************************************/ | ||||||
|  |  | ||||||
|  | #include <check_for_wrapper.h> | ||||||
|  |  | ||||||
| #ifndef _FCH_COMMON_CFG_H_ | #ifndef _FCH_COMMON_CFG_H_ | ||||||
| #define _FCH_COMMON_CFG_H_ | #define _FCH_COMMON_CFG_H_ | ||||||
|  |  | ||||||
|   | |||||||
| @@ -40,6 +40,9 @@ | |||||||
|  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||||||
|  * |  * | ||||||
|  ***************************************************************************/ |  ***************************************************************************/ | ||||||
|  |  | ||||||
|  | #include <check_for_wrapper.h> | ||||||
|  |  | ||||||
| #ifndef _FCH_DEF_H_ | #ifndef _FCH_DEF_H_ | ||||||
| #define _FCH_DEF_H_ | #define _FCH_DEF_H_ | ||||||
|  |  | ||||||
|   | |||||||
| @@ -40,6 +40,9 @@ | |||||||
|  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||||||
|  * |  * | ||||||
|  ***************************************************************************/ |  ***************************************************************************/ | ||||||
|  |  | ||||||
|  | #include <check_for_wrapper.h> | ||||||
|  |  | ||||||
| #define FCH_REVISION       "0.0.5.0" | #define FCH_REVISION       "0.0.5.0" | ||||||
| #define FCH_ID             "FCH_A05" | #define FCH_ID             "FCH_A05" | ||||||
| #define FCH_VERSION        0x0000 | #define FCH_VERSION        0x0000 | ||||||
|   | |||||||
| @@ -40,6 +40,9 @@ | |||||||
|  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||||||
|  * |  * | ||||||
|  ***************************************************************************/ |  ***************************************************************************/ | ||||||
|  |  | ||||||
|  | #include <check_for_wrapper.h> | ||||||
|  |  | ||||||
| #ifndef  _FCH_PLATFORM_H_ | #ifndef  _FCH_PLATFORM_H_ | ||||||
| #define  _FCH_PLATFORM_H_ | #define  _FCH_PLATFORM_H_ | ||||||
|  |  | ||||||
|   | |||||||
| @@ -41,6 +41,8 @@ | |||||||
|  * |  * | ||||||
|  ***************************************************************************/ |  ***************************************************************************/ | ||||||
|  |  | ||||||
|  | #include <check_for_wrapper.h> | ||||||
|  |  | ||||||
| #ifndef _PSP_BASE_LIB_H_ | #ifndef _PSP_BASE_LIB_H_ | ||||||
| #define _PSP_BASE_LIB_H_ | #define _PSP_BASE_LIB_H_ | ||||||
|  |  | ||||||
|   | |||||||
| @@ -39,6 +39,8 @@ | |||||||
|  * |  * | ||||||
|  ***************************************************************************/ |  ***************************************************************************/ | ||||||
|  |  | ||||||
|  | #include <check_for_wrapper.h> | ||||||
|  |  | ||||||
| #ifndef _PSP_DIRECTORY_H_ | #ifndef _PSP_DIRECTORY_H_ | ||||||
| #define _PSP_DIRECTORY_H_ | #define _PSP_DIRECTORY_H_ | ||||||
|  |  | ||||||
|   | |||||||
| @@ -16,6 +16,7 @@ | |||||||
| #ifndef __AGESA_HEADERS_H__ | #ifndef __AGESA_HEADERS_H__ | ||||||
| #define __AGESA_HEADERS_H__ | #define __AGESA_HEADERS_H__ | ||||||
|  |  | ||||||
|  | #define AGESA_HEADERS_ARE_WRAPPED | ||||||
| #pragma pack(push) | #pragma pack(push) | ||||||
| #include "Porting.h" | #include "Porting.h" | ||||||
| #include "AGESA.h" | #include "AGESA.h" | ||||||
| @@ -29,5 +30,6 @@ | |||||||
| #include "Proc/CPU/heapManager.h" | #include "Proc/CPU/heapManager.h" | ||||||
| #include "Proc/Psp/PspBaseLib/PspBaseLib.h" | #include "Proc/Psp/PspBaseLib/PspBaseLib.h" | ||||||
| #pragma pack(pop) | #pragma pack(pop) | ||||||
|  | #undef AGESA_HEADERS_ARE_WRAPPED | ||||||
|  |  | ||||||
| #endif | #endif | ||||||
|   | |||||||
| @@ -39,6 +39,9 @@ | |||||||
|  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||||||
|  * |  * | ||||||
|  ***************************************************************************/ |  ***************************************************************************/ | ||||||
|  |  | ||||||
|  | #include <check_for_wrapper.h> | ||||||
|  |  | ||||||
| #include "Ids.h" | #include "Ids.h" | ||||||
|  |  | ||||||
| #ifndef _OPTION_IDS_H_ | #ifndef _OPTION_IDS_H_ | ||||||
|   | |||||||
							
								
								
									
										21
									
								
								src/vendorcode/amd/pi/00670F00/check_for_wrapper.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								src/vendorcode/amd/pi/00670F00/check_for_wrapper.h
									
									
									
									
									
										Normal file
									
								
							| @@ -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 | ||||||
| @@ -26,6 +26,8 @@ | |||||||
|  * |  * | ||||||
|  */ |  */ | ||||||
|  |  | ||||||
|  | #include <check_for_wrapper.h> | ||||||
|  |  | ||||||
| #if defined (__GNUC__) | #if defined (__GNUC__) | ||||||
| #include <stdint.h> | #include <stdint.h> | ||||||
| /* I/O intrin functions.  */ | /* I/O intrin functions.  */ | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user