At present fsp_support.h includes fsp_vpd.h which is an FPSv1 concept
(VPD means Vital Product Data). For FSPv2 only UPD (Updatable Product
Data) is used.
To avoid mangling header files, put these two includes in a separate
header which we can adjust as necessary for FSPv2.
Signed-off-by: Simon Glass
---
arch/x86/include/asm/fsp1/fsp_support.h | 3 +--
arch/x86/include/asm/fsp_arch.h | 20
2 files changed, 21 insertions(+), 2 deletions(-)
create mode 100644 arch/x86/include/asm/fsp_arch.h
diff --git a/arch/x86/include/asm/fsp1/fsp_support.h
b/arch/x86/include/asm/fsp1/fsp_support.h
index 72fbcbc393..423b523e60 100644
--- a/arch/x86/include/asm/fsp1/fsp_support.h
+++ b/arch/x86/include/asm/fsp1/fsp_support.h
@@ -14,8 +14,7 @@
#include "fsp_api.h"
#include "fsp_infoheader.h"
#include "fsp_bootmode.h"
-#include
-#include
+#include
#define FSP_LOWMEM_BASE0x10UL
#define FSP_HIGHMEM_BASE 0x1ULL
diff --git a/arch/x86/include/asm/fsp_arch.h b/arch/x86/include/asm/fsp_arch.h
new file mode 100644
index 00..fb7f9109f7
--- /dev/null
+++ b/arch/x86/include/asm/fsp_arch.h
@@ -0,0 +1,20 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2019 Google LLC
+ * Written by Simon Glass
+ *
+ * Architecture-specific definitions (FSP config and VPD/UPD)
+ */
+
+#ifndef __FSP_ARCH_H__
+#define __FSP_ARCH_H__
+
+/*
+ * Note: use #ifndef __ASSEMBLY__ around any struct definitions or other C code
+ * since this file can be included from assembly.
+ */
+
+#include
+#include
+
+#endif
--
2.23.0.rc1.153.gdeed80330f-goog
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot