On Wed, Oct 2, 2019 at 6:55 AM Bin Meng bmeng.cn@gmail.com wrote:
Hi Simon,
On Wed, Oct 2, 2019 at 1:39 AM Simon Glass sjg@chromium.org wrote:
Hi Bin,
On Tue, 1 Oct 2019 at 04:59, Bin Meng bmeng.cn@gmail.com wrote:
Hi Simon,
On Wed, Sep 25, 2019 at 10:00 PM Simon Glass sjg@chromium.org wrote:
This header file is the same for FSP v1 and v2. Move it into the general fsp directory.
Signed-off-by: Simon Glass sjg@chromium.org
Changes in v3:
- Drop struct efi_guid and add a comment about forward declarations
Changes in v2:
- Rewrite to make azalia a common file for FSP1 and FSP2
arch/x86/include/asm/{fsp1 => fsp}/fsp_azalia.h | 0 arch/x86/include/asm/fsp1/fsp_support.h | 5 ++++- 2 files changed, 4 insertions(+), 1 deletion(-) rename arch/x86/include/asm/{fsp1 => fsp}/fsp_azalia.h (100%)
diff --git a/arch/x86/include/asm/fsp1/fsp_azalia.h b/arch/x86/include/asm/fsp/fsp_azalia.h similarity index 100% rename from arch/x86/include/asm/fsp1/fsp_azalia.h rename to arch/x86/include/asm/fsp/fsp_azalia.h diff --git a/arch/x86/include/asm/fsp1/fsp_support.h b/arch/x86/include/asm/fsp1/fsp_support.h index 7b92392a277..6d30dd7fbc8 100644 --- a/arch/x86/include/asm/fsp1/fsp_support.h +++ b/arch/x86/include/asm/fsp1/fsp_support.h @@ -14,7 +14,7 @@ #include "fsp_api.h" #include "fsp_infoheader.h" #include "fsp_bootmode.h" -#include "fsp_azalia.h" +#include <asm/fsp/fsp_azalia.h> #include <asm/arch/fsp/fsp_vpd.h> #include <asm/arch/fsp/fsp_configs.h>
@@ -22,6 +22,9 @@ #define FSP_HIGHMEM_BASE 0x100000000ULL #define UPD_TERMINATOR 0x55AA
+/* Forward declarations for update_fsp_configs() */
These two structs are defined in <asm/arch/fsp/fsp_configs.h> and the header is already included.
They should be dropped from this patch. Let me know if you have different idea.
I suppose that is OK. My goal was to avoid #include in header files where possible, but it's not important here.
Yes, I understand your intention.
Thank you.
I can fix this when applying.
Fixed the issue, and
Reviewed-by: Bin Meng bmeng.cn@gmail.com
applied to u-boot-x86/next, thanks!