[U-Boot] [PATCH 6/8] x86: fsp: Move struct fspinit_rtbuf definition to chipset header

Bin Meng bmeng.cn at gmail.com
Wed Dec 2 09:59:02 CET 2015


All FSP spec v1.0 complaint FSP binary uses struct fspinit_rtbuf
as defined by the 1.0 spec, however there are FSPs that does not
follow 1.0 spec (possible due to that FSP predates the 1.0 spec),
and future FSP binary that is complaint to v1.1 spec defines an
optional paltform-specific runtime data in the struct fspinit_rtbuf.
Hence move the definition to chipset header.

Signed-off-by: Bin Meng <bmeng.cn at gmail.com>
---

 arch/x86/include/asm/arch-baytrail/fsp/fsp_configs.h  |  4 ++++
 arch/x86/include/asm/arch-queensbay/fsp/fsp_configs.h |  4 ++++
 arch/x86/include/asm/fsp/fsp_platform.h               | 15 ---------------
 arch/x86/include/asm/fsp/fsp_support.h                |  1 -
 4 files changed, 8 insertions(+), 16 deletions(-)
 delete mode 100644 arch/x86/include/asm/fsp/fsp_platform.h

diff --git a/arch/x86/include/asm/arch-baytrail/fsp/fsp_configs.h b/arch/x86/include/asm/arch-baytrail/fsp/fsp_configs.h
index 2397553..f1da205 100644
--- a/arch/x86/include/asm/arch-baytrail/fsp/fsp_configs.h
+++ b/arch/x86/include/asm/arch-baytrail/fsp/fsp_configs.h
@@ -14,4 +14,8 @@ struct fsp_config_data {
 	struct upd_region	fsp_upd;
 };
 
+struct fspinit_rtbuf {
+	struct common_buf	common;	/* FSP common runtime data structure */
+};
+
 #endif /* __FSP_CONFIGS_H__ */
diff --git a/arch/x86/include/asm/arch-queensbay/fsp/fsp_configs.h b/arch/x86/include/asm/arch-queensbay/fsp/fsp_configs.h
index 2397553..f1da205 100644
--- a/arch/x86/include/asm/arch-queensbay/fsp/fsp_configs.h
+++ b/arch/x86/include/asm/arch-queensbay/fsp/fsp_configs.h
@@ -14,4 +14,8 @@ struct fsp_config_data {
 	struct upd_region	fsp_upd;
 };
 
+struct fspinit_rtbuf {
+	struct common_buf	common;	/* FSP common runtime data structure */
+};
+
 #endif /* __FSP_CONFIGS_H__ */
diff --git a/arch/x86/include/asm/fsp/fsp_platform.h b/arch/x86/include/asm/fsp/fsp_platform.h
deleted file mode 100644
index 61286ce..0000000
--- a/arch/x86/include/asm/fsp/fsp_platform.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (C) 2013, Intel Corporation
- * Copyright (C) 2014, Bin Meng <bmeng.cn at gmail.com>
- *
- * SPDX-License-Identifier:	Intel
- */
-
-#ifndef __FSP_PLATFORM_H__
-#define __FSP_PLATFORM_H__
-
-struct fspinit_rtbuf {
-	struct common_buf	common;	/* FSP common runtime data structure */
-};
-
-#endif
diff --git a/arch/x86/include/asm/fsp/fsp_support.h b/arch/x86/include/asm/fsp/fsp_support.h
index 67741cc..e65a130 100644
--- a/arch/x86/include/asm/fsp/fsp_support.h
+++ b/arch/x86/include/asm/fsp/fsp_support.h
@@ -13,7 +13,6 @@
 #include "fsp_ffs.h"
 #include "fsp_api.h"
 #include "fsp_hob.h"
-#include "fsp_platform.h"
 #include "fsp_infoheader.h"
 #include "fsp_bootmode.h"
 #include <asm/arch/fsp/fsp_vpd.h>
-- 
1.8.2.1



More information about the U-Boot mailing list