From 0d5117f062989f8e661f92725df7d48bfcf21a53 Mon Sep 17 00:00:00 2001 From: raywu Date: Tue, 9 Oct 2018 10:12:34 +0800 Subject: Release [DW03AR00] - Bring Up --- Board/EM/Platform/AcpiPlatform.c | 6 +- .../Library/Protocol/GlobalNvsArea/GlobalNvsArea.h | 2 +- Board/EM/Setup/Setup.uni | Bin 24786 -> 24786 bytes CRB/CSP.sdl | 94 ++++++++++----------- DW03AR00.zip | Bin 0 -> 2789075 bytes ReferenceCode/AcpiTables/Dsdt/GloblNvs.asl | 2 +- RomImage/FitcBuild.bat | 2 +- RomImage/XmlFiles/Q87_8Mx2.xml | 10 +-- SharkBayDT.veb | 3 - 9 files changed, 56 insertions(+), 63 deletions(-) create mode 100644 DW03AR00.zip 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 Binary files a/Board/EM/Setup/Setup.uni and b/Board/EM/Setup/Setup.uni differ 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 Binary files /dev/null and b/DW03AR00.zip differ 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 @@ - - + + @@ -192,8 +192,8 @@ - - + + @@ -760,7 +760,7 @@ - + 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" -- cgit v1.2.3