Change binaries from Common folder to Board folder.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a...@intel.com>
---
Platform/BroxtonPlatformPkg/BuildBxtBios.sh | 56 +++++++++++-----------
.../Common/Tools/Stitch/IFWIStitch_Simple.bat | 36 +++++++-------
2 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/Platform/BroxtonPlatformPkg/BuildBxtBios.sh
b/Platform/BroxtonPlatformPkg/BuildBxtBios.sh
index 74aa782..4ea22bb 100755
--- a/Platform/BroxtonPlatformPkg/BuildBxtBios.sh
+++ b/Platform/BroxtonPlatformPkg/BuildBxtBios.sh
@@ -331,52 +331,52 @@ cp -f $BUILD_PATH/FV/FVIBBL.Fv
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Too
if [ $BoardId == "BG" ]; then
if [ $FabId == "B" ]; then
- cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/BensonGlacier/FAB_B/SpiChunk1.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
- cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/BensonGlacier/FAB_B/SpiChunk2.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
- cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/BensonGlacier/FAB_B/SpiChunk3.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
- cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/BensonGlacier/FAB_B/GCC/NvStorage.Fv
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_B/SpiChunk1.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_B/SpiChunk2.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_B/SpiChunk3.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_B/GCC/NvStorage.Fv
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
else
- cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/BensonGlacier/FAB_A/SpiChunk1.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
- cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/BensonGlacier/FAB_A/SpiChunk2.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
- cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/BensonGlacier/FAB_A/SpiChunk3.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
- cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/BensonGlacier/FAB_A/GCC/NvStorage.Fv
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_A/SpiChunk1.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_A/SpiChunk2.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_A/SpiChunk3.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Board/BensonGlacier/IFWI/FAB_A/GCC/NvStorage.Fv
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
fi
fi
if [ $BoardId == "MN" ]; then
if [ $FabId == "B" ]; then
- cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/MinnowBoard3/FAB_B/SpiChunk1.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
- cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/MinnowBoard3/FAB_B/SpiChunk2.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
- cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/MinnowBoard3/FAB_B/SpiChunk3.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
- cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/MinnowBoard3/FAB_B/GCC/NvStorage.Fv
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_B/SpiChunk1.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_B/SpiChunk2.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_B/SpiChunk3.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_B/GCC/NvStorage.Fv
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
else
- cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/MinnowBoard3/FAB_A/SpiChunk1.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
- cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/MinnowBoard3/FAB_A/SpiChunk2.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
- cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/MinnowBoard3/FAB_A/SpiChunk3.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
- cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/MinnowBoard3/FAB_A/GCC/NvStorage.Fv
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_A/SpiChunk1.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_A/SpiChunk2.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_A/SpiChunk3.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3/IFWI/FAB_A/GCC/NvStorage.Fv
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
fi
fi
if [ $BoardId == "MX" ]; then
if [ $FabId == "B" ]; then
- cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/MinnowBoard3Next/FAB_B/SpiChunk1.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
- cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/MinnowBoard3Next/FAB_B/SpiChunk2.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
- cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/MinnowBoard3Next/FAB_B/SpiChunk3.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
- cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/MinnowBoard3Next/FAB_B/GCC/NvStorage.Fv
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_B/SpiChunk1.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_B/SpiChunk2.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_B/SpiChunk3.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_B/GCC/NvStorage.Fv
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
else
- cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/MinnowBoard3Next/FAB_A/SpiChunk1.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
- cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/MinnowBoard3Next/FAB_A/SpiChunk2.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
- cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/MinnowBoard3Next/FAB_A/SpiChunk3.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
- cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/MinnowBoard3Next/FAB_A/GCC/NvStorage.Fv
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_A/SpiChunk1.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_A/SpiChunk2.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_A/SpiChunk3.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Board/MinnowBoard3Next/IFWI/FAB_A/GCC/NvStorage.Fv
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
fi
fi
if [ $BoardId == "LH" ]; then
if [ $FabId == "D" ]; then
- cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/LeafHill/FAB_D/SpiChunk1.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
- cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/LeafHill/FAB_D/SpiChunk2.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
- cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/LeafHill/FAB_D/SpiChunk3.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
- cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Binaries/IFWI/LeafHill/FAB_D/GCC/NvStorage.Fv
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Board/LeafHill/IFWI/FAB_D/SpiChunk1.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Board/LeafHill/IFWI/FAB_D/SpiChunk2.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Board/LeafHill/IFWI/FAB_D/SpiChunk3.bin
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
+ cp -f
$WORKSPACE/Platform/BroxtonPlatformPkg/Board/LeafHill/IFWI/FAB_D/GCC/NvStorage.Fv
$WORKSPACE/Platform/BroxtonPlatformPkg/Common/Tools/Stitch
fi
fi
diff --git
a/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat
b/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat
index 4c1fcb1..2071831 100644
--- a/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat
+++ b/Platform/BroxtonPlatformPkg/Common/Tools/Stitch/IFWIStitch_Simple.bat
@@ -145,36 +145,36 @@ copy /y /b %BIOS_Names%\NvStorage.Fv .\BIOS_COMPONENTS
if %BoardId%==BG (
if %FabId%==B (
- copy /y /b ..\..\Binaries\IFWI\BensonGlacier\FAB_B\SpiChunk1.bin .
- copy /y /b ..\..\Binaries\IFWI\BensonGlacier\FAB_B\SpiChunk2.bin .
- copy /y /b ..\..\Binaries\IFWI\BensonGlacier\FAB_B\SpiChunk3.bin .
+ copy /y /b ..\..\..\Board\BensonGlacier\IFWI\FAB_B\SpiChunk1.bin .
+ copy /y /b ..\..\..\Board\BensonGlacier\IFWI\FAB_B\SpiChunk2.bin .
+ copy /y /b ..\..\..\Board\BensonGlacier\IFWI\FAB_B\SpiChunk3.bin .
) else (
- copy /y /b ..\..\Binaries\IFWI\BensonGlacier\FAB_A\SpiChunk1.bin .
- copy /y /b ..\..\Binaries\IFWI\BensonGlacier\FAB_A\SpiChunk2.bin .
- copy /y /b ..\..\Binaries\IFWI\BensonGlacier\FAB_A\SpiChunk3.bin .
+ copy /y /b ..\..\..\Board\BensonGlacier\IFWI\FAB_A\SpiChunk1.bin .
+ copy /y /b ..\..\..\Board\BensonGlacier\IFWI\FAB_A\SpiChunk2.bin .
+ copy /y /b ..\..\..\Board\BensonGlacier\IFWI\FAB_A\SpiChunk3.bin .
)
copy /y /b
SpiChunk1.bin+.\BIOS_COMPONENTS\IBBL.Fv+.\BIOS_COMPONENTS\IBB.Fv+SpiChunk2.bin+.\BIOS_COMPONENTS\OBB.Fv+.\BIOS_COMPONENTS\NvStorage.Fv+SpiChunk3.bin
spi_out.bin
) else if %BoardId%==MN (
if %FabId%==B (
- copy /y /b ..\..\Binaries\IFWI\MinnowBoard3\FAB_B\SpiChunk1.bin .
- copy /y /b ..\..\Binaries\IFWI\MinnowBoard3\FAB_B\SpiChunk2.bin .
- copy /y /b ..\..\Binaries\IFWI\MinnowBoard3\FAB_B\SpiChunk3.bin .
+ copy /y /b ..\..\..\Board\MinnowBoard3\IFWI\FAB_B\SpiChunk1.bin .
+ copy /y /b ..\..\..\Board\MinnowBoard3\IFWI\FAB_B\SpiChunk2.bin .
+ copy /y /b ..\..\..\Board\MinnowBoard3\IFWI\FAB_B\SpiChunk3.bin .
copy /y /b
SpiChunk1.bin+.\BIOS_COMPONENTS\IBBL.Fv+.\BIOS_COMPONENTS\IBB.Fv+SpiChunk2.bin+.\BIOS_COMPONENTS\OBB.Fv+.\BIOS_COMPONENTS\NvStorage.Fv+SpiChunk3.bin
spi_out.bin
) else (
- copy /y /b ..\..\Binaries\IFWI\MinnowBoard3\FAB_A\SpiChunk1.bin .
- copy /y /b ..\..\Binaries\IFWI\MinnowBoard3\FAB_A\SpiChunk2.bin .
- copy /y /b ..\..\Binaries\IFWI\MinnowBoard3\FAB_A\SpiChunk3.bin .
+ copy /y /b ..\..\..\Board\MinnowBoard3\IFWI\FAB_A\SpiChunk1.bin .
+ copy /y /b ..\..\..\Board\MinnowBoard3\IFWI\FAB_A\SpiChunk2.bin .
+ copy /y /b ..\..\..\Board\MinnowBoard3\IFWI\FAB_A\SpiChunk3.bin .
copy /y /b
SpiChunk1.bin+.\BIOS_COMPONENTS\IBBL.Fv+.\BIOS_COMPONENTS\IBB.Fv+SpiChunk2.bin+.\BIOS_COMPONENTS\OBB.Fv+.\BIOS_COMPONENTS\NvStorage.Fv+SpiChunk3.bin
spi_out.bin
)
) else if %BoardId%==MX (
- copy /y /b ..\..\Binaries\IFWI\MinnowBoard3Next\FAB_A\SpiChunk1.bin
.
- copy /y /b ..\..\Binaries\IFWI\MinnowBoard3Next\FAB_A\SpiChunk2.bin
.
- copy /y /b ..\..\Binaries\IFWI\MinnowBoard3Next\FAB_A\SpiChunk3.bin
.
+ copy /y /b ..\..\..\Board\MinnowBoard3Next\IFWI\FAB_A\SpiChunk1.bin
.
+ copy /y /b ..\..\..\Board\MinnowBoard3Next\IFWI\FAB_A\SpiChunk2.bin
.
+ copy /y /b ..\..\..\Board\MinnowBoard3Next\IFWI\FAB_A\SpiChunk3.bin
.
copy /y /b
SpiChunk1.bin+.\BIOS_COMPONENTS\IBBL.Fv+.\BIOS_COMPONENTS\IBB.Fv+SpiChunk2.bin+.\BIOS_COMPONENTS\OBB.Fv+.\BIOS_COMPONENTS\NvStorage.Fv+SpiChunk3.bin
spi_out.bin
) else if %BoardId%==LH (
- copy /y /b ..\..\Binaries\IFWI\LeafHill\FAB_D\SpiChunk1.bin .
- copy /y /b ..\..\Binaries\IFWI\LeafHill\FAB_D\SpiChunk2.bin .
- copy /y /b ..\..\Binaries\IFWI\LeafHill\FAB_D\SpiChunk3.bin .
+ copy /y /b ..\..\..\Board\LeafHill\IFWI\FAB_D\SpiChunk1.bin .
+ copy /y /b ..\..\..\Board\LeafHill\IFWI\FAB_D\SpiChunk2.bin .
+ copy /y /b ..\..\..\Board\LeafHill\IFWI\FAB_D\SpiChunk3.bin .
copy /y /b
SpiChunk1.bin+.\BIOS_COMPONENTS\IBBL.Fv+.\BIOS_COMPONENTS\IBB.Fv+SpiChunk2.bin+.\BIOS_COMPONENTS\OBB.Fv+.\BIOS_COMPONENTS\NvStorage.Fv+SpiChunk3.bin
spi_out.bin
)
move /y spi_out.bin %BIOS_ID%.bin >> Stitching.log
--
2.7.0.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
