Re: [edk2] [PATCH] [edk2-platforms/devel-IntelAtomProcessorE3900] Shift EEPROM PEI files
Hi Kelly, We recently added UP2_BOARD macro and MINNOW3_MODULE_BOARD in DSC file as workaround. That's because UP2_BOARD does not have official BOARD_ID designed, we cannot dynamically detect board ID to select boot path. MINNOW3_MODULE_BOARD is added to avoid build failure which is caused by lack of FV size. Another workaround we added is below UART port code because we have a bug with dynamic PCD at early stage of boot: !if $(UP2_BOARD) == TRUE gPlatformModuleTokenSpaceGuid.PcdSerialIoUartNumber|0 !else gPlatformModuleTokenSpaceGuid.PcdSerialIoUartNumber|2 !endif But we do prefer to not use any board specific flag outside of Board folder. Board specific data should be generated in Board folder and be passed out to common code though common dynamic PCD or common HOB. I add Jiewen just in case he has some more comment or suggestion. I have seen that you have another patch to fix above PcdSerialIoUartNumber workaround by using a dynamic PCD. With your new patch being pushed, we could remove above UP2_BOARD/PcdSerialIoUartNumber code from dsc file. For this PcdEepromBus and PcdEepromAddress, what about we also re-define them as common dynamic PCD, and assign them board specific value in source code under Board folder? Thanks, David Wei Intel SSG/STO/UEFI BIOS From: Steele, Kelly Sent: Wednesday, September 26, 2018 11:54 PM To: Wei, David ; edk2-devel@lists.01.org Cc: Guo, Mang Subject: RE: [PATCH] [edk2-platforms/devel-IntelAtomProcessorE3900] Shift EEPROM PEI files Hi David, Yes this PCD information is board specific. That is why it is wrapped in a board specific define. I would move it into the board specific folder, but it is FixedAtBuild so it cannot go into the code. Did you want me to add a PcdsFixedAtBuild.dsc into the board specific folder and include it in the top level PcdsFixedAtBuild.dsc? + + !if $(MINNOW3_MODULE_BOARD) == TRUE +# +# I2C bus the master EEPROM is hanging on +gPlatformModuleTokenSpaceGuid.PcdEepromBus|0x08 +# 7-bit address of the master EEPROM +gPlatformModuleTokenSpaceGuid.PcdEepromAddress|0x10 +# EEPROM GPIO Whitelist for MB3M (should think about shifting to SkuId specfic PCD to allow for other platforms). +# +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+--- +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ ---+---+---+---+---+---+---+---+---+---+---+ +#| SW_GPIO_206 | SW_GPIO_166 | SW_GPIO_167 | SW_GPIO_168 | SW_GPIO_169 | SW_GPIO_170 | SW_GPIO_171 | SW_GPIO_172 | SW_GPIO_173 | SW_GPIO_174 | SW_GPIO_175 | SW_GPIO_176 | SW_GPIO_177 | SW_GPIO_178 | SW_GPIO_186 | SW_GPIO_183 | SW_SMB_ALERTB | SW_SMB_CLK |
Re: [edk2] [PATCH] [edk2-platforms/devel-IntelAtomProcessorE3900] Shift EEPROM PEI files
Hi David, Yes this PCD information is board specific. That is why it is wrapped in a board specific define. I would move it into the board specific folder, but it is FixedAtBuild so it cannot go into the code. Did you want me to add a PcdsFixedAtBuild.dsc into the board specific folder and include it in the top level PcdsFixedAtBuild.dsc? + + !if $(MINNOW3_MODULE_BOARD) == TRUE +# +# I2C bus the master EEPROM is hanging on +gPlatformModuleTokenSpaceGuid.PcdEepromBus|0x08 +# 7-bit address of the master EEPROM +gPlatformModuleTokenSpaceGuid.PcdEepromAddress|0x10 +# EEPROM GPIO Whitelist for MB3M (should think about shifting to SkuId specfic PCD to allow for other platforms). +# +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+--- +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ ---+---+---+---+---+---+---+---+---+---+---+ +#| SW_GPIO_206 | SW_GPIO_166 | SW_GPIO_167 | SW_GPIO_168 | SW_GPIO_169 | SW_GPIO_170 | SW_GPIO_171 | SW_GPIO_172 | SW_GPIO_173 | SW_GPIO_174 | SW_GPIO_175 | SW_GPIO_176 | SW_GPIO_177 | SW_GPIO_178 | SW_GPIO_186 | SW_GPIO_183 | SW_SMB_ALERTB | SW_SMB_CLK | SW_SMB_DATA | NW_GPIO_193 | NW_GPIO_196 | NW_GPIO_197 | NW_GPIO_198 | NW_GPIO_199 | NW_GPIO_200 | NW_GPIO_203 | NW_GPIO_204 | NW_PMC_SPI_FS1 | NW_GPIO_84 | NW_GPIO_84 | NW_GPIO_85 | NW_GPIO_86 | NW_GPIO_87 | NW_GPIO_88 | NW_GPIO_97 | NW_GPIO_98 | NW_GPIO_99 | NW_GPIO_100 | NW_GPIO_103 | NW_GPIO_104 | NW_GPIO_105 | NW_GPIO_106 | NW_GPIO_109 | NW_GPIO_110 | NW_GPIO_112 | NW_GPIO_113 | N_GPIO_2| N_GPIO_3| N_GPIO_4| N_GPIO_6| N_GPIO_7| N_GPIO_13 | N_GPIO_14 | N_GPIO_21 | N_GPIO_22 | N_GPIO_23 | N_GPIO_24 | N_GPIO_25 | N_GPIO_26 | N_GPIO_38 | N_GPIO_39 | N_GPIO_40 | N_GPIO_41 | N_GPIO_42 | N_GPIO_43 | N_GPIO_46 | N_GPIO_47 | N_GPIO_48 | N_GPIO_49 | N_GPIO_64 | N_GPIO_65 |N_GPIO_66 |N_GPIO_67 | W_GPIO_126 | W_GPIO_127 | W_GPIO_132 | W_GPIO_133 | W_GPIO_134 | W_GPIO_135 | W_GPIO_136 | W_GPIO_137 |
Re: [edk2] [PATCH] [edk2-platforms/devel-IntelAtomProcessorE3900] Shift EEPROM PEI files
Reviewed-by: Mang Guo mailto:mang@intel.com>>
From: Steele, Kelly
Sent: Monday, September 24, 2018 9:29 PM
To: edk2-devel@lists.01.org
Cc: Wei, David; Guo, Mang
Subject: [PATCH] [edk2-platforms/devel-IntelAtomProcessorE3900] Shift EEPROM
PEI files
>From 1ae6e8934e17e0a0d20d169551d852cf3e8a1227 Mon Sep 17 00:00:00 2001
From: Kelly Steele
Date: Fri, 21 Sep 2018 11:14:02 -0700
Subject: [PATCH] [edk2-platforms/devel-IntelAtomProcessorE3900] Shift EEPROM
PEI files
Shifted the EEPROM PEI files into their own folders to help organize the
code better.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Kelly Steele
---
.../EepromBinary/Docs/HowtoCreateTheEepromBinary.pdf | Bin 307112 -> 0 bytes
.../Eeprom/EepromDataLib/EEPROM/{ => Pei}/HobDataPei.c | 0
.../Features/Eeprom/EepromDataLib/EepromDataLib.inf| 1 +
.../Features/Eeprom/EepromDataLib/EepromDataPeiLib.inf | 9 +
...promDataNullPeiLib.inf => EepromDataPeiNullLib.inf} | 2 +-
.../Eeprom/EepromDataLib/FV/{ => Pei}/GetImagePei.c| 0
.../Eeprom/EepromDataLib/Memory/{ => Pei}/HobDataPei.c | 0
.../EepromDataLib/{ => Pei}/MemoryAllocationPei.c | 2 ++
.../PlatformDsc/PcdsFixedAtBuild.dsc | 16
9 files changed, 21 insertions(+), 9 deletions(-)
delete mode 100644
Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromBinary/Docs/HowtoCreateTheEepromBinary.pdf
rename
Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EEPROM/{ =>
Pei}/HobDataPei.c (100%)
rename
Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/{EepromDataNullPeiLib.inf
=> EepromDataPeiNullLib.inf} (94%)
rename Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/FV/{ =>
Pei}/GetImagePei.c (100%)
rename
Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/Memory/{ =>
Pei}/HobDataPei.c (100%)
rename Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/{ =>
Pei}/MemoryAllocationPei.c (95%)
diff --git
a/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromBinary/Docs/HowtoCreateTheEepromBinary.pdf
b/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromBinary/Docs/HowtoCreateTheEepromBinary.pdf
deleted file mode 100644
index
84f6e594539fb8224493acd57ee41207cf0bee5e..
diff --git
a/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EEPROM/HobDataPei.c
b/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EEPROM/Pei/HobDataPei.c
similarity index 100%
rename from
Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EEPROM/HobDataPei.c
rename to
Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EEPROM/Pei/HobDataPei.c
diff --git
a/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataLib.inf
b/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataLib.inf
index 0ce2aaf9a6..a88d8fd1df 100644
---
a/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataLib.inf
+++
b/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataLib.inf
@@ -34,6 +34,7 @@
DebugLib
EepromPlatformLib
HobLib
+ I2cLib
MemoryAllocationLib
PcdLib
PrintLib
diff --git
a/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataPeiLib.inf
b/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataPeiLib.inf
index de14765a7b..9d7462194d 100644
---
a/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataPeiLib.inf
+++
b/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataPeiLib.inf
@@ -34,6 +34,7 @@
DebugLib
EepromPlatformLib
HobLib
+ I2cLib
PcdLib
PeiServicesLib
PrintLib
@@ -57,16 +58,16 @@
EepromDataLib.c
EepromDataLib.h
EepromDataLibConstructor.c
- MemoryAllocationPei.c
EEPROM/EepromDataEepromLib.c
EEPROM/EepromDataEepromLib.h
- EEPROM/HobDataPei.c
+ EEPROM/Pei/HobDataPei.c
FV/EepromDataFvLib.c
FV/EepromDataFvLib.h
- FV/GetImagePei.c
+ FV/Pei/GetImagePei.c
Memory/EepromDataMemoryLib.c
Memory/EepromDataMemoryLib.h
- Memory/HobDataPei.c
+ Memory/Pei/HobDataPei.c
Null/EepromDataNullLib.c
Null/EepromDataNullLib.h
+ Pei/MemoryAllocationPei.c
diff --git
a/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataNullPeiLib.inf
b/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataPeiNullLib.inf
similarity index 94%
rename from
Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataNullPeiLib.inf
rename to
Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataPeiNullLib.inf
index 456d75dbb0..48e2b8f5ea 100644
---
a/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataNullPeiLib.inf
+++
b/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataPeiNullLib.inf
@@ -40,7 +40,7 @@
EepromDataLib.c
[edk2] [PATCH] [edk2-platforms/devel-IntelAtomProcessorE3900] Shift EEPROM PEI files
Reviewed-by: Mang Guo mailto:mang@intel.com>>
From: Steele, Kelly
Sent: Monday, September 24, 2018 9:29 PM
To: edk2-devel@lists.01.org
Cc: Wei, David; Guo, Mang
Subject: [PATCH] [edk2-platforms/devel-IntelAtomProcessorE3900] Shift EEPROM
PEI files
>From 1ae6e8934e17e0a0d20d169551d852cf3e8a1227 Mon Sep 17 00:00:00 2001
From: Kelly Steele
Date: Fri, 21 Sep 2018 11:14:02 -0700
Subject: [PATCH] [edk2-platforms/devel-IntelAtomProcessorE3900] Shift EEPROM
PEI files
Shifted the EEPROM PEI files into their own folders to help organize the
code better.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Kelly Steele
---
.../EepromBinary/Docs/HowtoCreateTheEepromBinary.pdf | Bin 307112 -> 0 bytes
.../Eeprom/EepromDataLib/EEPROM/{ => Pei}/HobDataPei.c | 0
.../Features/Eeprom/EepromDataLib/EepromDataLib.inf| 1 +
.../Features/Eeprom/EepromDataLib/EepromDataPeiLib.inf | 9 +
...promDataNullPeiLib.inf => EepromDataPeiNullLib.inf} | 2 +-
.../Eeprom/EepromDataLib/FV/{ => Pei}/GetImagePei.c| 0
.../Eeprom/EepromDataLib/Memory/{ => Pei}/HobDataPei.c | 0
.../EepromDataLib/{ => Pei}/MemoryAllocationPei.c | 2 ++
.../PlatformDsc/PcdsFixedAtBuild.dsc | 16
9 files changed, 21 insertions(+), 9 deletions(-)
delete mode 100644
Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromBinary/Docs/HowtoCreateTheEepromBinary.pdf
rename
Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EEPROM/{ =>
Pei}/HobDataPei.c (100%)
rename
Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/{EepromDataNullPeiLib.inf
=> EepromDataPeiNullLib.inf} (94%)
rename Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/FV/{ =>
Pei}/GetImagePei.c (100%)
rename
Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/Memory/{ =>
Pei}/HobDataPei.c (100%)
rename Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/{ =>
Pei}/MemoryAllocationPei.c (95%)
diff --git
a/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromBinary/Docs/HowtoCreateTheEepromBinary.pdf
b/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromBinary/Docs/HowtoCreateTheEepromBinary.pdf
deleted file mode 100644
index
84f6e594539fb8224493acd57ee41207cf0bee5e..
diff --git
a/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EEPROM/HobDataPei.c
b/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EEPROM/Pei/HobDataPei.c
similarity index 100%
rename from
Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EEPROM/HobDataPei.c
rename to
Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EEPROM/Pei/HobDataPei.c
diff --git
a/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataLib.inf
b/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataLib.inf
index 0ce2aaf9a6..a88d8fd1df 100644
---
a/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataLib.inf
+++
b/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataLib.inf
@@ -34,6 +34,7 @@
DebugLib
EepromPlatformLib
HobLib
+ I2cLib
MemoryAllocationLib
PcdLib
PrintLib
diff --git
a/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataPeiLib.inf
b/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataPeiLib.inf
index de14765a7b..9d7462194d 100644
---
a/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataPeiLib.inf
+++
b/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataPeiLib.inf
@@ -34,6 +34,7 @@
DebugLib
EepromPlatformLib
HobLib
+ I2cLib
PcdLib
PeiServicesLib
PrintLib
@@ -57,16 +58,16 @@
EepromDataLib.c
EepromDataLib.h
EepromDataLibConstructor.c
- MemoryAllocationPei.c
EEPROM/EepromDataEepromLib.c
EEPROM/EepromDataEepromLib.h
- EEPROM/HobDataPei.c
+ EEPROM/Pei/HobDataPei.c
FV/EepromDataFvLib.c
FV/EepromDataFvLib.h
- FV/GetImagePei.c
+ FV/Pei/GetImagePei.c
Memory/EepromDataMemoryLib.c
Memory/EepromDataMemoryLib.h
- Memory/HobDataPei.c
+ Memory/Pei/HobDataPei.c
Null/EepromDataNullLib.c
Null/EepromDataNullLib.h
+ Pei/MemoryAllocationPei.c
diff --git
a/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataNullPeiLib.inf
b/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataPeiNullLib.inf
similarity index 94%
rename from
Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataNullPeiLib.inf
rename to
Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataPeiNullLib.inf
index 456d75dbb0..48e2b8f5ea 100644
---
a/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataNullPeiLib.inf
+++
b/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataPeiNullLib.inf
@@ -40,7 +40,7 @@
EepromDataLib.c
[edk2] [PATCH] [edk2-platforms/devel-IntelAtomProcessorE3900] Shift EEPROM PEI files
>From 1ae6e8934e17e0a0d20d169551d852cf3e8a1227 Mon Sep 17 00:00:00 2001
From: Kelly Steele
Date: Fri, 21 Sep 2018 11:14:02 -0700
Subject: [PATCH] [edk2-platforms/devel-IntelAtomProcessorE3900] Shift EEPROM
PEI files
Shifted the EEPROM PEI files into their own folders to help organize the
code better.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Kelly Steele
---
.../EepromBinary/Docs/HowtoCreateTheEepromBinary.pdf | Bin 307112 -> 0 bytes
.../Eeprom/EepromDataLib/EEPROM/{ => Pei}/HobDataPei.c | 0
.../Features/Eeprom/EepromDataLib/EepromDataLib.inf| 1 +
.../Features/Eeprom/EepromDataLib/EepromDataPeiLib.inf | 9 +
...promDataNullPeiLib.inf => EepromDataPeiNullLib.inf} | 2 +-
.../Eeprom/EepromDataLib/FV/{ => Pei}/GetImagePei.c| 0
.../Eeprom/EepromDataLib/Memory/{ => Pei}/HobDataPei.c | 0
.../EepromDataLib/{ => Pei}/MemoryAllocationPei.c | 2 ++
.../PlatformDsc/PcdsFixedAtBuild.dsc | 16
9 files changed, 21 insertions(+), 9 deletions(-)
delete mode 100644
Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromBinary/Docs/HowtoCreateTheEepromBinary.pdf
rename
Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EEPROM/{ =>
Pei}/HobDataPei.c (100%)
rename
Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/{EepromDataNullPeiLib.inf
=> EepromDataPeiNullLib.inf} (94%)
rename Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/FV/{ =>
Pei}/GetImagePei.c (100%)
rename
Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/Memory/{ =>
Pei}/HobDataPei.c (100%)
rename Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/{ =>
Pei}/MemoryAllocationPei.c (95%)
diff --git
a/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromBinary/Docs/HowtoCreateTheEepromBinary.pdf
b/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromBinary/Docs/HowtoCreateTheEepromBinary.pdf
deleted file mode 100644
index
84f6e594539fb8224493acd57ee41207cf0bee5e..
diff --git
a/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EEPROM/HobDataPei.c
b/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EEPROM/Pei/HobDataPei.c
similarity index 100%
rename from
Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EEPROM/HobDataPei.c
rename to
Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EEPROM/Pei/HobDataPei.c
diff --git
a/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataLib.inf
b/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataLib.inf
index 0ce2aaf9a6..a88d8fd1df 100644
---
a/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataLib.inf
+++
b/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataLib.inf
@@ -34,6 +34,7 @@
DebugLib
EepromPlatformLib
HobLib
+ I2cLib
MemoryAllocationLib
PcdLib
PrintLib
diff --git
a/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataPeiLib.inf
b/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataPeiLib.inf
index de14765a7b..9d7462194d 100644
---
a/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataPeiLib.inf
+++
b/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataPeiLib.inf
@@ -34,6 +34,7 @@
DebugLib
EepromPlatformLib
HobLib
+ I2cLib
PcdLib
PeiServicesLib
PrintLib
@@ -57,16 +58,16 @@
EepromDataLib.c
EepromDataLib.h
EepromDataLibConstructor.c
- MemoryAllocationPei.c
EEPROM/EepromDataEepromLib.c
EEPROM/EepromDataEepromLib.h
- EEPROM/HobDataPei.c
+ EEPROM/Pei/HobDataPei.c
FV/EepromDataFvLib.c
FV/EepromDataFvLib.h
- FV/GetImagePei.c
+ FV/Pei/GetImagePei.c
Memory/EepromDataMemoryLib.c
Memory/EepromDataMemoryLib.h
- Memory/HobDataPei.c
+ Memory/Pei/HobDataPei.c
Null/EepromDataNullLib.c
Null/EepromDataNullLib.h
+ Pei/MemoryAllocationPei.c
diff --git
a/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataNullPeiLib.inf
b/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataPeiNullLib.inf
similarity index 94%
rename from
Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataNullPeiLib.inf
rename to
Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataPeiNullLib.inf
index 456d75dbb0..48e2b8f5ea 100644
---
a/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataNullPeiLib.inf
+++
b/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/EepromDataPeiNullLib.inf
@@ -40,7 +40,7 @@
EepromDataLib.c
EepromDataLib.h
EepromDataNullLibConstructor.c
- MemoryAllocationPei.c
Null/EepromDataNullLib.c
Null/EepromDataNullLib.h
+ Pei/MemoryAllocationPei.c
diff --git
a/Platform/BroxtonPlatformPkg/Common/Features/Eeprom/EepromDataLib/FV/GetImagePei.c
