diff options
| -rw-r--r-- | EdkNt32Pkg/Logo/Logo.msa | 3 | ||||
| -rw-r--r-- | EdkNt32Pkg/Logo/Logo_build.xml | 78 | ||||
| -rw-r--r-- | EdkNt32Pkg/Nt32.fpd | 2 | ||||
| -rw-r--r-- | Tools/Conf/BuildMacro.xml | 7 |
4 files changed, 8 insertions, 82 deletions
diff --git a/EdkNt32Pkg/Logo/Logo.msa b/EdkNt32Pkg/Logo/Logo.msa index 30708d294e..6c8eb7758b 100644 --- a/EdkNt32Pkg/Logo/Logo.msa +++ b/EdkNt32Pkg/Logo/Logo.msa @@ -2,7 +2,7 @@ <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
<MsaHeader>
<ModuleName>Logo</ModuleName>
- <ModuleType>USER_DEFINED</ModuleType>
+ <ModuleType>BASE</ModuleType>
<GuidValue>7BB28B99-61BB-11D5-9A5D-0090273FC14D</GuidValue>
<Version>1.0</Version>
<Abstract>Component description file for creating a Logo file.</Abstract>
@@ -22,7 +22,6 @@ <OutputFileBasename>Logo</OutputFileBasename>
</ModuleDefinitions>
<SourceFiles>
- <Filename ToolCode="DUMMY">Logo_build.xml</Filename>
<Filename>Logo.bmp</Filename>
</SourceFiles>
<PackageDependencies>
diff --git a/EdkNt32Pkg/Logo/Logo_build.xml b/EdkNt32Pkg/Logo/Logo_build.xml deleted file mode 100644 index 6096015be5..0000000000 --- a/EdkNt32Pkg/Logo/Logo_build.xml +++ /dev/null @@ -1,78 +0,0 @@ -<?xml version="1.0" ?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<project name="Logo" default="main" basedir="." >
- <!-- Apply external ANT task -->
- <taskdef resource="frameworktasks.tasks" />
- <taskdef resource="cpptasks.tasks" />
- <typedef resource="cpptasks.types" />
- <taskdef resource="net/sf/antcontrib/antlib.xml" />
- <property environment="env" />
- <!-- All Properties -->
- <property name="BASE_NAME" value="Logo" />
-
- <!-- Default target -->
- <target name="main" depends="sections, output" />
-
- <target name="sections">
- <OnDependency>
- <sourcefiles>
- <file name="${MODULE_DIR}/logo.bmp"/>
- </sourcefiles>
- <targetfiles>
- <file name="${DEST_DIR_OUTPUT}/Logo.sec"/>
- </targetfiles>
-
- <sequential>
- <gensection inputfile="${MODULE_DIR}/logo.bmp"
- outputfile="${DEST_DIR_OUTPUT}/Logo.sec"
- sectiontype="EFI_SECTION_RAW" />
- </sequential>
- </OnDependency>
- </target>
-
- <target name="output" depends="sections">
- <OnDependency>
- <sourcefiles>
- <file name="${DEST_DIR_OUTPUT}/Logo.sec"/>
- </sourcefiles>
- <targetfiles>
- <file name="${BIN_DIR}/${FILE_GUID}-Logo.FFS"/>
- </targetfiles>
-
- <sequential>
- <genffsfile BaseName="Logo"
- ffsATTRIBCHECKSUM="TRUE"
- ffsFILETYPE="EFI_FV_FILETYPE_FREEFORM"
- fileGuid="${FILE_GUID}"
- outputDir="${BIN_DIR}">
- <sectFile fileName="${DEST_DIR_OUTPUT}/Logo.sec"/>
- </genffsfile>
- </sequential>
- </OnDependency>
- </target>
-
- <target name="clean">
- <delete includeemptydirs="true">
- <fileset dir="${DEST_DIR_OUTPUT}" excludes="*.xml" includes="**/*"/>
- </delete>
- </target>
-
- <target name="cleanall">
- <delete includeemptydirs="true">
- <fileset dir="${DEST_DIR_OUTPUT}" excludes="*.xml" includes="**/*"/>
- </delete>
- <delete includeemptydirs="true">
- <fileset dir="${DEST_DIR_DEBUG}" includes="**/*"/>
- </delete>
- </target>
-
-</project>
diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd index e41684fa35..063e5ac32e 100644 --- a/EdkNt32Pkg/Nt32.fpd +++ b/EdkNt32Pkg/Nt32.fpd @@ -4224,7 +4224,7 @@ <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="7BB28B99-61BB-11D5-9A5D-0090273FC14D">
<ModuleSaBuildOptions>
<FvBinding>FV_RECOVERY</FvBinding>
- <FfsFormatKey>CUSTOM_BUILD</FfsFormatKey>
+ <FfsFormatKey>Logo</FfsFormatKey>
</ModuleSaBuildOptions>
</ModuleSA>
<ModuleSA SupArchList="IA32" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d" ModuleGuid="93B80004-9FB3-11d4-9A3A-0090273FC14D">
diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml index 25632730fe..0eb9c5742c 100644 --- a/Tools/Conf/BuildMacro.xml +++ b/Tools/Conf/BuildMacro.xml @@ -1161,6 +1161,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. tofile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.bin"/>
</sequential>
</macrodef>
+
<!--
Microcode
-->
@@ -1181,7 +1182,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. <!--
Graphics (bmp, ...)
-->
- <macrodef name="Build_Graphics">
+ <macrodef name="Build_BMP">
<attribute name="FILEPATH"/>
<attribute name="FILENAME"/>
<attribute name="FILEEXT" default="bmp"/>
@@ -1195,6 +1196,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. tofile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.bin"/>
</sequential>
</macrodef>
+
+ <!--
+ build EFI file
+ -->
<macrodef name="Build_EFI">
<attribute name="FILEPATH"/>
<attribute name="FILENAME"/>
|