x86: Move fsp_azalia.h to the generic fsp directory

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>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
[bmeng: remove forward declarations in fsp_support.h]
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

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 7b92392a2772060eaea651aca27bdda4895612f3..b0c36a41fe2ed300094fe66a28979ea579627354 100644 (file)
--- 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,7 +22,6 @@
 #define FSP_HIGHMEM_BASE       0x100000000ULL
 #define UPD_TERMINATOR         0x55AA
 
-
 /**
  * FSP Continuation assembly helper routine
  *