From: Simon Glass <sjg@chromium.org>
Date: Wed, 25 Sep 2019 14:00:19 +0000 (-0600)
Subject: x86: Move fsp_bootmode.h to the generic fsp directory
X-Git-Tag: v2020.01-rc1~35^2~86
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=79b228baae06a57d0d01358e832d5ea2f2cc02d3;p=oweals%2Fu-boot.git

x86: Move fsp_bootmode.h to the generic fsp directory

This header file is the same for FSP v1 and v2, although there may be
some additions to come. Move it into the generic fsp directory.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
---

diff --git a/arch/x86/include/asm/fsp/fsp_bootmode.h b/arch/x86/include/asm/fsp/fsp_bootmode.h
new file mode 100644
index 0000000000..bc96ec308c
--- /dev/null
+++ b/arch/x86/include/asm/fsp/fsp_bootmode.h
@@ -0,0 +1,23 @@
+/* SPDX-License-Identifier: Intel */
+/*
+ * Copyright (C) 2013, Intel Corporation
+ * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com>
+ */
+
+#ifndef __FSP_BOOT_MODE_H__
+#define __FSP_BOOT_MODE_H__
+
+/* 0x21 - 0xf..f are reserved */
+#define BOOT_FULL_CONFIG		0x00
+#define BOOT_MINIMAL_CONFIG		0x01
+#define BOOT_NO_CONFIG_CHANGES		0x02
+#define BOOT_FULL_CONFIG_PLUS_DIAG	0x03
+#define BOOT_DEFAULT_SETTINGS		0x04
+#define BOOT_ON_S4_RESUME		0x05
+#define BOOT_ON_S5_RESUME		0x06
+#define BOOT_ON_S2_RESUME		0x10
+#define BOOT_ON_S3_RESUME		0x11
+#define BOOT_ON_FLASH_UPDATE		0x12
+#define BOOT_IN_RECOVERY_MODE		0x20
+
+#endif
diff --git a/arch/x86/include/asm/fsp1/fsp_bootmode.h b/arch/x86/include/asm/fsp1/fsp_bootmode.h
deleted file mode 100644
index bc96ec308c..0000000000
--- a/arch/x86/include/asm/fsp1/fsp_bootmode.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* SPDX-License-Identifier: Intel */
-/*
- * Copyright (C) 2013, Intel Corporation
- * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com>
- */
-
-#ifndef __FSP_BOOT_MODE_H__
-#define __FSP_BOOT_MODE_H__
-
-/* 0x21 - 0xf..f are reserved */
-#define BOOT_FULL_CONFIG		0x00
-#define BOOT_MINIMAL_CONFIG		0x01
-#define BOOT_NO_CONFIG_CHANGES		0x02
-#define BOOT_FULL_CONFIG_PLUS_DIAG	0x03
-#define BOOT_DEFAULT_SETTINGS		0x04
-#define BOOT_ON_S4_RESUME		0x05
-#define BOOT_ON_S5_RESUME		0x06
-#define BOOT_ON_S2_RESUME		0x10
-#define BOOT_ON_S3_RESUME		0x11
-#define BOOT_ON_FLASH_UPDATE		0x12
-#define BOOT_IN_RECOVERY_MODE		0x20
-
-#endif
diff --git a/arch/x86/include/asm/fsp1/fsp_support.h b/arch/x86/include/asm/fsp1/fsp_support.h
index ed4335ed29..c2c5288ebd 100644
--- a/arch/x86/include/asm/fsp1/fsp_support.h
+++ b/arch/x86/include/asm/fsp1/fsp_support.h
@@ -7,12 +7,12 @@
 #ifndef __FSP_SUPPORT_H__
 #define __FSP_SUPPORT_H__
 
+#include <asm/fsp/fsp_bootmode.h>
 #include <asm/fsp/fsp_fv.h>
 #include <asm/fsp/fsp_hob.h>
 #include <asm/fsp/fsp_infoheader.h>
 #include <asm/fsp/fsp_types.h>
 #include "fsp_ffs.h"
-#include "fsp_bootmode.h"
 #include <asm/fsp_arch.h>
 #include <asm/fsp/fsp_azalia.h>