diff --git a/OptionRomPkg/AtapiPassThruDxe/AtapiPassThruDxe.inf b/OptionRomPkg/AtapiPassThruDxe/AtapiPassThruDxe.inf
index 9fe6f5459a..735101b36c 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 0000000000..a6b47792a6
--- /dev/null
+++ b/OptionRomPkg/AtapiPassThruDxe/AtapiPassThruDxe.msa
@@ -0,0 +1,95 @@
+
+
+
+ AtapiPassThruDxe
+ UEFI_DRIVER
+ E49061CE-99A7-41d3-AB3A-36E5CFBAD63E
+ 0.1
+ Description file for the Atapi Pass Thru driver.
+ This driver simulates SCSI devices with Atapi devices to test the SCSI IO protocol.
+ 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 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.
+ FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052
+
+
+ IA32 X64 IPF EBC
+ false
+ AtapiPassThruDxe
+
+
+ AtapiPassThru.c
+ AtapiPassThru.h
+ ComponentName.c
+ DriverSupportedEfiVersion.c
+
+
+
+ DebugLib
+
+
+ BaseMemoryLib
+
+
+ UefiDriverEntryPoint
+
+
+ UefiBootServicesTableLib
+
+
+ UefiLib
+
+
+ BaseLib
+
+
+ MemoryAllocationLib
+
+
+
+
+ gEfiScsiPassThruProtocolGuid
+
+
+ gEfiExtScsiPassThruProtocolGuid
+
+
+ gEfiPciIoProtocolGuid
+
+
+ gEfiDriverSupportedEfiVersionProtocolGuid
+
+
+
+
+ PcdSupportScsiPassThru
+ gOptionRomPkgTokenSpaceGuid
+ Atapi Pass Thru driver supports to produce Scsi Pass Thru protocol.
+
+
+ PcdExtSupportScsiPassThru
+ gOptionRomPkgTokenSpaceGuid
+ Atapi Pass Thru driver supports to produce Ext Scsi Pass Thru protocol.
+
+
+ PcdDriverSupportedEfiVersion
+ gOptionRomPkgTokenSpaceGuid
+ The firmware version field filled in EFI Driver Supported EFI Version protocol.
+
+
+
+ EFI_SPECIFICATION_VERSION 0x00020000
+ EDK_RELEASE_VERSION 0x00020000
+
+ InitializeAtapiPassThru
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf b/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf
index a540feff29..8749727e4d 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 0000000000..0620eb24ac
--- /dev/null
+++ b/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.msa
@@ -0,0 +1,94 @@
+
+
+
+ AtapiPassThruDxe
+ UEFI_DRIVER
+ 555F76EA-785F-40d7-9174-153C43636C68
+ 0.1
+ Component description file for CirrusLogic5430 module.
+ Cirrus Logic 5430 Controller Driver.
+ 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 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.
+ FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052
+
+
+ IA32 X64 IPF EBC
+ false
+ AtapiPassThruDxe
+
+
+ CirrusLogic5430.c
+ CirrusLogic5430.h
+ CirrusLogic5430GraphicsOutput.c
+ CirrusLogic5430UgaDraw.c
+ ComponentName.c
+ DriverSupportedEfiVersion.c
+
+
+
+ DebugLib
+
+
+ UefiDriverEntryPoint
+
+
+ UefiBootServicesTableLib
+
+
+ UefiLib
+
+
+ BaseLib
+
+
+ MemoryAllocationLib
+
+
+
+
+ gEfiScsiPassThruProtocolGuid
+
+
+ gEfiExtScsiPassThruProtocolGuid
+
+
+ gEfiPciIoProtocolGuid
+
+
+ gEfiDriverSupportedEfiVersionProtocolGuid
+
+
+
+
+ PcdSupportGop
+ gOptionRomPkgTokenSpaceGuid
+ Cirrus Logic 5430 driver supports to produce GOP protocol.
+
+
+ PcdExtSupportUga
+ gOptionRomPkgTokenSpaceGuid
+ Cirrus Logic 5430 driver supports to produce UGA protocol.
+
+
+ PcdDriverSupportedEfiVersion
+ gOptionRomPkgTokenSpaceGuid
+ The firmware version field filled in EFI Driver Supported EFI Version protocol.
+
+
+
+ EFI_SPECIFICATION_VERSION 0x00020000
+ EDK_RELEASE_VERSION 0x00020000
+
+ InitializeCirrusLogic5430
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/OptionRomPkg/OptionRomPkg.dec b/OptionRomPkg/OptionRomPkg.dec
index d626d18b27..281b4d5d28 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 0000000000..7a4d6d0500
--- /dev/null
+++ b/OptionRomPkg/OptionRomPkg.nspd
@@ -0,0 +1,83 @@
+
+
+
+ OptionRomPkg
+ AA3865E8-7F30-4f59-8696-99F560101852
+ 0.1
+ Option Rom Package Reference Implementations.
+ 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.
+ 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 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.
+ FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052
+
+
+ false
+ false
+
+
+ AtapiPassThruDxe/AtapiPassThruDxe.msa
+ CirrusLogic5430Dxe/CirrusLogic5430Dxe.msa
+
+
+
+ gOptionRomPkgTokenSpaceGuid
+ 1E43298F-3478-41a7-B577-86064635C728
+ Token space GUID for OptionRomPkg
+
+
+
+
+ PcdSupportScsiPassThru
+ 0x00010001
+ gOptionRomPkgTokenSpaceGuid
+ BOOLEAN
+ FEATURE_FLAG
+ TRUE
+ Option Rom Package driver to support the Scsi Pass Thru protocol
+
+
+ PcdSupportExtScsiPassThru
+ 0x00010002
+ gOptionRomPkgTokenSpaceGuid
+ BOOLEAN
+ FEATURE_FLAG
+ TRUE
+ Option Rom Package driver to support the Ext Scsi Pass Thru protocol
+
+
+ PcdDriverSupportedEfiVersion
+ 0x00010003
+ gOptionRomPkgTokenSpaceGuid
+ UINT32
+ FIXED_AT_BUILD PATCHABLE_IN_MODULE
+ 0x0002000a
+ The firmware version field of Driver Supported EFI version protocol.
+
+
+ PcdSupportGop
+ 0x00010004
+ gOptionRomPkgTokenSpaceGuid
+ BOOLEAN
+ FEATURE_FLAG
+ TRUE
+ The driver in OptionRomPkg to support GOP protocol.
+
+
+ PcdSupportUga
+ 0x00010005
+ gOptionRomPkgTokenSpaceGuid
+ BOOLEAN
+ FEATURE_FLAG
+ TRUE
+ The driver in OptionRomPkg to support UGA protocol.
+
+
+
\ No newline at end of file
diff --git a/OptionRomPkg/ReadMe.txt b/OptionRomPkg/ReadMe.txt
index dc51fbcb0b..5eb81cb0c2 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