Release [DW03AR00] - Bring Up

9 files changed, 56 insertions, 63 deletions

diff --git a/Board/EM/Platform/AcpiPlatform.c b/Board/EM/Platform/AcpiPlatform.c
index e7cbe97..3e34931 100644
--- a/Board/EM/Platform/AcpiPlatform.c
+++ b/Board/EM/Platform/AcpiPlatform.c
@@ -1067,9 +1067,9 @@ AcpiPlatformInit (
 
   mGlobalNvsArea.Area->Revision         = GLOBAL_NVS_AREA_REVISION_1; 
 
-{
-  mGlobalNvsArea.Area->ComIrqShareMode = gSetupData->F81216ComIrqShareMode ;
-} 
+//{
+//  mGlobalNvsArea.Area->ComIrqShareMode = gSetupData->F81216ComIrqShareMode ;
+//} 
 
   Status = pBS->InstallMultipleProtocolInterfaces (&ImageHandle,
                                                    &gEfiGlobalNvsAreaProtocolGuid,
diff --git a/Board/EM/Platform/Library/Protocol/GlobalNvsArea/GlobalNvsArea.h b/Board/EM/Platform/Library/Protocol/GlobalNvsArea/GlobalNvsArea.h
index 0734577..a087173 100644
--- a/Board/EM/Platform/Library/Protocol/GlobalNvsArea/GlobalNvsArea.h
+++ b/Board/EM/Platform/Library/Protocol/GlobalNvsArea/GlobalNvsArea.h
@@ -522,7 +522,7 @@ typedef struct {
   UINT8     SPST;                           // (688) SATA port state, Bit0 - Port0, Bit1 - Port1, Bit2 - Port2, Bit3 - Port3
   UINT8     ECLP;                           // (689) EC Low Power Mode: 1 - Enabled, 0 - Disabled
   UINT8     INSC;                           // (690) Intel RMT Configuration 
-  UINT8     ComIrqShareMode;
+//  UINT8     ComIrqShareMode;
 } EFI_GLOBAL_NVS_AREA;
 #pragma pack ()
 
diff --git a/Board/EM/Setup/Setup.uni b/Board/EM/Setup/Setup.uni
index b74e149..039a56a 100644
--- a/Board/EM/Setup/Setup.uni
+++ b/Board/EM/Setup/Setup.uni
diff --git a/CRB/CSP.sdl b/CRB/CSP.sdl
index 99c41c5..4404b4c 100644
--- a/CRB/CSP.sdl
+++ b/CRB/CSP.sdl
@@ -791,6 +791,8 @@ TOKEN
 	TargetEQU = Yes
 	TargetH = Yes
 End
+##GPIO1 Core GPI Yes Yes No Desktop and Mobile: Available as GPIO1 only (Note 4).
+##Server: Multiplexed with TACH1.
 TOKEN
 	Name = "GPIO_001"
 	Value = "$(IS_GPIO)+$(IS_GPI)"
@@ -831,6 +833,8 @@ TOKEN
 	TargetEQU = Yes
 	TargetH = Yes
 End
+##GPIO6 Core GPI Yes Yes No Desktop and Mobile: Available as GPIO6 only (Note 4).
+##Server: Multiplexed with TACH2.
 TOKEN
 	Name = "GPIO_006"
 	Value = "$(IS_GPIO)+$(IS_GPI)"
@@ -839,6 +843,8 @@ TOKEN
 	TargetEQU = Yes
 	TargetH = Yes
 End
+##GPIO7 Core GPI Yes Yes No Desktop and Mobile: Available as GPIO7 only (Note 4).
+##Server: Multiplexed with TACH3.
 TOKEN
 	Name = "GPIO_007"
 	Value = "$(IS_GPIO)+$(IS_GPI)"
@@ -919,6 +925,8 @@ TOKEN
 	TargetEQU = Yes
 	TargetH = Yes
 End
+##GPIO17 Core GPI Yes Yes No Desktop and Mobile: Available as GPIO17 only (Note 4).
+##Server: Multiplexed with TACH0.
 TOKEN
 	Name = "GPIO_017"
 	Value = "$(IS_GPIO)+$(IS_GPI)"
@@ -1297,7 +1305,7 @@ TOKEN
 End
 TOKEN
 	Name = "GPIO_066"
-	Value = "$(IS_NOT_GPIO)"
+	Value = "$(IS_GPIO)+$(IS_GPI)"
 	Help = "[0]:GPIO USE Select - 0:Native Mode/1:GPIO Mode.;\[1]:GPIO Input/Output Select.\[2]:GPIO Level Select.\[3]:GPIO Signal Invert(Only For GPIO_00~31).\[4]:GPIO Blink Enable(Only For GPIO_00~31).\[5]:GPIO Reset Select.\[15:6]:RESERVED"
 	TokenType = Integer
 	TargetEQU = Yes
@@ -1311,6 +1319,8 @@ TOKEN
 	TargetEQU = Yes
 	TargetH = Yes
 End
+##GPIO68 Core GPI No Yes No Desktop and Mobile: Available as GPIO68 only (Note 4).
+##Server: Multiplexed with TACH4.
 TOKEN
 	Name = "GPIO_068"
 	Value = "$(IS_GPIO)+$(IS_GPI)"
@@ -1319,6 +1329,8 @@ TOKEN
 	TargetEQU = Yes
 	TargetH = Yes
 End
+##GPIO69 Core GPI No Yes No Desktop and Mobile: Available as GPIO69 only (Note 4).
+##Server: Multiplexed with TACH5.
 TOKEN
 	Name = "GPIO_069"
 	Value = "$(IS_GPIO)+$(IS_GPI)"
@@ -1431,36 +1443,6 @@ TOKEN
 	Token = "F81866_HWM_PRESENT" "=" "1"
 End
 
-## Board\IO\F81216\IO_F81216.SDL
-TOKEN
-	Name  = "F81216SEC_CLOCK"
-	Value  = "1"
-	Help  = "1/0 for 48Mhz/24MHz"
-	TokenType = Integer
-	TargetH = Yes
-End
-TOKEN
-	Name  = "F81216SEC_CONFIG_INDEX"
-	Value  = "0x4E"
-	TokenType = Integer
-	TargetEQU = Yes
-	TargetH = Yes
-End
-TOKEN
-	Name  = "F81216SEC_CONFIG_DATA"
-	Value  = "0x4F"
-	TokenType = Integer
-	TargetEQU = Yes
-	TargetH = Yes
-End
-TOKEN
-	Name  = "F81216SEC_CONFIG_MODE_ENTER_VALUE"
-	Value  = "0x87"
-	Help  = "Value to enter Configuration Mode.Please check your hardware\Default is 0x77.\others are 0xA0, 0x87, 0x67"
-	TokenType = Integer
-	TargetH = Yes
-End
-
 ## Core\EM\Recovery\Recovery.sdl
 TOKEN
 	Name  = "Recovery_SUPPORT"
@@ -1491,6 +1473,36 @@ ELINK
 	InvokeOrder = AfterParent
 	Help  = "Intel Flathead Creek, PCIE Slot#6(J13BU)"
 End
+ELINK
+	Name  = "{ CLOCK_SRC3, PCI_FUNCTION_NUMBER_PCH_PCIE_ROOT_PORT_4, 0 },"
+	Parent  = "PCIEClockConfig"
+	InvokeOrder = AfterParent
+	Help  = "Intel Flathead Creek, PCIE Slot#6(J13BU)"
+End
+ELINK
+	Name  = "{ CLOCK_SRC4, PCI_FUNCTION_NUMBER_PCH_PCIE_ROOT_PORT_5, 0 },"
+	Parent  = "PCIEClockConfig"
+	InvokeOrder = AfterParent
+	Help  = "Intel Flathead Creek, PCIE Slot#6(J13BU)"
+End
+ELINK
+	Name  = "{ CLOCK_SRC5, PCI_FUNCTION_NUMBER_PCH_PCIE_ROOT_PORT_6, 0 },"
+	Parent  = "PCIEClockConfig"
+	InvokeOrder = AfterParent
+	Help  = "Intel Flathead Creek, PCIE Slot#6(J13BU)"
+End
+ELINK
+	Name  = "{ CLOCK_SRC6, PCI_FUNCTION_NUMBER_PCH_PCIE_ROOT_PORT_7, 0 },"
+	Parent  = "PCIEClockConfig"
+	InvokeOrder = AfterParent
+	Help  = "Intel Flathead Creek, PCIE Slot#6(J13BU)"
+End
+ELINK
+	Name  = "{ CLOCK_SRC7, PCI_FUNCTION_NUMBER_PCH_PCIE_ROOT_PORT_8, 0 },"
+	Parent  = "PCIEClockConfig"
+	InvokeOrder = AfterParent
+	Help  = "Intel Flathead Creek, PCIE Slot#6(J13BU)"
+End
 
 ELINK
 	Name  = "ConInAvailabilityBeep,"
@@ -1686,7 +1698,7 @@ TOKEN
 End
 TOKEN
 	Name  = "SYSTEM_PRODUCT_NAME"
-	Value  = "DW01"
+	Value  = "DW03"
 	Help  = "Specifies the System Product Name"
 	TokenType = Expression
 	TargetEQU = Yes
@@ -1708,7 +1720,7 @@ TOKEN
 End
 TOKEN
 	Name  = "BASE_BOARD_PRODUCT_NAME"
-	Value  = "DW01"
+	Value  = "DW03"
 	Help  = "Specifies the Product Name"
 	TokenType = Expression
 	TargetEQU = Yes
@@ -1723,19 +1735,3 @@ TOKEN
 	Token = "BASE_BOARD_INFO" "=" "1"
 #	Token = "NUMBER_OF_BASEBOARDS" "=" "1"
 End
-
-ELINK
-	Name  = "$(BUILD_DIR)\Logo.ffs"
-	Parent  = "FV_MAIN"
-	InvokeOrder = AfterParent
-	Disable = Yes
-End
-
-TOKEN
-	Name  = "DEFAULT_QUIET_BOOT"
-	Value  = "0"
-	Help  = "Default value of the Quiet Boot option"
-	TokenType = Boolean
-	TargetH = Yes
-#	Token = "WIN8_FEATURE_SUPPORT" "=" "1"
-End
\ No newline at end of file
diff --git a/DW03AR00.zip b/DW03AR00.zip
new file mode 100644
index 0000000..2d478ce
--- /dev/null
+++ b/DW03AR00.zip
diff --git a/ReferenceCode/AcpiTables/Dsdt/GloblNvs.asl b/ReferenceCode/AcpiTables/Dsdt/GloblNvs.asl
index 1c18c04..c8b1525 100644
--- a/ReferenceCode/AcpiTables/Dsdt/GloblNvs.asl
+++ b/ReferenceCode/AcpiTables/Dsdt/GloblNvs.asl
@@ -424,7 +424,7 @@
   SPST, 8,      // (688) SATA port state, Bit0 - Port0, Bit1 - Port1, Bit2 - Port2, Bit3 - Port3
   ECLP, 8,      // (689) EC Low Power Mode: 1 - Enabled, 0 - Disabled
   INSC, 8,      // (690) Intel RMT Configuration
-  CISM, 8,
+//  CISM, 8,
   }
 
 #if defined(ASL_Remove_SaSsdt_Data_To_Dsdt) && (ASL_Remove_SaSsdt_Data_To_Dsdt == 1)
diff --git a/RomImage/FitcBuild.bat b/RomImage/FitcBuild.bat
index f842fc8..4248db9 100644
--- a/RomImage/FitcBuild.bat
+++ b/RomImage/FitcBuild.bat
@@ -103,7 +103,7 @@ GOTO ImageOutput
 
 :ImageOutput
 IF EXIST %DestDir%\OutImage.bin ECHO Rom_%RomSize%%RomSkue%.bin && move /Y %DestDir%\OutImage.bin Rom_%RomSize%%RomSkue%.bin
-IF EXIST Rom_%RomSize%%RomSkue%.bin move /Y Rom_%RomSize%%RomSkue%.bin DW01VR10.bin
+IF EXIST Rom_%RomSize%%RomSkue%.bin move /Y Rom_%RomSize%%RomSkue%.bin DW03AR00.bin
 IF EXIST %DestDir%\OutImage_1.bin ECHO Rom00%RomSkue%.bin && move /Y %DestDir%\OutImage_1.bin Rom00%RomSkue%.bin
 IF EXIST %DestDir%\OutImage_2.bin ECHO Rom01%RomSkue%.bin && move /Y %DestDir%\OutImage_2.bin Rom01%RomSkue%.bin
 echo Rom_%RomSize%%RomSkue%.bin>ForPfatName.txt
diff --git a/RomImage/XmlFiles/Q87_8Mx2.xml b/RomImage/XmlFiles/Q87_8Mx2.xml
index e62863b..6fc61c9 100644
--- a/RomImage/XmlFiles/Q87_8Mx2.xml
+++ b/RomImage/XmlFiles/Q87_8Mx2.xml
@@ -179,8 +179,8 @@
 			<RegionLength value="0x00000000" edit="true" visible="true" name="GbE LAN region length" help_text="This is the size of the GbE LAN region in bytes. Set this to 0 to make the region length equal to the binary file length (rounded up to 4k). Extra space will be filled with 0xFF."/>
 			<InputFile value="$SourceDir\gbe\nahum6_clarksville_desktop_1_3.bin" edit="true" visible="true" name="GbE binary input file" help_text="This is the Gbe image binary that will be copied into this region."/>
 			<MajorVersion value="0" edit="false" visible="true" name="Major Version" help_text=""/>
-			<MinorVersion value="13" edit="false" visible="true" name="Minor Version" help_text=""/>
-			<ImageId value="4" edit="false" visible="true" name="Image ID" help_text=""/>
+			<MinorVersion value="0" edit="false" visible="true" name="Minor Version" help_text=""/>
+			<ImageId value="0" edit="false" visible="true" name="Image ID" help_text=""/>
 			<LANEn value="false" edit="false" visible="true" name="Intel (R) Integrated LAN Enable" help_text="Intel (R) Integrated LAN related PCH Straps are set up automatically according to this setting."/>
 		</Region3>
 		<Region4 name="PDR Region">
@@ -192,8 +192,8 @@
 			<Enabled value="true" edit="false" visible="false" name="ME region enabled" help_text=""/>
 			<RegionLength value="0x00000000" edit="true" visible="false" name="ME region length" help_text="This is the size of the ME region in bytes. Set this to 0 to make the region length equal to the binary file length (rounded up to 4k). Extra space will be filled with 0xFF."/>
 			<InputFile value="$SourceDir\me\me9.1_1.5m_production.bin" edit="true" visible="true" name="ME Binary Input File" help_text="This is the path to a binary file that will be used for the ME region."/>
-			<WcodChosen value="0x0082 TAYLOR" value_list="0x088E JACKSON,,0x0087 KILMER,,0x422B PUMA,,0x08B1 WILKINS,,0x0082 TAYLOR" edit="true" visible="true" name="WCOD Id" help_text="Determines which wireless LAN micro code will be supported in the firmware image"/>
-			<LoclChosen value="0x01 EN" value_list="0x02 FR,,0x03 GER,,0x04 CH,,0x05 JPN,,0x06 RUS,,0x07 ITA,,0x08 ESP,,0x09 PTB,,0x0A KOR,,0x0B CHS,,0x0C ARA,,0x0D CZE,,0x0E DAN,,0x0F GRE,,0x10 FIN,,0x11 HEB,,0x12 HUN,,0x13 DUT,,0x14 NOR,,0x15 POL,,0x16 POR,,0x17 SLK,,0x18 SLV,,0x19 SWE,,0x1A THA,,0x1B TUR,,0x01 EN" edit="true" visible="true" name="LOCL Id" help_text="Determines which localized language data will be used by the firmware for the secure output screens (Examples: SOL / KVM)"/>
+			<WcodChosen value="None" value_list="" edit="false" visible="false" name="WCOD Id" help_text="Determines which wireless LAN micro code will be supported in the firmware image"/>
+			<LoclChosen value="None" value_list="" edit="false" visible="false" name="LOCL Id" help_text="Determines which localized language data will be used by the firmware for the secure output screens (Examples: SOL / KVM)"/>
 			<Configuration name="Configuration">
 				<ME name="ME">
 					<FwuOemId value="00000000-0000-0000-0000-000000000000" edit="true" visible="true" name="FW Update OEM ID" help_text="Enter UUID or file containing the UUID.  This UUID will make sure that customers can only update a platform with an image coming from the OEM of the platform.  If set to zero than any input is valid (including none) when doing a FW update."/>
@@ -760,7 +760,7 @@
 						<Profile name="UserProfile" base="Standard" selected="TRUE">
 							<HwRegisters>
 								<SSCCTL_PCHPCIE100 value="0x00000008"/>
-								<OCKEN value="0x700F0F8C"/>
+								<OCKEN value="0x74FF0A88"/>
 								<SECOSS value="0x00002216"/>
 							</HwRegisters>
 						</Profile>
diff --git a/SharkBayDT.veb b/SharkBayDT.veb
index 3845b63..6c2313d 100644
--- a/SharkBayDT.veb
+++ b/SharkBayDT.veb
@@ -63,9 +63,6 @@
 "Core\EM\EdkIILib\EdkIILib.cif"= "SS: Alaska;$/Alaska/SOURCE/Core\EdkIICompLib;4.6.5.4"
 "Include\EdkII_headers.cif"= "SS: Alaska;$/Alaska/SOURCE/Core\EdkIICompLib;4.6.5.4"
 "Core\EM\Capsule2_0\Capsule2_0.cif"= "SS: Alaska;$/Alaska/SOURCE/Core\Modules/Capsule2_0;4.6.5.4"
-"Board\IO\F81216\F81216.CIF"= "SS: ALASKA;$/Alaska/BIN/IO/Fintek/F81216_Sec;4.6.3_SIO_F81216_Sec_A9"
-"Board\IO\F81216\ACPI\DeviceASL.cif"= "SS: ALASKA;$/Alaska/BIN/IO/Fintek/F81216_Sec\F81216 Device ASL Files;4.6.3_SIO_F81216_Sec_A9"
-"Board\IO\F81216\BSP\BSP.cif"= "SS: ALASKA;$/Alaska/BIN/IO/Fintek/F81216_Sec\F81216 Board;4.6.3_SIO_F81216_Sec_A9"
 "Board\IO\F81866\F81866.CIF"= "SS: ALASKA;$/Alaska/BIN/IO/Fintek/F81866;4.6.3.5_SIO_F81866_A5"
 "Board\IO\F81866\ACPI\DeviceASL.cif"= "SS: ALASKA;$/Alaska/BIN/IO/Fintek/F81866\F81866 Device ASL Files;4.6.3.5_SIO_F81866_A5"
 "Board\IO\F81866\BSP\BSP.cif"= "SS: ALASKA;$/Alaska/BIN/IO/Fintek/F81866\F81866 Board;4.6.3.5_SIO_F81866_A5"