Add preparation for FAR release.

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

7 files changed, 280 insertions, 5 deletions

diff --git a/OptionRomPkg/AtapiPassThruDxe/AtapiPassThruDxe.inf b/OptionRomPkg/AtapiPassThruDxe/AtapiPassThruDxe.inf
index 9fe6f5459..735101b36 100644
--- a/OptionRomPkg/AtapiPassThruDxe/AtapiPassThruDxe.inf
+++ b/OptionRomPkg/AtapiPassThruDxe/AtapiPassThruDxe.inf
@@ -1,9 +1,9 @@
 #/** @file

-# Description file for the Atapi Passthru component.

+# Description file for the Atapi Pass Thru driver.

 #

 # This driver simulates SCSI devices with Atapi devices to test the SCSI io

 #  protocol.

-# Copyright (c) 2006 - 2007, Intel Corporation

+# Copyright (c) 2007, 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

@@ -17,7 +17,7 @@
 

 [Defines]

   INF_VERSION                    = 0x00010005

-  BASE_NAME                      = AtapiPassThru

+  BASE_NAME                      = AtapiPassThruDxe

   FILE_GUID                      = E49061CE-99A7-41d3-AB3A-36E5CFBAD63E

   MODULE_TYPE                    = UEFI_DRIVER

   VERSION_STRING                 = 1.0

diff --git a/OptionRomPkg/AtapiPassThruDxe/AtapiPassThruDxe.msa b/OptionRomPkg/AtapiPassThruDxe/AtapiPassThruDxe.msa
new file mode 100644
index 000000000..a6b47792a
--- /dev/null
+++ b/OptionRomPkg/AtapiPassThruDxe/AtapiPassThruDxe.msa
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

+  <MsaHeader>

+    <ModuleName>AtapiPassThruDxe</ModuleName>

+    <ModuleType>UEFI_DRIVER</ModuleType>

+    <GuidValue>E49061CE-99A7-41d3-AB3A-36E5CFBAD63E</GuidValue>

+    <Version>0.1</Version>

+    <Abstract>Description file for the Atapi Pass Thru driver.</Abstract>

+    <Description>This driver simulates SCSI devices with Atapi devices to test the SCSI IO protocol.</Description>

+    <Copyright>Copyright (c) 2007, Intel Corporation.</Copyright>

+    <License>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.</License>

+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

+  </MsaHeader>

+  <ModuleDefinitions>

+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>

+    <BinaryModule>false</BinaryModule>

+    <OutputFileBasename>AtapiPassThruDxe</OutputFileBasename>

+  </ModuleDefinitions>

+  <SourceFiles>

+    <Filename>AtapiPassThru.c</Filename>

+    <Filename>AtapiPassThru.h</Filename>

+    <Filename>ComponentName.c</Filename>

+    <Filename>DriverSupportedEfiVersion.c</Filename>

+  </SourceFiles>

+  <LibraryClassDefinitions>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>DebugLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>BaseMemoryLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiDriverEntryPoint</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiBootServicesTableLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>BaseLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>MemoryAllocationLib</Keyword>

+    </LibraryClass>

+  </LibraryClassDefinitions>

+  <Protocols>

+    <Protocol Usage="BY_START">

+      <ProtocolCName>gEfiScsiPassThruProtocolGuid</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="BY_START">

+      <ProtocolCName>gEfiExtScsiPassThruProtocolGuid</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="TO_START">

+      <ProtocolCName>gEfiPciIoProtocolGuid</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_PRODUCED">

+      <ProtocolCName>gEfiDriverSupportedEfiVersionProtocolGuid</ProtocolCName>

+    </Protocol>

+  </Protocols>

+  <PcdCoded>

+    <PcdEntry PcdItemType="FEATURE_FLAG">

+      <C_Name>PcdSupportScsiPassThru</C_Name>

+      <TokenSpaceGuidCName>gOptionRomPkgTokenSpaceGuid</TokenSpaceGuidCName>

+      <HelpText>Atapi Pass Thru driver supports to produce Scsi Pass Thru protocol.</HelpText>

+    </PcdEntry>

+    <PcdEntry PcdItemType="FEATURE_FLAG">

+      <C_Name>PcdExtSupportScsiPassThru</C_Name>

+      <TokenSpaceGuidCName>gOptionRomPkgTokenSpaceGuid</TokenSpaceGuidCName>

+      <HelpText>Atapi Pass Thru driver supports to produce Ext Scsi Pass Thru protocol.</HelpText>

+    </PcdEntry>

+    <PcdEntry PcdItemType="DYNAMIC">

+      <C_Name>PcdDriverSupportedEfiVersion</C_Name>

+      <TokenSpaceGuidCName>gOptionRomPkgTokenSpaceGuid</TokenSpaceGuidCName>

+      <HelpText>The firmware version field filled in EFI Driver Supported EFI Version protocol.</HelpText>

+    </PcdEntry>

+  </PcdCoded>

+  <Externs>

+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

+    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

+    <Extern>

+      <ModuleEntryPoint>InitializeAtapiPassThru</ModuleEntryPoint>

+    </Extern>

+  </Externs>

+  <PackageDependencies>

+    <Package PackageVersion="0.1" PackageGuid="1E73767F-8F52-4603-AEB4-F29B510B6766"/>

+    <Package PackageVersion="0.1" PackageGuid="AA3865E8-7F30-4f59-8696-99F560101852"/>

+  </PackageDependencies>

+</ModuleSurfaceArea>
\ No newline at end of file
diff --git a/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf b/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf
index a540feff2..8749727e4 100644
--- a/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf
+++ b/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf
@@ -23,7 +23,7 @@
 

 [Defines]

   INF_VERSION                    = 0x00010005

-  BASE_NAME                      = CirrusLogic5430UgaDraw

+  BASE_NAME                      = CirrusLogic5430Dxe

   FILE_GUID                      = 555F76EA-785F-40d7-9174-153C43636C68

   MODULE_TYPE                    = UEFI_DRIVER

   VERSION_STRING                 = 1.0

diff --git a/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.msa b/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.msa
new file mode 100644
index 000000000..0620eb24a
--- /dev/null
+++ b/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.msa
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

+  <MsaHeader>

+    <ModuleName>AtapiPassThruDxe</ModuleName>

+    <ModuleType>UEFI_DRIVER</ModuleType>

+    <GuidValue>555F76EA-785F-40d7-9174-153C43636C68</GuidValue>

+    <Version>0.1</Version>

+    <Abstract>Component description file for CirrusLogic5430 module.</Abstract>

+    <Description>Cirrus Logic 5430 Controller Driver.</Description>

+    <Copyright>Copyright (c) 2007, Intel Corporation.</Copyright>

+    <License>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.</License>

+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

+  </MsaHeader>

+  <ModuleDefinitions>

+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>

+    <BinaryModule>false</BinaryModule>

+    <OutputFileBasename>AtapiPassThruDxe</OutputFileBasename>

+  </ModuleDefinitions>

+  <SourceFiles>

+    <Filename>CirrusLogic5430.c</Filename>

+    <Filename>CirrusLogic5430.h</Filename>

+    <Filename>CirrusLogic5430GraphicsOutput.c</Filename>

+    <Filename>CirrusLogic5430UgaDraw.c</Filename>

+    <Filename>ComponentName.c</Filename>

+    <Filename>DriverSupportedEfiVersion.c</Filename>

+  </SourceFiles>

+  <LibraryClassDefinitions>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>DebugLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiDriverEntryPoint</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiBootServicesTableLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>UefiLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>BaseLib</Keyword>

+    </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>MemoryAllocationLib</Keyword>

+    </LibraryClass>

+  </LibraryClassDefinitions>

+  <Protocols>

+    <Protocol Usage="BY_START">

+      <ProtocolCName>gEfiScsiPassThruProtocolGuid</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="BY_START">

+      <ProtocolCName>gEfiExtScsiPassThruProtocolGuid</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="TO_START">

+      <ProtocolCName>gEfiPciIoProtocolGuid</ProtocolCName>

+    </Protocol>

+    <Protocol Usage="ALWAYS_PRODUCED">

+      <ProtocolCName>gEfiDriverSupportedEfiVersionProtocolGuid</ProtocolCName>

+    </Protocol>

+  </Protocols>

+  <PcdCoded>

+    <PcdEntry PcdItemType="FEATURE_FLAG">

+      <C_Name>PcdSupportGop</C_Name>

+      <TokenSpaceGuidCName>gOptionRomPkgTokenSpaceGuid</TokenSpaceGuidCName>

+      <HelpText>Cirrus Logic 5430 driver supports to produce GOP protocol.</HelpText>

+    </PcdEntry>

+    <PcdEntry PcdItemType="FEATURE_FLAG">

+      <C_Name>PcdExtSupportUga</C_Name>

+      <TokenSpaceGuidCName>gOptionRomPkgTokenSpaceGuid</TokenSpaceGuidCName>

+      <HelpText>Cirrus Logic 5430 driver supports to produce UGA protocol.</HelpText>

+    </PcdEntry>

+    <PcdEntry PcdItemType="DYNAMIC">

+      <C_Name>PcdDriverSupportedEfiVersion</C_Name>

+      <TokenSpaceGuidCName>gOptionRomPkgTokenSpaceGuid</TokenSpaceGuidCName>

+      <HelpText>The firmware version field filled in EFI Driver Supported EFI Version protocol.</HelpText>

+    </PcdEntry>

+  </PcdCoded>

+  <Externs>

+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

+    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

+    <Extern>

+      <ModuleEntryPoint>InitializeCirrusLogic5430</ModuleEntryPoint>

+    </Extern>

+  </Externs>

+  <PackageDependencies>

+    <Package PackageVersion="0.1" PackageGuid="1E73767F-8F52-4603-AEB4-F29B510B6766"/>

+    <Package PackageVersion="0.1" PackageGuid="AA3865E8-7F30-4f59-8696-99F560101852"/>

+  </PackageDependencies>

+</ModuleSurfaceArea>
\ No newline at end of file
diff --git a/OptionRomPkg/OptionRomPkg.dec b/OptionRomPkg/OptionRomPkg.dec
index d626d18b2..281b4d5d2 100644
--- a/OptionRomPkg/OptionRomPkg.dec
+++ b/OptionRomPkg/OptionRomPkg.dec
@@ -36,3 +36,6 @@
 [PcdsPatchableInModule.common]

   gOptionRomPkgTokenSpaceGuid.PcdDriverSupportedEfiVersion|0x0002000a|UINT32|0x00010003

 

+[Guids.common]

+  gOptionRomPkgTokenSpaceGuid = { 0x1e43298f, 0x3478, 0x41a7, { 0xb5, 0x77, 0x86, 0x6, 0x46, 0x35, 0xc7, 0x28 } };

+

diff --git a/OptionRomPkg/OptionRomPkg.nspd b/OptionRomPkg/OptionRomPkg.nspd
new file mode 100644
index 000000000..7a4d6d050
--- /dev/null
+++ b/OptionRomPkg/OptionRomPkg.nspd
@@ -0,0 +1,83 @@
+<?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>OptionRomPkg</PackageName>

+    <GuidValue>AA3865E8-7F30-4f59-8696-99F560101852</GuidValue>

+    <Version>0.1</Version>

+    <Abstract>Option Rom Package Reference Implementations.</Abstract>

+    <Description>This package is designed to interoperate with the EDK II open source project
+at http://www.tianocore.org, and this package is required to build PCI compliant
+Option ROM image for all CPU architectures, including EBC target.
+A single driver can support mixes of EFI 1.1, UEFI 2.0 and UEFI 2.1.</Description>

+    <Copyright>Copyright (c) 2007, Intel Corporation.</Copyright>

+    <License>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.</License>

+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

+  </SpdHeader>

+  <PackageDefinitions>

+    <ReadOnly>false</ReadOnly>

+    <RePackage>false</RePackage>

+  </PackageDefinitions>

+  <MsaFiles>

+    <Filename>AtapiPassThruDxe/AtapiPassThruDxe.msa</Filename>

+    <Filename>CirrusLogic5430Dxe/CirrusLogic5430Dxe.msa</Filename>

+  </MsaFiles>

+  <GuidDeclarations>

+    <Entry Name="OptionRomPkgTokenSpace" GuidTypeList="TOKEN_SPACE_GUID">

+      <C_Name>gOptionRomPkgTokenSpaceGuid</C_Name>

+      <GuidValue>1E43298F-3478-41a7-B577-86064635C728</GuidValue>

+      <HelpText>Token space GUID for OptionRomPkg</HelpText>

+    </Entry>

+  </GuidDeclarations>

+  <PcdDeclarations>

+    <PcdEntry>

+      <C_Name>PcdSupportScsiPassThru</C_Name>

+      <Token>0x00010001</Token>

+      <TokenSpaceGuidCName>gOptionRomPkgTokenSpaceGuid</TokenSpaceGuidCName>

+      <DatumType>BOOLEAN</DatumType>

+      <ValidUsage>FEATURE_FLAG</ValidUsage>

+      <DefaultValue>TRUE</DefaultValue>

+      <HelpText>Option Rom Package driver to support the Scsi Pass Thru protocol</HelpText>

+    </PcdEntry>

+    <PcdEntry>

+      <C_Name>PcdSupportExtScsiPassThru</C_Name>

+      <Token>0x00010002</Token>

+      <TokenSpaceGuidCName>gOptionRomPkgTokenSpaceGuid</TokenSpaceGuidCName>

+      <DatumType>BOOLEAN</DatumType>

+      <ValidUsage>FEATURE_FLAG</ValidUsage>

+      <DefaultValue>TRUE</DefaultValue>

+      <HelpText>Option Rom Package driver to support the Ext Scsi Pass Thru protocol</HelpText>

+    </PcdEntry>

+    <PcdEntry>

+      <C_Name>PcdDriverSupportedEfiVersion</C_Name>

+      <Token>0x00010003</Token>

+      <TokenSpaceGuidCName>gOptionRomPkgTokenSpaceGuid</TokenSpaceGuidCName>

+      <DatumType>UINT32</DatumType>

+      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE</ValidUsage>

+      <DefaultValue>0x0002000a</DefaultValue>

+      <HelpText>The firmware version field of Driver Supported EFI version protocol.</HelpText>

+    </PcdEntry>

+    <PcdEntry>

+      <C_Name>PcdSupportGop</C_Name>

+      <Token>0x00010004</Token>

+      <TokenSpaceGuidCName>gOptionRomPkgTokenSpaceGuid</TokenSpaceGuidCName>

+      <DatumType>BOOLEAN</DatumType>

+      <ValidUsage>FEATURE_FLAG</ValidUsage>

+      <DefaultValue>TRUE</DefaultValue>

+      <HelpText>The driver in OptionRomPkg to support GOP protocol.</HelpText>

+    </PcdEntry>

+    <PcdEntry>

+      <C_Name>PcdSupportUga</C_Name>

+      <Token>0x00010005</Token>

+      <TokenSpaceGuidCName>gOptionRomPkgTokenSpaceGuid</TokenSpaceGuidCName>

+      <DatumType>BOOLEAN</DatumType>

+      <ValidUsage>FEATURE_FLAG</ValidUsage>

+      <DefaultValue>TRUE</DefaultValue>

+      <HelpText>The driver in OptionRomPkg to support UGA protocol.</HelpText>

+    </PcdEntry>

+  </PcdDeclarations>

+</PackageSurfaceArea>
\ No newline at end of file
diff --git a/OptionRomPkg/ReadMe.txt b/OptionRomPkg/ReadMe.txt
index dc51fbcb0..5eb81cb0c 100644
--- a/OptionRomPkg/ReadMe.txt
+++ b/OptionRomPkg/ReadMe.txt
@@ -5,7 +5,7 @@ AtapiPassThru:
    

   AtapiPassThru driver in this package can selectively produce ScsiPassThru

   and/or ExtScsiPassThru protocol based on feature flags of PcdSupportScsiPassThru

-  and PcdExtScsiPassThru.

+  and PcdSupportExtScsiPassThru.

 

 CirrusLogic5430:

   Sample implementation of UGA Draw or Graphics Output Protocol for the Cirrus