Преглед на файлове

KabylakeOpenBoardPkg: Consolidate board IDs in a single file

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2207

Moves all Kaby Lake board ID definitions into a single header file
so it is easier to maintain the values and include the values
into common package files that need to make decisions based on board
ID.

Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Ankit Sinha <ankit.sinha@intel.com>
Cc: Jeremy Soller <jeremy@system76.com>
Signed-off-by: Michael Kubacki <michael.a.kubacki@intel.com>
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
Reviewed-by: Ankit Sinha <ankit.sinha@intel.com>
Michael Kubacki преди 4 години
родител
ревизия
2e0efcd672
променени са 18 файла, в които са добавени 47 реда и са изтрити 46 реда
  1. 0 13
      Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Include/GalagoPro3Id.h
  2. 1 1
      Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/DxeGalagoPro3AcpiTableLib.c
  3. 1 1
      Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.c
  4. 1 1
      Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/SmmGalagoPro3AcpiEnableLib.c
  5. 1 1
      Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.c
  6. 1 1
      Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiGalagoPro3InitLib.h
  7. 1 1
      Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.c
  8. 1 1
      Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.c
  9. 29 0
      Platform/Intel/KabylakeOpenBoardPkg/Include/PlatformBoardId.h
  10. 0 15
      Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Include/KabylakeRvp3Id.h
  11. 3 3
      Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeKabylakeRvp3AcpiTableLib.c
  12. 1 1
      Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.c
  13. 2 2
      Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmKabylakeRvp3AcpiEnableLib.c
  14. 1 1
      Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.c
  15. 1 1
      Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPreMemLib.c
  16. 1 1
      Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiKabylakeRvp3InitLib.h
  17. 1 1
      Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.c
  18. 1 1
      Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.c

+ 0 - 13
Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Include/GalagoPro3Id.h

@@ -1,13 +0,0 @@
-/** @file
-
-Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
-SPDX-License-Identifier: BSD-2-Clause-Patent
-
-**/
-
-#ifndef _GALAGO_PRO_3_ID_H_
-#define _GALAGO_PRO_3_ID_H_
-
-#define BoardIdGalagoPro3     0x20
-
-#endif

+ 1 - 1
Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/DxeGalagoPro3AcpiTableLib.c

@@ -18,7 +18,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/AslUpdateLib.h>
 #include <Protocol/GlobalNvsArea.h>
 
-#include <GalagoPro3Id.h>
+#include <PlatformBoardId.h>
 
 GLOBAL_REMOVE_IF_UNREFERENCED EFI_GLOBAL_NVS_AREA_PROTOCOL              mGlobalNvsArea;
 

+ 1 - 1
Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.c

@@ -16,7 +16,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/PcdLib.h>
 #include <Library/DebugLib.h>
 
-#include <GalagoPro3Id.h>
+#include <PlatformBoardId.h>
 
 EFI_STATUS
 EFIAPI

+ 1 - 1
Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/SmmGalagoPro3AcpiEnableLib.c

@@ -15,7 +15,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/PcdLib.h>
 #include <Library/DebugLib.h>
 
-#include <GalagoPro3Id.h>
+#include <PlatformBoardId.h>
 
 EFI_STATUS
 EFIAPI

+ 1 - 1
Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.c

@@ -16,7 +16,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/PcdLib.h>
 #include <Library/DebugLib.h>
 
-#include <GalagoPro3Id.h>
+#include <PlatformBoardId.h>
 
 EFI_STATUS
 EFIAPI

+ 1 - 1
Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiGalagoPro3InitLib.h

@@ -18,7 +18,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <PchHsioPtssTables.h>
 #include <IoExpander.h>
 
-#include <GalagoPro3Id.h>
+#include <PlatformBoardId.h>
 
 extern const UINT8 mDqByteMapSklRvp3[2][6][2];
 extern const UINT8 mDqsMapCpu2DramSklRvp3[2][8];

+ 1 - 1
Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.c

@@ -14,7 +14,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/PcdLib.h>
 #include <Library/DebugLib.h>
 
-#include <GalagoPro3Id.h>
+#include <PlatformBoardId.h>
 
 EFI_STATUS
 EFIAPI

+ 1 - 1
Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.c

@@ -14,7 +14,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/PcdLib.h>
 #include <Library/DebugLib.h>
 
-#include <GalagoPro3Id.h>
+#include <PlatformBoardId.h>
 
 EFI_STATUS
 EFIAPI

+ 29 - 0
Platform/Intel/KabylakeOpenBoardPkg/Include/PlatformBoardId.h

@@ -0,0 +1,29 @@
+/** @file
+Kaby Lake Platform Board Identifiers
+
+  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  SPDX-License-Identifier: BSD-2-Clause-Patent
+**/
+
+#ifndef _PLATFORM_BOARD_ID_H_
+#define _PLATFORM_BOARD_ID_H_
+
+#define FlavorUnknown                       0x0
+#define FlavorMobile                        0x1
+#define FlavorDesktop                       0x2
+#define FlavorWorkstation                   0x3
+#define FlavorUpServer                      0x4
+#define FlavorEmbedded                      0x5
+#define FlavorPlatformMax                   0x6
+
+#define TypeUnknown                         0x0
+#define TypeTrad                            0x1
+#define TypeUltUlx                          0x2
+
+#define BoardIdSkylakeRvp3                  0x4
+#define BoardIdGalagoPro3                   0x20
+#define BoardIdKabyLakeYLpddr3Rvp3          0x60
+
+#define BoardIdUnknown1                     0xffff
+
+#endif

+ 0 - 15
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Include/KabylakeRvp3Id.h

@@ -1,15 +0,0 @@
-/** @file
-
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-SPDX-License-Identifier: BSD-2-Clause-Patent
-
-**/
-
-#ifndef _KABYLAKE_RVP3_ID_H_
-#define _KABYLAKE_RVP3_ID_H_
-
-// PUT SKL CRB BoardIds here
-#define BoardIdSkylakeRvp3                  0x4
-#define BoardIdKabyLakeYLpddr3Rvp3          0x60
-
-#endif // _PEI_KABYLAKE_RVP3_BOARD_INIT_LIB_H_

+ 3 - 3
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeKabylakeRvp3AcpiTableLib.c

@@ -1,7 +1,7 @@
 /** @file
   Platform Hook Library instances
 
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -18,7 +18,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/AslUpdateLib.h>
 #include <Protocol/GlobalNvsArea.h>
 
-#include <KabylakeRvp3Id.h>
+#include <PlatformBoardId.h>
 
 GLOBAL_REMOVE_IF_UNREFERENCED EFI_GLOBAL_NVS_AREA_PROTOCOL              mGlobalNvsArea;
 
@@ -43,7 +43,7 @@ KabylakeRvp3UpdateGlobalNvs (
   mGlobalNvsArea.Area->PowerState = 1; // AC =1; for mobile platform, will update this value in SmmPlatform.c
 
   mGlobalNvsArea.Area->NativePCIESupport        = PcdGet8 (PcdPciExpNative);
-  
+
   //
   // Enable APIC
   //

+ 1 - 1
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.c

@@ -16,7 +16,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/PcdLib.h>
 #include <Library/DebugLib.h>
 
-#include <KabylakeRvp3Id.h>
+#include <PlatformBoardId.h>
 
 EFI_STATUS
 EFIAPI

+ 2 - 2
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmKabylakeRvp3AcpiEnableLib.c

@@ -1,7 +1,7 @@
 /** @file
   Platform Hook Library instances
 
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -15,7 +15,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/PcdLib.h>
 #include <Library/DebugLib.h>
 
-#include <KabylakeRvp3Id.h>
+#include <PlatformBoardId.h>
 
 EFI_STATUS
 EFIAPI

+ 1 - 1
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.c

@@ -16,7 +16,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/PcdLib.h>
 #include <Library/DebugLib.h>
 
-#include <KabylakeRvp3Id.h>
+#include <PlatformBoardId.h>
 
 EFI_STATUS
 EFIAPI

+ 1 - 1
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPreMemLib.c

@@ -12,7 +12,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/BoardInitLib.h>
 #include <Library/PcdLib.h>
 #include <Library/DebugLib.h>
-#include <KabylakeRvp3Id.h>
+#include <PlatformBoardId.h>
 
 EFI_STATUS
 EFIAPI

+ 1 - 1
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiKabylakeRvp3InitLib.h

@@ -18,7 +18,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <PchHsioPtssTables.h>
 #include <IoExpander.h>
 
-#include <KabylakeRvp3Id.h>
+#include <PlatformBoardId.h>
 
 extern const UINT8 mDqByteMapSklRvp3[2][6][2];
 extern const UINT8 mDqsMapCpu2DramSklRvp3[2][8];

+ 1 - 1
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.c

@@ -14,7 +14,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/PcdLib.h>
 #include <Library/DebugLib.h>
 
-#include <KabylakeRvp3Id.h>
+#include <PlatformBoardId.h>
 
 EFI_STATUS
 EFIAPI

+ 1 - 1
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.c

@@ -14,7 +14,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/PcdLib.h>
 #include <Library/DebugLib.h>
 
-#include <KabylakeRvp3Id.h>
+#include <PlatformBoardId.h>
 
 EFI_STATUS
 EFIAPI