fsp: Move fsp to fsp1_0

Prepare for FSP 1.1 integration by moving the FSP to a FSP 1.0 specific
directory. See follow-on patches for sharing of common code.

Change-Id: Ic58cb4074c65b91d119909132a012876d7ee7b74
Signed-off-by: Marc Jones <marc.jones@se-eng.com>
Reviewed-on: http://review.coreboot.org/9970
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>

46 files changed, 4 insertions, 4 deletions

diff --git a/src/vendorcode/intel/Kconfig b/src/vendorcode/intel/Kconfig
index 21b48ae4d7..312f4de998 100644
--- a/src/vendorcode/intel/Kconfig
+++ b/src/vendorcode/intel/Kconfig
@@ -19,7 +19,7 @@
 
 config FSP_VENDORCODE_HEADER_PATH
 	string
-	default "fsp/ivybridge_bd82x6x" if CPU_INTEL_FSP_MODEL_306AX && SOUTHBRIDGE_INTEL_FSP_BD82X6X
-	default "fsp/ivybridge_i89xx" if CPU_INTEL_FSP_MODEL_306AX && SOUTHBRIDGE_INTEL_FSP_I89XX
-	default "fsp/baytrail" if SOC_INTEL_FSP_BAYTRAIL
-	default "fsp/rangeley" if CPU_INTEL_FSP_MODEL_406DX
+	default "fsp1_0/ivybridge_bd82x6x" if CPU_INTEL_FSP_MODEL_306AX && SOUTHBRIDGE_INTEL_FSP_BD82X6X
+	default "fsp1_0/ivybridge_i89xx" if CPU_INTEL_FSP_MODEL_306AX && SOUTHBRIDGE_INTEL_FSP_I89XX
+	default "fsp1_0/baytrail" if SOC_INTEL_FSP_BAYTRAIL
+	default "fsp1_0/rangeley" if CPU_INTEL_FSP_MODEL_406DX
diff --git a/src/vendorcode/intel/fsp/baytrail/absf/minnowmax_1gb.absf b/src/vendorcode/intel/fsp1_0/baytrail/absf/minnowmax_1gb.absf
index 66ab0d774c..66ab0d774c 100644
--- a/src/vendorcode/intel/fsp/baytrail/absf/minnowmax_1gb.absf
+++ b/src/vendorcode/intel/fsp1_0/baytrail/absf/minnowmax_1gb.absf
diff --git a/src/vendorcode/intel/fsp/baytrail/absf/minnowmax_2gb.absf b/src/vendorcode/intel/fsp1_0/baytrail/absf/minnowmax_2gb.absf
index 6992fe7dce..6992fe7dce 100644
--- a/src/vendorcode/intel/fsp/baytrail/absf/minnowmax_2gb.absf
+++ b/src/vendorcode/intel/fsp1_0/baytrail/absf/minnowmax_2gb.absf
diff --git a/src/vendorcode/intel/fsp/baytrail/include/azalia.h b/src/vendorcode/intel/fsp1_0/baytrail/include/azalia.h
index c58cf4ce4c..c58cf4ce4c 100644
--- a/src/vendorcode/intel/fsp/baytrail/include/azalia.h
+++ b/src/vendorcode/intel/fsp1_0/baytrail/include/azalia.h
diff --git a/src/vendorcode/intel/fsp/baytrail/include/fsp.h b/src/vendorcode/intel/fsp1_0/baytrail/include/fsp.h
index f2e1d8fabf..f2e1d8fabf 100644
--- a/src/vendorcode/intel/fsp/baytrail/include/fsp.h
+++ b/src/vendorcode/intel/fsp1_0/baytrail/include/fsp.h
diff --git a/src/vendorcode/intel/fsp/baytrail/include/fspapi.h b/src/vendorcode/intel/fsp1_0/baytrail/include/fspapi.h
index 26afc0efdf..26afc0efdf 100644
--- a/src/vendorcode/intel/fsp/baytrail/include/fspapi.h
+++ b/src/vendorcode/intel/fsp1_0/baytrail/include/fspapi.h
diff --git a/src/vendorcode/intel/fsp/baytrail/include/fspffs.h b/src/vendorcode/intel/fsp1_0/baytrail/include/fspffs.h
index f3b83b2a3e..f3b83b2a3e 100644
--- a/src/vendorcode/intel/fsp/baytrail/include/fspffs.h
+++ b/src/vendorcode/intel/fsp1_0/baytrail/include/fspffs.h
diff --git a/src/vendorcode/intel/fsp/baytrail/include/fspfv.h b/src/vendorcode/intel/fsp1_0/baytrail/include/fspfv.h
index 26c00f266a..26c00f266a 100644
--- a/src/vendorcode/intel/fsp/baytrail/include/fspfv.h
+++ b/src/vendorcode/intel/fsp1_0/baytrail/include/fspfv.h
diff --git a/src/vendorcode/intel/fsp/baytrail/include/fsphob.h b/src/vendorcode/intel/fsp1_0/baytrail/include/fsphob.h
index 7edef0d69e..7edef0d69e 100644
--- a/src/vendorcode/intel/fsp/baytrail/include/fsphob.h
+++ b/src/vendorcode/intel/fsp1_0/baytrail/include/fsphob.h
diff --git a/src/vendorcode/intel/fsp/baytrail/include/fspinfoheader.h b/src/vendorcode/intel/fsp1_0/baytrail/include/fspinfoheader.h
index b277bcd5f7..b277bcd5f7 100644
--- a/src/vendorcode/intel/fsp/baytrail/include/fspinfoheader.h
+++ b/src/vendorcode/intel/fsp1_0/baytrail/include/fspinfoheader.h
diff --git a/src/vendorcode/intel/fsp/baytrail/include/fspplatform.h b/src/vendorcode/intel/fsp1_0/baytrail/include/fspplatform.h
index 81f7b66a4a..81f7b66a4a 100644
--- a/src/vendorcode/intel/fsp/baytrail/include/fspplatform.h
+++ b/src/vendorcode/intel/fsp1_0/baytrail/include/fspplatform.h
diff --git a/src/vendorcode/intel/fsp/baytrail/include/fsptypes.h b/src/vendorcode/intel/fsp1_0/baytrail/include/fsptypes.h
index 4a313adc5d..4a313adc5d 100644
--- a/src/vendorcode/intel/fsp/baytrail/include/fsptypes.h
+++ b/src/vendorcode/intel/fsp1_0/baytrail/include/fsptypes.h
diff --git a/src/vendorcode/intel/fsp/baytrail/include/fspvpd.h b/src/vendorcode/intel/fsp1_0/baytrail/include/fspvpd.h
index b001cdb28c..b001cdb28c 100644
--- a/src/vendorcode/intel/fsp/baytrail/include/fspvpd.h
+++ b/src/vendorcode/intel/fsp1_0/baytrail/include/fspvpd.h
diff --git a/src/vendorcode/intel/fsp/baytrail/srx/board_fsp.c b/src/vendorcode/intel/fsp1_0/baytrail/srx/board_fsp.c
index 2cb3492fa4..2cb3492fa4 100644
--- a/src/vendorcode/intel/fsp/baytrail/srx/board_fsp.c
+++ b/src/vendorcode/intel/fsp1_0/baytrail/srx/board_fsp.c
diff --git a/src/vendorcode/intel/fsp/baytrail/srx/fsphob.c b/src/vendorcode/intel/fsp1_0/baytrail/srx/fsphob.c
index 5d6e890300..5d6e890300 100644
--- a/src/vendorcode/intel/fsp/baytrail/srx/fsphob.c
+++ b/src/vendorcode/intel/fsp1_0/baytrail/srx/fsphob.c
diff --git a/src/vendorcode/intel/fsp/ivybridge_bd82x6x/include/fspapi.h b/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/include/fspapi.h
index 952073603b..952073603b 100644
--- a/src/vendorcode/intel/fsp/ivybridge_bd82x6x/include/fspapi.h
+++ b/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/include/fspapi.h
diff --git a/src/vendorcode/intel/fsp/ivybridge_bd82x6x/include/fspffs.h b/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/include/fspffs.h
index 7a7c367c76..7a7c367c76 100644
--- a/src/vendorcode/intel/fsp/ivybridge_bd82x6x/include/fspffs.h
+++ b/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/include/fspffs.h
diff --git a/src/vendorcode/intel/fsp/ivybridge_bd82x6x/include/fspfv.h b/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/include/fspfv.h
index 75d17faa6a..75d17faa6a 100644
--- a/src/vendorcode/intel/fsp/ivybridge_bd82x6x/include/fspfv.h
+++ b/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/include/fspfv.h
diff --git a/src/vendorcode/intel/fsp/ivybridge_bd82x6x/include/fsphob.h b/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/include/fsphob.h
index 58409074bc..58409074bc 100644
--- a/src/vendorcode/intel/fsp/ivybridge_bd82x6x/include/fsphob.h
+++ b/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/include/fsphob.h
diff --git a/src/vendorcode/intel/fsp/ivybridge_bd82x6x/include/fspinfoheader.h b/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/include/fspinfoheader.h
index 0f7b3a9d63..0f7b3a9d63 100644
--- a/src/vendorcode/intel/fsp/ivybridge_bd82x6x/include/fspinfoheader.h
+++ b/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/include/fspinfoheader.h
diff --git a/src/vendorcode/intel/fsp/ivybridge_bd82x6x/include/fspplatform.h b/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/include/fspplatform.h
index 06cf67ee7c..06cf67ee7c 100644
--- a/src/vendorcode/intel/fsp/ivybridge_bd82x6x/include/fspplatform.h
+++ b/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/include/fspplatform.h
diff --git a/src/vendorcode/intel/fsp/ivybridge_bd82x6x/include/fsptypes.h b/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/include/fsptypes.h
index a3a54c0d2f..a3a54c0d2f 100644
--- a/src/vendorcode/intel/fsp/ivybridge_bd82x6x/include/fsptypes.h
+++ b/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/include/fsptypes.h
diff --git a/src/vendorcode/intel/fsp/ivybridge_bd82x6x/include/mem_config.h b/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/include/mem_config.h
index 26deb90075..26deb90075 100644
--- a/src/vendorcode/intel/fsp/ivybridge_bd82x6x/include/mem_config.h
+++ b/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/include/mem_config.h
diff --git a/src/vendorcode/intel/fsp/ivybridge_bd82x6x/include/peifsp.h b/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/include/peifsp.h
index dc3e60f1fc..dc3e60f1fc 100644
--- a/src/vendorcode/intel/fsp/ivybridge_bd82x6x/include/peifsp.h
+++ b/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/include/peifsp.h
diff --git a/src/vendorcode/intel/fsp/ivybridge_bd82x6x/srx/fsphob.c b/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/srx/fsphob.c
index 4214b3ae22..4214b3ae22 100644
--- a/src/vendorcode/intel/fsp/ivybridge_bd82x6x/srx/fsphob.c
+++ b/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/srx/fsphob.c
diff --git a/src/vendorcode/intel/fsp/ivybridge_i89xx/include/fsp_vpd.h b/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/include/fsp_vpd.h
index fdee5f4d9c..fdee5f4d9c 100644
--- a/src/vendorcode/intel/fsp/ivybridge_i89xx/include/fsp_vpd.h
+++ b/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/include/fsp_vpd.h
diff --git a/src/vendorcode/intel/fsp/ivybridge_i89xx/include/fspapi.h b/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/include/fspapi.h
index 18a1582a27..18a1582a27 100644
--- a/src/vendorcode/intel/fsp/ivybridge_i89xx/include/fspapi.h
+++ b/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/include/fspapi.h
diff --git a/src/vendorcode/intel/fsp/ivybridge_i89xx/include/fspffs.h b/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/include/fspffs.h
index 7a7c367c76..7a7c367c76 100644
--- a/src/vendorcode/intel/fsp/ivybridge_i89xx/include/fspffs.h
+++ b/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/include/fspffs.h
diff --git a/src/vendorcode/intel/fsp/ivybridge_i89xx/include/fspfv.h b/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/include/fspfv.h
index 75d17faa6a..75d17faa6a 100644
--- a/src/vendorcode/intel/fsp/ivybridge_i89xx/include/fspfv.h
+++ b/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/include/fspfv.h
diff --git a/src/vendorcode/intel/fsp/ivybridge_i89xx/include/fsphob.h b/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/include/fsphob.h
index 58409074bc..58409074bc 100644
--- a/src/vendorcode/intel/fsp/ivybridge_i89xx/include/fsphob.h
+++ b/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/include/fsphob.h
diff --git a/src/vendorcode/intel/fsp/ivybridge_i89xx/include/fspinfoheader.h b/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/include/fspinfoheader.h
index 0f7b3a9d63..0f7b3a9d63 100644
--- a/src/vendorcode/intel/fsp/ivybridge_i89xx/include/fspinfoheader.h
+++ b/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/include/fspinfoheader.h
diff --git a/src/vendorcode/intel/fsp/ivybridge_i89xx/include/fspplatform.h b/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/include/fspplatform.h
index e78ac47a25..e78ac47a25 100644
--- a/src/vendorcode/intel/fsp/ivybridge_i89xx/include/fspplatform.h
+++ b/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/include/fspplatform.h
diff --git a/src/vendorcode/intel/fsp/ivybridge_i89xx/include/fsptypes.h b/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/include/fsptypes.h
index a3a54c0d2f..a3a54c0d2f 100644
--- a/src/vendorcode/intel/fsp/ivybridge_i89xx/include/fsptypes.h
+++ b/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/include/fsptypes.h
diff --git a/src/vendorcode/intel/fsp/ivybridge_i89xx/include/mem_config.h b/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/include/mem_config.h
index 26deb90075..26deb90075 100644
--- a/src/vendorcode/intel/fsp/ivybridge_i89xx/include/mem_config.h
+++ b/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/include/mem_config.h
diff --git a/src/vendorcode/intel/fsp/ivybridge_i89xx/include/peifsp.h b/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/include/peifsp.h
index dc3e60f1fc..dc3e60f1fc 100644
--- a/src/vendorcode/intel/fsp/ivybridge_i89xx/include/peifsp.h
+++ b/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/include/peifsp.h
diff --git a/src/vendorcode/intel/fsp/ivybridge_i89xx/srx/fsphob.c b/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/srx/fsphob.c
index 4214b3ae22..4214b3ae22 100644
--- a/src/vendorcode/intel/fsp/ivybridge_i89xx/srx/fsphob.c
+++ b/src/vendorcode/intel/fsp1_0/ivybridge_i89xx/srx/fsphob.c
diff --git a/src/vendorcode/intel/fsp/rangeley/include/fspapi.h b/src/vendorcode/intel/fsp1_0/rangeley/include/fspapi.h
index 5009246db4..5009246db4 100644
--- a/src/vendorcode/intel/fsp/rangeley/include/fspapi.h
+++ b/src/vendorcode/intel/fsp1_0/rangeley/include/fspapi.h
diff --git a/src/vendorcode/intel/fsp/rangeley/include/fspbootmode.h b/src/vendorcode/intel/fsp1_0/rangeley/include/fspbootmode.h
index 16cddf073d..16cddf073d 100644
--- a/src/vendorcode/intel/fsp/rangeley/include/fspbootmode.h
+++ b/src/vendorcode/intel/fsp1_0/rangeley/include/fspbootmode.h
diff --git a/src/vendorcode/intel/fsp/rangeley/include/fspffs.h b/src/vendorcode/intel/fsp1_0/rangeley/include/fspffs.h
index 9e8244dc17..9e8244dc17 100644
--- a/src/vendorcode/intel/fsp/rangeley/include/fspffs.h
+++ b/src/vendorcode/intel/fsp1_0/rangeley/include/fspffs.h
diff --git a/src/vendorcode/intel/fsp/rangeley/include/fspfv.h b/src/vendorcode/intel/fsp1_0/rangeley/include/fspfv.h
index 9688cf472e..9688cf472e 100644
--- a/src/vendorcode/intel/fsp/rangeley/include/fspfv.h
+++ b/src/vendorcode/intel/fsp1_0/rangeley/include/fspfv.h
diff --git a/src/vendorcode/intel/fsp/rangeley/include/fsphob.h b/src/vendorcode/intel/fsp1_0/rangeley/include/fsphob.h
index 0f743b50d4..0f743b50d4 100644
--- a/src/vendorcode/intel/fsp/rangeley/include/fsphob.h
+++ b/src/vendorcode/intel/fsp1_0/rangeley/include/fsphob.h
diff --git a/src/vendorcode/intel/fsp/rangeley/include/fspinfoheader.h b/src/vendorcode/intel/fsp1_0/rangeley/include/fspinfoheader.h
index 28382cf20e..28382cf20e 100644
--- a/src/vendorcode/intel/fsp/rangeley/include/fspinfoheader.h
+++ b/src/vendorcode/intel/fsp1_0/rangeley/include/fspinfoheader.h
diff --git a/src/vendorcode/intel/fsp/rangeley/include/fspplatform.h b/src/vendorcode/intel/fsp1_0/rangeley/include/fspplatform.h
index ce479bf9f8..ce479bf9f8 100644
--- a/src/vendorcode/intel/fsp/rangeley/include/fspplatform.h
+++ b/src/vendorcode/intel/fsp1_0/rangeley/include/fspplatform.h
diff --git a/src/vendorcode/intel/fsp/rangeley/include/fsptypes.h b/src/vendorcode/intel/fsp1_0/rangeley/include/fsptypes.h
index 5912e0115b..5912e0115b 100644
--- a/src/vendorcode/intel/fsp/rangeley/include/fsptypes.h
+++ b/src/vendorcode/intel/fsp1_0/rangeley/include/fsptypes.h
diff --git a/src/vendorcode/intel/fsp/rangeley/include/fspvpd.h b/src/vendorcode/intel/fsp1_0/rangeley/include/fspvpd.h
index fba38a0e25..fba38a0e25 100644
--- a/src/vendorcode/intel/fsp/rangeley/include/fspvpd.h
+++ b/src/vendorcode/intel/fsp1_0/rangeley/include/fspvpd.h
diff --git a/src/vendorcode/intel/fsp/rangeley/srx/fsphob.c b/src/vendorcode/intel/fsp1_0/rangeley/srx/fsphob.c
index 4986d52436..4986d52436 100644
--- a/src/vendorcode/intel/fsp/rangeley/srx/fsphob.c
+++ b/src/vendorcode/intel/fsp1_0/rangeley/srx/fsphob.c