Remove USER_DEFINED in IncludePkgHeader in spd files as it does not make sense to...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2316 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index 2dee05c2b7c5ccccfab146a5f7dd17442eaf5900..82959ad937c19c79f81f9768ff1a9c28648f6708 100644 (file)
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
+<?xml version="1.0" encoding="UTF-8"?>\r

 <PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
   <SpdHeader>\r
     <PackageName>EdkModulePkg</PackageName>\r
 <PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
   <SpdHeader>\r
     <PackageName>EdkModulePkg</PackageName>\r


@@ -446,7 +446,6 @@
     <IncludePkgHeader ModuleType="DXE_SMM_DRIVER">Include/EdkDxe.h</IncludePkgHeader>\r
     <IncludePkgHeader ModuleType="DXE_SAL_DRIVER">Include/EdkDxe.h</IncludePkgHeader>\r
     <IncludePkgHeader ModuleType="UEFI_DRIVER">Include/EdkDxe.h</IncludePkgHeader>\r
     <IncludePkgHeader ModuleType="DXE_SMM_DRIVER">Include/EdkDxe.h</IncludePkgHeader>\r
     <IncludePkgHeader ModuleType="DXE_SAL_DRIVER">Include/EdkDxe.h</IncludePkgHeader>\r
     <IncludePkgHeader ModuleType="UEFI_DRIVER">Include/EdkDxe.h</IncludePkgHeader>\r

-    <IncludePkgHeader ModuleType="USER_DEFINED">Include/EdkPeim.h</IncludePkgHeader>\r

   </PackageHeaders>\r
   <GuidDeclarations>\r
     <Entry Name="GenericPlatformTokenSpace">\r
   </PackageHeaders>\r
   <GuidDeclarations>\r
     <Entry Name="GenericPlatformTokenSpace">\r

diff --git a/EdkNt32Pkg/EdkNt32Pkg.spd b/EdkNt32Pkg/EdkNt32Pkg.spd
index 70927a5abc0d643aa47e6ccf4bce6720af434364..3dd38f8506225e3fba22a5c7b9b5da545fafcf39 100644 (file)
--- a/EdkNt32Pkg/EdkNt32Pkg.spd
+++ b/EdkNt32Pkg/EdkNt32Pkg.spd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
+<?xml version="1.0" encoding="UTF-8"?>\r

 <!--\r
 Copyright (c) 2006, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r
 <!--\r
 Copyright (c) 2006, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r


@@ -128,7 +128,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <IncludePkgHeader ModuleType="DXE_SMM_DRIVER">Include/WinNtDxe.h</IncludePkgHeader>\r
     <IncludePkgHeader ModuleType="DXE_SAL_DRIVER">Include/WinNtDxe.h</IncludePkgHeader>\r
     <IncludePkgHeader ModuleType="UEFI_DRIVER">Include/WinNtDxe.h</IncludePkgHeader>\r
     <IncludePkgHeader ModuleType="DXE_SMM_DRIVER">Include/WinNtDxe.h</IncludePkgHeader>\r
     <IncludePkgHeader ModuleType="DXE_SAL_DRIVER">Include/WinNtDxe.h</IncludePkgHeader>\r
     <IncludePkgHeader ModuleType="UEFI_DRIVER">Include/WinNtDxe.h</IncludePkgHeader>\r

-    <IncludePkgHeader ModuleType="USER_DEFINED">Include/WinNtPeim.h</IncludePkgHeader>\r

   </PackageHeaders>\r
   <GuidDeclarations>\r
     <Entry Name="EdkNt32PkgTokenSpace">\r
   </PackageHeaders>\r
   <GuidDeclarations>\r
     <Entry Name="EdkNt32PkgTokenSpace">\r

diff --git a/EdkNt32Pkg/Sec/SecMain.msa b/EdkNt32Pkg/Sec/SecMain.msa
index f8e8f2d6c8b40dd037231be4467b7fade93a9a3f..322e011f8acad08b5eb9e733bf94f30605103b91 100644 (file)
--- a/EdkNt32Pkg/Sec/SecMain.msa
+++ b/EdkNt32Pkg/Sec/SecMain.msa
@@ -2,7 +2,7 @@
 <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
   <MsaHeader>\r
     <ModuleName>SecMain</ModuleName>\r
 <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
   <MsaHeader>\r
     <ModuleName>SecMain</ModuleName>\r

-    <ModuleType>USER_DEFINED</ModuleType>\r
+    <ModuleType>SEC</ModuleType>\r

     <GuidValue>4b837b03-6587-4d19-b82b-edfad836c0a0</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Entry Point of NT32 Emulator</Abstract>\r
     <GuidValue>4b837b03-6587-4d19-b82b-edfad836c0a0</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Entry Point of NT32 Emulator</Abstract>\r

diff --git a/EdkUnixPkg/EdkUnixPkg.spd b/EdkUnixPkg/EdkUnixPkg.spd
index 084d266c8fbf45e8baf4ccf33f0385686e39dddb..00235b3803c6b836c1e107372ce4fae9581a6958 100644 (file)
--- a/EdkUnixPkg/EdkUnixPkg.spd
+++ b/EdkUnixPkg/EdkUnixPkg.spd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
+<?xml version="1.0" encoding="UTF-8"?>\r

 <!--\r
 Copyright (c) 2006, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r
 <!--\r
 Copyright (c) 2006, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r


@@ -130,7 +130,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <IncludePkgHeader ModuleType="DXE_SMM_DRIVER">Include/UnixDxe.h</IncludePkgHeader>\r
     <IncludePkgHeader ModuleType="DXE_SAL_DRIVER">Include/UnixDxe.h</IncludePkgHeader>\r
     <IncludePkgHeader ModuleType="UEFI_DRIVER">Include/UnixDxe.h</IncludePkgHeader>\r
     <IncludePkgHeader ModuleType="DXE_SMM_DRIVER">Include/UnixDxe.h</IncludePkgHeader>\r
     <IncludePkgHeader ModuleType="DXE_SAL_DRIVER">Include/UnixDxe.h</IncludePkgHeader>\r
     <IncludePkgHeader ModuleType="UEFI_DRIVER">Include/UnixDxe.h</IncludePkgHeader>\r

-    <IncludePkgHeader ModuleType="USER_DEFINED">Include/UnixPeim.h</IncludePkgHeader>\r

   </PackageHeaders>\r
   <GuidDeclarations>\r
     <Entry Name="EdkUnixPkgTokenSpace">\r
   </PackageHeaders>\r
   <GuidDeclarations>\r
     <Entry Name="EdkUnixPkgTokenSpace">\r

diff --git a/EdkUnixPkg/Sec/SecMain.msa b/EdkUnixPkg/Sec/SecMain.msa
index 8e0af9a7ceb3e0d2a7817864709ea2b92d8e54ca..2629982571283ae38ecae049569b41c42060c1cc 100644 (file)
--- a/EdkUnixPkg/Sec/SecMain.msa
+++ b/EdkUnixPkg/Sec/SecMain.msa
@@ -2,7 +2,7 @@
 <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
   <MsaHeader>\r
     <ModuleName>SecMain</ModuleName>\r
 <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
   <MsaHeader>\r
     <ModuleName>SecMain</ModuleName>\r

-    <ModuleType>USER_DEFINED</ModuleType>\r
+    <ModuleType>SEC</ModuleType>\r

     <GuidValue>f43be88c-8985-11db-8f78-0040d02b1835</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Entry Point of Unix Emulator</Abstract>\r
     <GuidValue>f43be88c-8985-11db-8f78-0040d02b1835</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Entry Point of Unix Emulator</Abstract>\r


@@ -110,4 +110,4 @@
           0x20: Boot in reovery mode.</HelpText>\r
     </PcdEntry>\r
   </PcdCoded>\r
           0x20: Boot in reovery mode.</HelpText>\r
     </PcdEntry>\r
   </PcdCoded>\r

-</ModuleSurfaceArea>
+</ModuleSurfaceArea>\r

diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd
index e92e203b01437579daf4a28a8607c76320f1f257..6bfbdb3b2dc8a589a9ab9074cdc70810a596075f 100644 (file)
--- a/MdePkg/MdePkg.spd
+++ b/MdePkg/MdePkg.spd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
+<?xml version="1.0" encoding="UTF-8"?>\r

 <PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
   <SpdHeader>\r
     <PackageName>MdePkg</PackageName>\r
 <PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
   <SpdHeader>\r
     <PackageName>MdePkg</PackageName>\r


@@ -1198,7 +1198,6 @@
     <IncludePkgHeader ModuleType="DXE_SAL_DRIVER">Include/Dxe.h</IncludePkgHeader>\r
     <IncludePkgHeader ModuleType="UEFI_DRIVER">Include/Uefi.h</IncludePkgHeader>\r
     <IncludePkgHeader ModuleType="UEFI_APPLICATION">Include/Uefi.h</IncludePkgHeader>\r
     <IncludePkgHeader ModuleType="DXE_SAL_DRIVER">Include/Dxe.h</IncludePkgHeader>\r
     <IncludePkgHeader ModuleType="UEFI_DRIVER">Include/Uefi.h</IncludePkgHeader>\r
     <IncludePkgHeader ModuleType="UEFI_APPLICATION">Include/Uefi.h</IncludePkgHeader>\r

-    <IncludePkgHeader ModuleType="USER_DEFINED">Include/Peim.h</IncludePkgHeader>\r

   </PackageHeaders>\r
   <GuidDeclarations>\r
     <Entry Name="MdePkgTokenSpace">\r
   </PackageHeaders>\r
   <GuidDeclarations>\r
     <Entry Name="MdePkgTokenSpace">\r

diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index 71c8f9b85acc5a842efa2614822a780c813133e5..71fd0625961aeff3e57b738d37775aee7e2bd2cf 100644 (file)
--- 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>\r
     </sequential>\r
   </macrodef> \r
       </OnDependency>\r
     </sequential>\r
   </macrodef> \r

+ <!--\r
+      Build ACPI Bin File\r
+    -->\r
+  <macrodef name="Build_ACPIBIN">\r
+    <attribute name="FILEPATH"/>\r
+    <attribute name="FILENAME"/>\r
+    <attribute name="FILEEXT" default="bin"/>\r
+\r
+    <element name="EXTRA.INC" optional="yes"/>\r
+    <element name="EXTRA.ARG" optional="yes"/>\r
+    \r
+    <sequential>\r
+      <mkdir dir="${DEST_DIR_OUTPUT}"/>\r
+\r
+      <OnDependency>\r
+        <sourcefiles>\r
+          <file name="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
+        </sourcefiles>\r
+        <targetfiles>\r
+          <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.sec"/>\r
+        </targetfiles>\r
+\r
+        <sequential>\r
+          <copy file="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}" tofile="${DEST_DIR_OUTPUT}/@{FILENAME}.acpi" />\r
+  \r
+          <exec executable="attrib">\r
+            <arg line="-r ${DEST_DIR_OUTPUT}/@{FILENAME}.acpi"/>\r
+          </exec>\r

 \r
 \r

+          <EFI_SECTION_RAW FILEPATH="." FILENAME="@{FILENAME}" FILEEXT="acpi"/>\r
+        </sequential>\r
+      </OnDependency>\r
+    </sequential>\r
+  </macrodef> \r
+  \r

   <!--\r
     DUMMY - for skipping the source file which should not be built\r
     -->\r
   <!--\r
     DUMMY - for skipping the source file which should not be built\r
     -->\r