diff options
| author | qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-01-25 10:25:16 +0000 |
|---|---|---|
| committer | qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-01-25 10:25:16 +0000 |
| commit | febc64336241fc400af7d0bcbf01b2f35925cf96 (patch) | |
| tree | 1d2b138fea00f835be4cd3db909b02a0aaa9f247 | |
| parent | fb5a3ed8c728f692d111633d478b31e0b5e2942c (diff) | |
| download | edk2-platforms-febc64336241fc400af7d0bcbf01b2f35925cf96.tar.xz | |
Remove USER_DEFINED in IncludePkgHeader in spd files as it does not make sense to specify package include header file for a custom build type module. Package creator has no a priori knowledge about what header file will be needed by the USER_DEFINED module customers created in dependent package.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2316 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | EdkModulePkg/EdkModulePkg.spd | 3 | ||||
| -rw-r--r-- | EdkNt32Pkg/EdkNt32Pkg.spd | 3 | ||||
| -rw-r--r-- | EdkNt32Pkg/Sec/SecMain.msa | 2 | ||||
| -rw-r--r-- | EdkUnixPkg/EdkUnixPkg.spd | 3 | ||||
| -rw-r--r-- | EdkUnixPkg/Sec/SecMain.msa | 4 | ||||
| -rw-r--r-- | MdePkg/MdePkg.spd | 3 | ||||
| -rw-r--r-- | Tools/Conf/BuildMacro.xml | 34 |
7 files changed, 41 insertions, 11 deletions
diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd index 2dee05c2b7..82959ad937 100644 --- a/EdkModulePkg/EdkModulePkg.spd +++ b/EdkModulePkg/EdkModulePkg.spd @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<SpdHeader>
<PackageName>EdkModulePkg</PackageName>
@@ -446,7 +446,6 @@ <IncludePkgHeader ModuleType="DXE_SMM_DRIVER">Include/EdkDxe.h</IncludePkgHeader>
<IncludePkgHeader ModuleType="DXE_SAL_DRIVER">Include/EdkDxe.h</IncludePkgHeader>
<IncludePkgHeader ModuleType="UEFI_DRIVER">Include/EdkDxe.h</IncludePkgHeader>
- <IncludePkgHeader ModuleType="USER_DEFINED">Include/EdkPeim.h</IncludePkgHeader>
</PackageHeaders>
<GuidDeclarations>
<Entry Name="GenericPlatformTokenSpace">
diff --git a/EdkNt32Pkg/EdkNt32Pkg.spd b/EdkNt32Pkg/EdkNt32Pkg.spd index 70927a5abc..3dd38f8506 100644 --- a/EdkNt32Pkg/EdkNt32Pkg.spd +++ b/EdkNt32Pkg/EdkNt32Pkg.spd @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2006, Intel Corporation
All rights reserved. This program and the accompanying materials
@@ -128,7 +128,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. <IncludePkgHeader ModuleType="DXE_SMM_DRIVER">Include/WinNtDxe.h</IncludePkgHeader>
<IncludePkgHeader ModuleType="DXE_SAL_DRIVER">Include/WinNtDxe.h</IncludePkgHeader>
<IncludePkgHeader ModuleType="UEFI_DRIVER">Include/WinNtDxe.h</IncludePkgHeader>
- <IncludePkgHeader ModuleType="USER_DEFINED">Include/WinNtPeim.h</IncludePkgHeader>
</PackageHeaders>
<GuidDeclarations>
<Entry Name="EdkNt32PkgTokenSpace">
diff --git a/EdkNt32Pkg/Sec/SecMain.msa b/EdkNt32Pkg/Sec/SecMain.msa index f8e8f2d6c8..322e011f8a 100644 --- a/EdkNt32Pkg/Sec/SecMain.msa +++ b/EdkNt32Pkg/Sec/SecMain.msa @@ -2,7 +2,7 @@ <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
<MsaHeader>
<ModuleName>SecMain</ModuleName>
- <ModuleType>USER_DEFINED</ModuleType>
+ <ModuleType>SEC</ModuleType>
<GuidValue>4b837b03-6587-4d19-b82b-edfad836c0a0</GuidValue>
<Version>1.0</Version>
<Abstract>Entry Point of NT32 Emulator</Abstract>
diff --git a/EdkUnixPkg/EdkUnixPkg.spd b/EdkUnixPkg/EdkUnixPkg.spd index 084d266c8f..00235b3803 100644 --- a/EdkUnixPkg/EdkUnixPkg.spd +++ b/EdkUnixPkg/EdkUnixPkg.spd @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2006, Intel Corporation
All rights reserved. This program and the accompanying materials
@@ -130,7 +130,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. <IncludePkgHeader ModuleType="DXE_SMM_DRIVER">Include/UnixDxe.h</IncludePkgHeader>
<IncludePkgHeader ModuleType="DXE_SAL_DRIVER">Include/UnixDxe.h</IncludePkgHeader>
<IncludePkgHeader ModuleType="UEFI_DRIVER">Include/UnixDxe.h</IncludePkgHeader>
- <IncludePkgHeader ModuleType="USER_DEFINED">Include/UnixPeim.h</IncludePkgHeader>
</PackageHeaders>
<GuidDeclarations>
<Entry Name="EdkUnixPkgTokenSpace">
diff --git a/EdkUnixPkg/Sec/SecMain.msa b/EdkUnixPkg/Sec/SecMain.msa index 8e0af9a7ce..2629982571 100644 --- a/EdkUnixPkg/Sec/SecMain.msa +++ b/EdkUnixPkg/Sec/SecMain.msa @@ -2,7 +2,7 @@ <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">
<MsaHeader>
<ModuleName>SecMain</ModuleName>
- <ModuleType>USER_DEFINED</ModuleType>
+ <ModuleType>SEC</ModuleType>
<GuidValue>f43be88c-8985-11db-8f78-0040d02b1835</GuidValue>
<Version>1.0</Version>
<Abstract>Entry Point of Unix Emulator</Abstract>
@@ -110,4 +110,4 @@ 0x20: Boot in reovery mode.</HelpText>
</PcdEntry>
</PcdCoded>
-</ModuleSurfaceArea> +</ModuleSurfaceArea>
diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd index e92e203b01..6bfbdb3b2d 100644 --- a/MdePkg/MdePkg.spd +++ b/MdePkg/MdePkg.spd @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<SpdHeader>
<PackageName>MdePkg</PackageName>
@@ -1198,7 +1198,6 @@ <IncludePkgHeader ModuleType="DXE_SAL_DRIVER">Include/Dxe.h</IncludePkgHeader>
<IncludePkgHeader ModuleType="UEFI_DRIVER">Include/Uefi.h</IncludePkgHeader>
<IncludePkgHeader ModuleType="UEFI_APPLICATION">Include/Uefi.h</IncludePkgHeader>
- <IncludePkgHeader ModuleType="USER_DEFINED">Include/Peim.h</IncludePkgHeader>
</PackageHeaders>
<GuidDeclarations>
<Entry Name="MdePkgTokenSpace">
diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml index 71c8f9b85a..71fd062596 100644 --- a/Tools/Conf/BuildMacro.xml +++ b/Tools/Conf/BuildMacro.xml @@ -930,7 +930,41 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. </OnDependency>
</sequential>
</macrodef>
+ <!--
+ Build ACPI Bin File
+ -->
+ <macrodef name="Build_ACPIBIN">
+ <attribute name="FILEPATH"/>
+ <attribute name="FILENAME"/>
+ <attribute name="FILEEXT" default="bin"/>
+
+ <element name="EXTRA.INC" optional="yes"/>
+ <element name="EXTRA.ARG" optional="yes"/>
+
+ <sequential>
+ <mkdir dir="${DEST_DIR_OUTPUT}"/>
+
+ <OnDependency>
+ <sourcefiles>
+ <file name="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>
+ </sourcefiles>
+ <targetfiles>
+ <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.sec"/>
+ </targetfiles>
+
+ <sequential>
+ <copy file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" tofile="${DEST_DIR_OUTPUT}/@{FILENAME}.acpi" />
+
+ <exec executable="attrib">
+ <arg line="-r ${DEST_DIR_OUTPUT}/@{FILENAME}.acpi"/>
+ </exec>
+ <EFI_SECTION_RAW FILEPATH="." FILENAME="@{FILENAME}" FILEEXT="acpi"/>
+ </sequential>
+ </OnDependency>
+ </sequential>
+ </macrodef>
+
<!--
DUMMY - for skipping the source file which should not be built
-->
|