diff options
| author | Guo Mang <mang.guo@intel.com> | 2016-08-03 13:38:47 +0800 |
|---|---|---|
| committer | Guo Mang <mang.guo@intel.com> | 2016-08-04 10:30:41 +0800 |
| commit | 40c3a7f1e81582b5a8279d405b5cb6ca80d99c42 (patch) | |
| tree | 9a7345d5ae53debb68b66c4544f8a43e7471081e /BraswellPlatformPkg/Common | |
| parent | 1ba4ff338446b5db2a0b41b4c84a03a431b0cb33 (diff) | |
| download | edk2-platforms-40c3a7f1e81582b5a8279d405b5cb6ca80d99c42.tar.xz | |
BraswellPlatformPkg: Restructure code in Common/Include directory
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Guo Mang <mang.guo@intel.com>
Reviewed-by: David Wei <david.wei@intel.com>
Diffstat (limited to 'BraswellPlatformPkg/Common')
35 files changed, 248 insertions, 198 deletions
diff --git a/BraswellPlatformPkg/Common/Include/ChipsetAccess.h b/BraswellPlatformPkg/Common/Include/ChipsetAccess.h index 0658e5dc14..3bcb528c86 100644 --- a/BraswellPlatformPkg/Common/Include/ChipsetAccess.h +++ b/BraswellPlatformPkg/Common/Include/ChipsetAccess.h @@ -22,3 +22,4 @@ #include "ChvCommonDefinitions.h"
#endif
+
diff --git a/BraswellPlatformPkg/Common/Include/CommonIncludes.h b/BraswellPlatformPkg/Common/Include/CommonIncludes.h index 0a2c3c5c95..bb66581d7e 100644 --- a/BraswellPlatformPkg/Common/Include/CommonIncludes.h +++ b/BraswellPlatformPkg/Common/Include/CommonIncludes.h @@ -113,3 +113,4 @@ #define BITRANGE(From, Width, Value) (((Value) >> (From)) & ((1 << (Width)) - 1))
#endif
+
diff --git a/BraswellPlatformPkg/Common/Include/CpuBaseLib.h b/BraswellPlatformPkg/Common/Include/CpuBaseLib.h index 663e926efe..0275205b13 100644 --- a/BraswellPlatformPkg/Common/Include/CpuBaseLib.h +++ b/BraswellPlatformPkg/Common/Include/CpuBaseLib.h @@ -242,3 +242,4 @@ EfiCpuVersion ( );
#endif
+
diff --git a/BraswellPlatformPkg/Common/Include/CpuDataStruct.h b/BraswellPlatformPkg/Common/Include/CpuDataStruct.h index aab91d41cd..98a8cbe0e2 100644 --- a/BraswellPlatformPkg/Common/Include/CpuDataStruct.h +++ b/BraswellPlatformPkg/Common/Include/CpuDataStruct.h @@ -112,3 +112,4 @@ typedef struct { } EFI_CPU_VERSION;
#endif
+
diff --git a/BraswellPlatformPkg/Common/Include/GpioAttributes.h b/BraswellPlatformPkg/Common/Include/GpioAttributes.h deleted file mode 100644 index 2fdbc9310a..0000000000 --- a/BraswellPlatformPkg/Common/Include/GpioAttributes.h +++ /dev/null @@ -1,121 +0,0 @@ -/** @file
- This file provides the definitions of GPIO attributes
-
-Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that 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.
-
-**/
-
-#ifndef _GPIO_ATTRIBUTES_H_
-#define _GPIO_ATTRIBUTES_H_
-
-#define GPIO_ATTRIBUTE_HIGH 1
-#define GPIO_ATTRIBUTE_LOW 0
-#define GPIO_ATTRIBUTE_NA 0xFF
-//
-// Attribute: GPIO_USAGE
-//
-typedef enum {
- USAGE_GPIO = 0,
- USAGE_GPO = 1,
- USAGE_GPI = 2,
- USAGE_HIZ = 3,
- USAGE_Native = 4,
- USAGE_None = 0xFF
-} GPIO_ATTRIBUTE_USAGE;
-
-//
-// Attribute: INT_TRIGGER_TYPE
-//
-typedef enum {
- TRIGGER_Edge_High = 0,
- TRIGGER_Edge_Low = 1,
- TRIGGER_Edge_Both = 2,
- TRIGGER_Level_High = 3,
- TRIGGER_Level_Low = 4,
- TRIGGER_None = 0xFF
-} GPIO_ATTRIBUTE_TRIGGER_TYPE;
-
-//
-// Attribute: DRIVE_TYPE
-//
-typedef enum {
- DRIVE_Open_Drain = 0,
- DRIVE_Push_Pull = 1,
- DRIVE_None = 0xFF
-} GPIO_ATTRIBUTE_DRIVE_TYPE;
-
-//
-// Attribute: PULL_DIRECTION
-//
-typedef enum {
- DIRECTION_Pull_Up = 0,
- DIRECTION_Pull_Down = 1,
- DIRECTION_None = 0xFF
-} GPIO_ATTRIBUTE_PULL_DIRECTION;
-
-//
-// Attribute: PULL_STRENGTH
-//
-typedef enum {
- STRENGTH_1K = 0,
- STRENGTH_2K = 1,
- STRENGTH_5K = 2,
- STRENGTH_10K = 3,
- STRENGTH_20K = 4,
- STRENGTH_40K = 5,
- STRENGTH_None = 0xFF
-} GPIO_ATTRIBUTE_PULL_STRENGTH;
-
-//
-// Attribute: INT_TYPE
-//
-typedef enum {
- INT_Direct = 0,
- INT_Shared = 1,
- INT_SMI = 2,
- INT_SCI = 3,
- INT_None = 0xFF
-} GPIO_ATTRIBUTE_INT_TYPE;
-
-//
-// Attribute: SHARE_MODE
-//
-typedef enum {
- MODE_Shared = 0,
- MODE_Exclusive = 1,
- MODE_SharedAndWake = 2,
- MODE_ExclusiveAndWake = 3
-} GPIO_ATTRIBUTE_SHARE_MODE;
-
-//
-// Attribute: INVERT_RX_TX
-//
-typedef enum
-{
- GLITCH_DISABLE = 0,
- GLITCH_EN_EdgeDetect,
- GLITCH_EN_RX_Data,
- GLITCH_EN_Edge_RX_Data,
-} GPIO_ATTRIBUTE_GLITCH_CFG;
-
-//
-// Attribute: INVERT_RX_TX
-//
-typedef enum
-{
- GPIO_No_Inversion = 0,
- GPIO_Inv_RX_Enable = 0x1,
- GPIO_Inv_TX_Enable = 0x2,
- GPIO_Inv_RX_TX_Enable = 0x3,
- GPIO_Inv_RX_Data = 0x4,
- GPIO_Inv_RX_Data_TX_Enable = 0x6,
- GPIO_Inv_TX_Data = 0x8,
-} GPIO_ATTRIBUTE_INVERT_RX_TX;
-#endif
diff --git a/BraswellPlatformPkg/Common/Include/Guid/BiosId.h b/BraswellPlatformPkg/Common/Include/Guid/BiosId.h index e045f75d51..4950f47ff1 100644 --- a/BraswellPlatformPkg/Common/Include/Guid/BiosId.h +++ b/BraswellPlatformPkg/Common/Include/Guid/BiosId.h @@ -22,3 +22,4 @@ extern EFI_GUID gEfiBiosIdGuid;
#endif
+
diff --git a/BraswellPlatformPkg/Common/Include/Guid/GraphicsInfoHob.h b/BraswellPlatformPkg/Common/Include/Guid/GraphicsInfoHob.h index 51e2369072..3d41295813 100644 --- a/BraswellPlatformPkg/Common/Include/Guid/GraphicsInfoHob.h +++ b/BraswellPlatformPkg/Common/Include/Guid/GraphicsInfoHob.h @@ -32,3 +32,4 @@ typedef struct { extern EFI_GUID gEfiGraphicsInfoHobGuid;
#endif
+
diff --git a/BraswellPlatformPkg/Common/Include/Guid/HiiFrontPageFormset.h b/BraswellPlatformPkg/Common/Include/Guid/HiiFrontPageFormset.h index e91c7391cb..1d5233bd1a 100644 --- a/BraswellPlatformPkg/Common/Include/Guid/HiiFrontPageFormset.h +++ b/BraswellPlatformPkg/Common/Include/Guid/HiiFrontPageFormset.h @@ -31,3 +31,4 @@ Intel Corporation. extern EFI_GUID gEfiIfrFrontPageGuid;
#endif
+
diff --git a/BraswellPlatformPkg/Common/Include/Guid/MemoryConfigData.h b/BraswellPlatformPkg/Common/Include/Guid/MemoryConfigData.h index cd4177e1d7..782787af22 100644 --- a/BraswellPlatformPkg/Common/Include/Guid/MemoryConfigData.h +++ b/BraswellPlatformPkg/Common/Include/Guid/MemoryConfigData.h @@ -25,3 +25,4 @@ extern EFI_GUID gEfiMemoryConfigDataGuid; extern CHAR16 EfiMemoryConfigVariable[];
#endif
+
diff --git a/BraswellPlatformPkg/Common/Include/Guid/PlatformInfo.h b/BraswellPlatformPkg/Common/Include/Guid/PlatformInfo.h index 2f33bc6528..ef4bb3433d 100644 --- a/BraswellPlatformPkg/Common/Include/Guid/PlatformInfo.h +++ b/BraswellPlatformPkg/Common/Include/Guid/PlatformInfo.h @@ -153,13 +153,13 @@ typedef enum { // Hardware_ID table for Product_Line_ID == INTEL_CHT_TABLET
//
typedef enum {
- CHT_TABLET_RVP1 = 0, /* Cherry Trail RVP Fab 1 */
- CHT_TABLET_RVP2 = 1, /* Cherry Trail RVP Fab 2 */
- CHT_TABLET_RVP3 = 2, /* Cherry Trail RVP Fab 3 */
- CHT_TABLET_FFD_PR0 = 3, /* Cherry Trail FFRD PR0 */
- CHT_TABLET_FFD_PR1 = 4, /* Cherry Trail FFRD PR1 */
- CHT_TABLET_FFD_PR2 = 5, /* Cherry Trail FFRD PR2 */
- CHT_TABLET_UNKNOWN = 0xFF
+ CHT_TABLET_RVP1 = 0, /* Cherry Trail RVP Fab 1 */
+ CHT_TABLET_RVP2 = 1, /* Cherry Trail RVP Fab 2 */
+ CHT_TABLET_RVP3 = 2, /* Cherry Trail RVP Fab 3 */
+ CHT_TABLET_FFD_PR0 = 3, /* Cherry Trail FFRD PR0 */
+ CHT_TABLET_FFD_PR1 = 4, /* Cherry Trail FFRD PR1 */
+ CHT_TABLET_FFD_PR2 = 5, /* Cherry Trail FFRD PR2 */
+ CHT_TABLET_UNKNOWN = 0xFF
}INTEL_CHT;
typedef enum {
@@ -172,7 +172,7 @@ typedef enum { typedef enum {
FFD_8_PR0 = 1, // FFRD8 PR0
FFD_8_PR1 = 2, // FFRD8 PR1
- FFD_8_PR2 = 3 // FFRD8 PR1
+ FFD_8_PR2 = 3 // FFRD8 PR1
} FFD_ID_LIST;
//
@@ -314,3 +314,4 @@ InstallPlatformSysCtrlGPIONotify ( );
#endif
+
diff --git a/BraswellPlatformPkg/Common/Include/Guid/SetupVariable.h b/BraswellPlatformPkg/Common/Include/Guid/SetupVariable.h index f2e754071e..6ae39c8d2a 100644 --- a/BraswellPlatformPkg/Common/Include/Guid/SetupVariable.h +++ b/BraswellPlatformPkg/Common/Include/Guid/SetupVariable.h @@ -1310,3 +1310,4 @@ extern EFI_GUID gEfiSetupVariableGuid; #define SETUP_DATA SYSTEM_CONFIGURATION
#endif // #ifndef _SETUP_VARIABLE
+
diff --git a/BraswellPlatformPkg/Common/Include/Hpet.h b/BraswellPlatformPkg/Common/Include/Hpet.h index 9ee47d9274..109b9a1766 100644 --- a/BraswellPlatformPkg/Common/Include/Hpet.h +++ b/BraswellPlatformPkg/Common/Include/Hpet.h @@ -28,8 +28,9 @@ // HPET Definitions
//
#define EFI_ACPI_HPET_TABLE_REVISION 0x1
-#define MAIN_COUNTER_MIN_PERIODIC_CLOCK_TICKS 0x80 //approx 1ms
+#define MAIN_COUNTER_MIN_PERIODIC_CLOCK_TICKS 0x80 //approx 1ms
#define HPET_BASE_ADDRESS 0xFED00000
#define EFI_ACPI_EVENT_TIMER_BLOCK_ID 0x8086A201
#endif
+
diff --git a/BraswellPlatformPkg/Common/Include/KscLib.h b/BraswellPlatformPkg/Common/Include/KscLib.h index 985c43dcb3..74ce22ec93 100644 --- a/BraswellPlatformPkg/Common/Include/KscLib.h +++ b/BraswellPlatformPkg/Common/Include/KscLib.h @@ -70,7 +70,7 @@ #define KSC_B_BOARD_ID_BIT_16 0x80 // Bit7 =1 means 16 bit implementation
#define KSC_C_FAB_ID 0x0D // Get the board fab ID in the lower 3 bits
#define KSC_C_SYSTEM_POWER_OFF 0x22 // Turn off the system power
-#define KSC_C_NIC_PRESENCE 0X27 // WLAN NIC Card presence Information
+#define KSC_C_NIC_PRESENCE 0X27 // WLAN NIC Card presence Information
#define KSC_C_LAN_ON 0x46 // Turn on the power to LAN through EC/KSC
#define KSC_C_LAN_OFF 0x47 // Turn off the power to LAN through EC/KSC
#define KSC_C_GET_TEMP 0x50 // Returns the CPU temperature as read from the SMBus thermal sensor.
@@ -280,3 +280,4 @@ ReceiveKscStatus ( );
#endif
+
diff --git a/BraswellPlatformPkg/Common/Include/Library/BiosIdLib.h b/BraswellPlatformPkg/Common/Include/Library/BiosIdLib.h index b80c57265e..2e4a618ce9 100644 --- a/BraswellPlatformPkg/Common/Include/Library/BiosIdLib.h +++ b/BraswellPlatformPkg/Common/Include/Library/BiosIdLib.h @@ -97,3 +97,4 @@ GetBiosVersionDateTime ( );
#endif
+
diff --git a/BraswellPlatformPkg/Common/Include/Library/CpuIA32.h b/BraswellPlatformPkg/Common/Include/Library/CpuIA32.h index fef98e9c53..3b3f48eece 100644 --- a/BraswellPlatformPkg/Common/Include/Library/CpuIA32.h +++ b/BraswellPlatformPkg/Common/Include/Library/CpuIA32.h @@ -339,3 +339,4 @@ EfiCpuVersion ( );
#endif
+
diff --git a/BraswellPlatformPkg/Common/Include/Library/EfiRegTableLib.h b/BraswellPlatformPkg/Common/Include/Library/EfiRegTableLib.h index 20350b808f..95a12934ad 100644 --- a/BraswellPlatformPkg/Common/Include/Library/EfiRegTableLib.h +++ b/BraswellPlatformPkg/Common/Include/Library/EfiRegTableLib.h @@ -184,3 +184,4 @@ ProcessRegTableCpu ( );
#endif
+
diff --git a/BraswellPlatformPkg/Common/Include/Library/PlatformSerialPortLib.h b/BraswellPlatformPkg/Common/Include/Library/PlatformSerialPortLib.h index 7ff7f4d217..67f9f272a3 100644 --- a/BraswellPlatformPkg/Common/Include/Library/PlatformSerialPortLib.h +++ b/BraswellPlatformPkg/Common/Include/Library/PlatformSerialPortLib.h @@ -177,3 +177,4 @@ SerialPortSetAttributes ( );
#endif
+
diff --git a/BraswellPlatformPkg/Common/Include/Library/RecoveryOemHookLib.h b/BraswellPlatformPkg/Common/Include/Library/RecoveryOemHookLib.h index efa0ae33aa..0292f8d27c 100644 --- a/BraswellPlatformPkg/Common/Include/Library/RecoveryOemHookLib.h +++ b/BraswellPlatformPkg/Common/Include/Library/RecoveryOemHookLib.h @@ -68,3 +68,4 @@ OemRecoverySecurityCheck ( );
#endif
+
diff --git a/BraswellPlatformPkg/Common/Include/Library/SerialPortLib1.h b/BraswellPlatformPkg/Common/Include/Library/SerialPortLib1.h new file mode 100644 index 0000000000..67f9f272a3 --- /dev/null +++ b/BraswellPlatformPkg/Common/Include/Library/SerialPortLib1.h @@ -0,0 +1,180 @@ +/** @file
+ This library class provides common serial I/O port functions.
+
+Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>
+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.
+
+**/
+
+#ifndef __SERIAL_PORT_LIB__
+#define __SERIAL_PORT_LIB__
+
+#include <Uefi/UefiBaseType.h>
+#include <Protocol/SerialIo.h>
+
+/**
+ Initialize the serial device hardware.
+
+ If no initialization is required, then return RETURN_SUCCESS.
+ If the serial device was successfully initialized, then return RETURN_SUCCESS.
+ If the serial device could not be initialized, then return RETURN_DEVICE_ERROR.
+
+ @retval RETURN_SUCCESS The serial device was initialized.
+ @retval RETURN_DEVICE_ERROR The serial device could not be initialized.
+
+**/
+RETURN_STATUS
+EFIAPI
+SerialPortInitialize (
+ VOID
+ );
+
+/**
+ Write data from buffer to serial device.
+
+ Writes NumberOfBytes data bytes from Buffer to the serial device.
+ The number of bytes actually written to the serial device is returned.
+ If the return value is less than NumberOfBytes, then the write operation failed.
+ If Buffer is NULL, then ASSERT().
+ If NumberOfBytes is zero, then return 0.
+
+ @param Buffer Pointer to the data buffer to be written.
+ @param NumberOfBytes Number of bytes to written to the serial device.
+
+ @retval 0 NumberOfBytes is 0.
+ @retval >0 The number of bytes written to the serial device.
+ If this value is less than NumberOfBytes, then the read operation failed.
+
+**/
+UINTN
+EFIAPI
+SerialPortWrite (
+ IN UINT8 *Buffer,
+ IN UINTN NumberOfBytes
+ );
+
+
+/**
+ Read data from serial device and save the datas in buffer.
+
+ Reads NumberOfBytes data bytes from a serial device into the buffer
+ specified by Buffer. The number of bytes actually read is returned.
+ If the return value is less than NumberOfBytes, then the rest operation failed.
+ If Buffer is NULL, then ASSERT().
+ If NumberOfBytes is zero, then return 0.
+
+ @param Buffer Pointer to the data buffer to store the data read from the serial device.
+ @param NumberOfBytes Number of bytes which will be read.
+
+ @retval 0 Read data failed, no data is to be read.
+ @retval >0 Actual number of bytes read from serial device.
+
+**/
+UINTN
+EFIAPI
+SerialPortRead (
+ OUT UINT8 *Buffer,
+ IN UINTN NumberOfBytes
+ );
+
+/**
+ Polls a serial device to see if there is any data waiting to be read.
+
+ Polls a serial device to see if there is any data waiting to be read.
+ If there is data waiting to be read from the serial device, then TRUE is returned.
+ If there is no data waiting to be read from the serial device, then FALSE is returned.
+
+ @retval TRUE Data is waiting to be read from the serial device.
+ @retval FALSE There is no data waiting to be read from the serial device.
+
+**/
+BOOLEAN
+EFIAPI
+SerialPortPoll (
+ VOID
+ );
+
+/**
+ Sets the control bits on a serial device.
+
+ @param Control Sets the bits of Control that are settable.
+
+ @retval RETURN_SUCCESS The new control bits were set on the serial device.
+ @retval RETURN_UNSUPPORTED The serial device does not support this operation.
+ @retval RETURN_DEVICE_ERROR The serial device is not functioning correctly.
+
+**/
+RETURN_STATUS
+EFIAPI
+SerialPortSetControl (
+ IN UINT32 Control
+ );
+
+/**
+ Retrieve the status of the control bits on a serial device.
+
+ @param Control A pointer to return the current control signals from the serial device.
+
+ @retval RETURN_SUCCESS The control bits were read from the serial device.
+ @retval RETURN_UNSUPPORTED The serial device does not support this operation.
+ @retval RETURN_DEVICE_ERROR The serial device is not functioning correctly.
+
+**/
+RETURN_STATUS
+EFIAPI
+SerialPortGetControl (
+ OUT UINT32 *Control
+ );
+
+/**
+ Sets the baud rate, receive FIFO depth, transmit/receice time out, parity,
+ data bits, and stop bits on a serial device.
+
+ @param BaudRate The requested baud rate. A BaudRate value of 0 will use the
+ device's default interface speed.
+ On output, the value actually set.
+ @param ReveiveFifoDepth The requested depth of the FIFO on the receive side of the
+ serial interface. A ReceiveFifoDepth value of 0 will use
+ the device's default FIFO depth.
+ On output, the value actually set.
+ @param Timeout The requested time out for a single character in microseconds.
+ This timeout applies to both the transmit and receive side of the
+ interface. A Timeout value of 0 will use the device's default time
+ out value.
+ On output, the value actually set.
+ @param Parity The type of parity to use on this serial device. A Parity value of
+ DefaultParity will use the device's default parity value.
+ On output, the value actually set.
+ @param DataBits The number of data bits to use on the serial device. A DataBits
+ vaule of 0 will use the device's default data bit setting.
+ On output, the value actually set.
+ @param StopBits The number of stop bits to use on this serial device. A StopBits
+ value of DefaultStopBits will use the device's default number of
+ stop bits.
+ On output, the value actually set.
+
+ @retval RETURN_SUCCESS The new attributes were set on the serial device.
+ @retval RETURN_UNSUPPORTED The serial device does not support this operation.
+ @retval RETURN_INVALID_PARAMETER One or more of the attributes has an unsupported value.
+ @retval RETURN_DEVICE_ERROR The serial device is not functioning correctly.
+
+**/
+RETURN_STATUS
+EFIAPI
+SerialPortSetAttributes (
+ IN OUT UINT64 *BaudRate,
+ IN OUT UINT32 *ReceiveFifoDepth,
+ IN OUT UINT32 *Timeout,
+ IN OUT EFI_PARITY_TYPE *Parity,
+ IN OUT UINT8 *DataBits,
+ IN OUT EFI_STOP_BITS_TYPE *StopBits
+ );
+
+#endif
+
diff --git a/BraswellPlatformPkg/Common/Include/Library/SmmIoLib.h b/BraswellPlatformPkg/Common/Include/Library/SmmIoLib.h index acef7e5e14..ad9940eee2 100644 --- a/BraswellPlatformPkg/Common/Include/Library/SmmIoLib.h +++ b/BraswellPlatformPkg/Common/Include/Library/SmmIoLib.h @@ -175,3 +175,4 @@ SmmPciCfgWrite ( );
#endif
+
diff --git a/BraswellPlatformPkg/Common/Include/Library/SpiFlash.h b/BraswellPlatformPkg/Common/Include/Library/SpiFlash.h index f50924196e..e26e1cbbc5 100644 --- a/BraswellPlatformPkg/Common/Include/Library/SpiFlash.h +++ b/BraswellPlatformPkg/Common/Include/Library/SpiFlash.h @@ -1,6 +1,6 @@ /** @file
- Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -63,31 +63,31 @@ typedef enum { #define SF_DEVICE_ID0_W25XXX 0x30
#define SF_DEVICE_ID1_W25X32 0x16
#define SF_DEVICE_ID1_W25X64 0x17
-#define SF_DEVICE_ID0_W25QXX 0x60
+#define SF_DEVICE_ID0_W25QXX 0x40
#define SF_DEVICE_ID1_W25Q16 0x15
#define SF_DEVICE_ID1_W25Q32 0x16
#define SF_DEVICE_ID1_W25Q64 0x17
#define SF_DEVICE_ID1_W25Q128 0x18
-#define SF_VENDOR_ID_MACRONIX 0xC2
-#define SF_DEVICE_ID0_MX25LXX 0x20
-#define SF_DEVICE_ID1_MX25L16 0x15
-#define SF_DEVICE_ID1_MX25L32 0x16
-#define SF_DEVICE_ID1_MX25L64 0x17
-#define SF_DEVICE_ID1_MX25L128 0x18
+#define SF_VENDOR_ID_MACRONIX 0xC2
+#define SF_DEVICE_ID0_MX25LXX 0x20
+#define SF_DEVICE_ID1_MX25L16 0x15
+#define SF_DEVICE_ID1_MX25L32 0x16
+#define SF_DEVICE_ID1_MX25L64 0x17
+#define SF_DEVICE_ID1_MX25L128 0x18
#define SF_DEVICE_ID0_MX25UXX 0x25
#define SF_DEVICE_ID1_MX25U6435F 0x37
-#define SF_VENDOR_ID_NUMONYX 0x20
+#define SF_VENDOR_ID_NUMONYX 0x20
#define SF_DEVICE_ID0_N25Q064 0xBB
#define SF_DEVICE_ID1_N25Q064 0x17
-#define SF_DEVICE_ID0_M25PXXX 0x71
-#define SF_DEVICE_ID0_N25QXXX 0xBA
-#define SF_DEVICE_ID1_M25PX16 0x15
-#define SF_DEVICE_ID1_N25Q032 0x16
-#define SF_DEVICE_ID1_M25PX32 0x16
-#define SF_DEVICE_ID1_M25PX64 0x17
-#define SF_DEVICE_ID1_N25Q128 0x18
+#define SF_DEVICE_ID0_M25PXXX 0x71
+#define SF_DEVICE_ID0_N25QXXX 0xBA
+#define SF_DEVICE_ID1_M25PX16 0x15
+#define SF_DEVICE_ID1_N25Q032 0x16
+#define SF_DEVICE_ID1_M25PX32 0x16
+#define SF_DEVICE_ID1_M25PX64 0x17
+#define SF_DEVICE_ID1_N25Q128 0x18
#define SF_VENDOR_ID_SST 0xBF
#define SF_DEVICE_ID0_SST25VF0XXX 0x25
@@ -155,9 +155,9 @@ typedef enum { #define SF_DEVICE_ID1_W25X32 0x16
#define SF_DEVICE_ID1_W25X64 0x17
-#define SF_VENDOR_ID_MX 0xC2
-#define SF_DEVICE_ID0_25L1605A 0x20
-#define SF_DEVICE_ID1_25L1605A 0x15
+#define SF_VENDOR_ID_MX 0xC2
+#define SF_DEVICE_ID0_25L1605A 0x20
+#define SF_DEVICE_ID1_25L1605A 0x15
#define SF_VENDOR_ID_NUMONYX 0x20
#define SF_DEVICE_ID0_M25PX16 0x71
@@ -211,10 +211,10 @@ typedef enum { #define SF_INST_DOFR 0x3B // Dual Output Fast Read
#define SF_INST_SFDP 0x5A // Serial Flash Discovery Parameters
-#define SECTOR_SIZE_4KB 0x1000 // Common 4kBytes sector size
-#define SECTOR_SIZE_64KB 0x10000 // Common 64kBytes sector size
-#define BLOCK_SIZE_64KB 0x00010000 // Common 64kBytes block size
-#define MAX_FWH_SIZE 0x00100000 // 8Mbit (Note that this can also be used for the 4Mbit )
+#define SECTOR_SIZE_4KB 0x1000 // Common 4kBytes sector size
+#define SECTOR_SIZE_64KB 0x10000 // Common 64kBytes sector size
+#define BLOCK_SIZE_64KB 0x00010000 // Common 64kBytes block size
+#define MAX_FWH_SIZE 0x00100000 // 8Mbit (Note that this can also be used for the 4Mbit )
//
// Prefix Opcode Index on the host SPI controller
@@ -239,3 +239,4 @@ typedef enum { } SPI_OPCODE_INDEX;
#endif
+
diff --git a/BraswellPlatformPkg/Common/Include/Library/StallSmmLib.h b/BraswellPlatformPkg/Common/Include/Library/StallSmmLib.h index 2772d418f7..40a3ab7ba5 100644 --- a/BraswellPlatformPkg/Common/Include/Library/StallSmmLib.h +++ b/BraswellPlatformPkg/Common/Include/Library/StallSmmLib.h @@ -35,3 +35,4 @@ SmmStall ( );
#endif
+
diff --git a/BraswellPlatformPkg/Common/Include/Library/UefiBootManagerLib.h b/BraswellPlatformPkg/Common/Include/Library/UefiBootManagerLib.h index ff34d6f344..22c9dd7603 100644 --- a/BraswellPlatformPkg/Common/Include/Library/UefiBootManagerLib.h +++ b/BraswellPlatformPkg/Common/Include/Library/UefiBootManagerLib.h @@ -796,3 +796,4 @@ EfiBootManagerGetVariableAndSize ( );
#endif
+
diff --git a/BraswellPlatformPkg/Common/Include/Mcfg.h b/BraswellPlatformPkg/Common/Include/Mcfg.h index f37b7fd981..be6ba7b144 100644 --- a/BraswellPlatformPkg/Common/Include/Mcfg.h +++ b/BraswellPlatformPkg/Common/Include/Mcfg.h @@ -63,3 +63,4 @@ typedef struct { #pragma pack()
#endif // _MCFG_H_
+
diff --git a/BraswellPlatformPkg/Common/Include/McfgTable.h b/BraswellPlatformPkg/Common/Include/McfgTable.h index 1c0062aa74..82e77e48c0 100644 --- a/BraswellPlatformPkg/Common/Include/McfgTable.h +++ b/BraswellPlatformPkg/Common/Include/McfgTable.h @@ -60,3 +60,4 @@ typedef struct { #pragma pack()
#endif // _MCFG_TABLE_H
+
diff --git a/BraswellPlatformPkg/Common/Include/PeiKscLib.h b/BraswellPlatformPkg/Common/Include/PeiKscLib.h index e71bcb57b5..43b7b87eee 100644 --- a/BraswellPlatformPkg/Common/Include/PeiKscLib.h +++ b/BraswellPlatformPkg/Common/Include/PeiKscLib.h @@ -68,7 +68,7 @@ #define KSC_C_FAB_ID 0x0D // Get the board fab ID in the lower 3 bits
#define KSC_B_BOARD_ID 0x0F // Board ID = [3:0]
#define KSC_C_SYSTEM_POWER_OFF 0x22 // Turn off the system power
-#define KSC_C_NIC_PRESENCE 0X27 // WLAN NIC Card presence Information
+#define KSC_C_NIC_PRESENCE 0X27 // WLAN NIC Card presence Information
#define KSC_C_LAN_ON 0x46 // Turn on the power to LAN through EC/KSC
#define KSC_C_LAN_OFF 0x47 // Turn off the power to LAN through EC/KSC
#define KSC_C_GET_DTEMP 0x50 // Returns the CPU temperature as read from the SMBus thermal sensor.
@@ -228,3 +228,4 @@ ReceiveKscStatus ( );
#endif
+
diff --git a/BraswellPlatformPkg/Common/Include/Platform.h b/BraswellPlatformPkg/Common/Include/Platform.h index b82f9c97c8..8e095026c4 100644 --- a/BraswellPlatformPkg/Common/Include/Platform.h +++ b/BraswellPlatformPkg/Common/Include/Platform.h @@ -127,3 +127,4 @@ typedef struct { #endif
#endif
+
diff --git a/BraswellPlatformPkg/Common/Include/PlatformDefinitions.h b/BraswellPlatformPkg/Common/Include/PlatformDefinitions.h index 779b9397a7..9f6bb8f153 100644 --- a/BraswellPlatformPkg/Common/Include/PlatformDefinitions.h +++ b/BraswellPlatformPkg/Common/Include/PlatformDefinitions.h @@ -40,3 +40,4 @@ #define MCH_BASE_ADDRESS 0xFED10000 // MCH Register Base Address
#endif
#endif
+
diff --git a/BraswellPlatformPkg/Common/Include/PlatformGpioTable.h b/BraswellPlatformPkg/Common/Include/PlatformGpioTable.h deleted file mode 100644 index 59add399a8..0000000000 --- a/BraswellPlatformPkg/Common/Include/PlatformGpioTable.h +++ /dev/null @@ -1,43 +0,0 @@ -/** @file
- This file provides the definitions of GPIO Table structure
-
-Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that 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.
-
-**/
-#ifndef _PLATFORM_GPIO_TABLE_H_
-#define _PLATFORM_GPIO_TABLE_H_
-
-#include "GpioAttributes.h"
-
-typedef struct {
- UINT8 Usage;
- UINT8 FuncNum;
- UINT8 InitLevel;
- UINT8 TrigType;
- UINT8 DriveType;
- UINT8 PullDirection;
- UINT8 PullStrength;
- UINT8 IntType;
- UINT8 ShareMode;
- UINT8 DirectIrqNum;
- UINT8 IntLineNum;
- UINT8 LightModeBar;
- UINT8 GlitchFilterConfig;
- UINT8 InvertRxTx;
- BOOLEAN ReservedPin;
-}PLATFORM_GPIO_TABLE_ROW;
-
-#define GPIO_TABLE_NORTH_ROW_NUM 59
-#define GPIO_TABLE_EAST_ROW_NUM 24
-#define GPIO_TABLE_SOUTHEAST_ROW_NUM 55
-#define GPIO_TABLE_SOUTHWEST_ROW_NUM 56
-#define GPIO_TABLE_ROW_NUM 194
-
-#endif
diff --git a/BraswellPlatformPkg/Common/Include/Ppi/BoardDetection.h b/BraswellPlatformPkg/Common/Include/Ppi/BoardDetection.h index f1b4ab6d71..bc6af3d68b 100644 --- a/BraswellPlatformPkg/Common/Include/Ppi/BoardDetection.h +++ b/BraswellPlatformPkg/Common/Include/Ppi/BoardDetection.h @@ -20,3 +20,4 @@ extern EFI_GUID gBoardDetectionStartPpiGuid; extern EFI_GUID gBoardDetectedPpiGuid;
#endif
+
diff --git a/BraswellPlatformPkg/Common/Include/Protocol/LpcWpce791Policy.h b/BraswellPlatformPkg/Common/Include/Protocol/LpcWpce791Policy.h index fe9b4ee8c9..8e72c27810 100644 --- a/BraswellPlatformPkg/Common/Include/Protocol/LpcWpce791Policy.h +++ b/BraswellPlatformPkg/Common/Include/Protocol/LpcWpce791Policy.h @@ -7,8 +7,10 @@ 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.
+
**/
#ifndef _WPCE791_POLICY_PROTOCOL_H_
@@ -46,3 +48,4 @@ typedef struct _EFI_WPCE791_POLICY_PROTOCOL { extern EFI_GUID gEfiLpcWpce791PolicyProtocolGuid;
#endif
+
diff --git a/BraswellPlatformPkg/Common/Include/Protocol/SmmSpiDevice.h b/BraswellPlatformPkg/Common/Include/Protocol/SmmSpiDevice.h index a4ff1efc82..97c9096288 100644 --- a/BraswellPlatformPkg/Common/Include/Protocol/SmmSpiDevice.h +++ b/BraswellPlatformPkg/Common/Include/Protocol/SmmSpiDevice.h @@ -30,3 +30,4 @@ extern EFI_GUID gSmmSpiDeviceProtocolGuid; typedef SPI_DEVICE_PROTOCOL SMM_SPI_DEVICE_PROTOCOL;
#endif
+
diff --git a/BraswellPlatformPkg/Common/Include/Protocol/SpiDevice.h b/BraswellPlatformPkg/Common/Include/Protocol/SpiDevice.h index 89f1599b97..14f27cab55 100644 --- a/BraswellPlatformPkg/Common/Include/Protocol/SpiDevice.h +++ b/BraswellPlatformPkg/Common/Include/Protocol/SpiDevice.h @@ -157,3 +157,4 @@ typedef struct { } SPI_DEVICE_PROTOCOL;
#endif
+
diff --git a/BraswellPlatformPkg/Common/Include/Protocol/SpiFlashPart.h b/BraswellPlatformPkg/Common/Include/Protocol/SpiFlashPart.h index 6b3c9fa7bc..73e56e6650 100644 --- a/BraswellPlatformPkg/Common/Include/Protocol/SpiFlashPart.h +++ b/BraswellPlatformPkg/Common/Include/Protocol/SpiFlashPart.h @@ -201,3 +201,4 @@ extern EFI_GUID gSpiFlashPartProtocolGuid; extern EFI_GUID gSpiFlashPartSyncGuid;
#endif // __SPI_FLASH_PART_H__
+
diff --git a/BraswellPlatformPkg/Common/Include/ReservedAcpiS3Range.h b/BraswellPlatformPkg/Common/Include/ReservedAcpiS3Range.h index 1dc83b5d99..95dbcfc826 100644 --- a/BraswellPlatformPkg/Common/Include/ReservedAcpiS3Range.h +++ b/BraswellPlatformPkg/Common/Include/ReservedAcpiS3Range.h @@ -31,3 +31,4 @@ typedef struct { #define RESERVED_ACPI_S3_RANGE_OFFSET (EFI_PAGE_SIZE - sizeof (RESERVED_ACPI_S3_RANGE))
#endif
+
|