AGESA f16kb vendorcode: Split to Makefile.inc files

Change-Id: Id3d9a365469f7d73788cad4095ec3495fc9baf3b
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/21263
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>

83 files changed, 406 insertions, 407 deletions

diff --git a/src/vendorcode/amd/agesa/f16kb/Legacy/Proc/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Legacy/Proc/Makefile.inc
new file mode 100644
index 0000000000..80cdf12a7d
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Legacy/Proc/Makefile.inc
@@ -0,0 +1,3 @@
+libagesa-y += Dispatcher.c
+libagesa-y += agesaCallouts.c
+libagesa-y += hobTransfer.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Makefile.inc
index d981905ad0..981166fc73 100644
--- a/src/vendorcode/amd/agesa/f16kb/Makefile.inc
+++ b/src/vendorcode/amd/agesa/f16kb/Makefile.inc
@@ -88,413 +88,8 @@ CPPFLAGS_x86_64 += $(AGESA_INC)
 
 #######################################################################
 
-
-
-libagesa-y += Legacy/Proc/agesaCallouts.c
-libagesa-y += Legacy/Proc/Dispatcher.c
-libagesa-y += Legacy/Proc/hobTransfer.c
-libagesa-y += Proc/Common/AmdInitEarly.c
-libagesa-y += Proc/Common/AmdInitEnv.c
-libagesa-y += Proc/Common/AmdInitLate.c
-libagesa-y += Proc/Common/AmdInitMid.c
-libagesa-y += Proc/Common/AmdInitPost.c
-libagesa-y += Proc/Common/AmdInitReset.c
-libagesa-y += Proc/Common/AmdInitResume.c
-libagesa-y += Proc/Common/AmdLateRunApTask.c
-libagesa-y += Proc/Common/AmdS3LateRestore.c
-libagesa-y += Proc/Common/AmdS3Save.c
-libagesa-y += Proc/Common/CommonInits.c
-libagesa-y += Proc/Common/CommonReturns.c
-libagesa-y += Proc/Common/CreateStruct.c
-libagesa-y += Proc/Common/S3RestoreState.c
-libagesa-y += Proc/Common/S3SaveState.c
-libagesa-y += Proc/CPU/cahaltasm.S
-libagesa-y += Proc/CPU/cahalt.c
-libagesa-y += Proc/CPU/cpuApicUtilities.c
-libagesa-y += Proc/CPU/cpuBist.c
-libagesa-y += Proc/CPU/cpuEarlyInit.c
-libagesa-y += Proc/CPU/cpuEventLog.c
-libagesa-y += Proc/CPU/cpuFamilyTranslation.c
-libagesa-y += Proc/CPU/cpuGeneralServices.c
-libagesa-y += Proc/CPU/cpuLateInit.c
-libagesa-y += Proc/CPU/cpuMicrocodePatch.c
-libagesa-y += Proc/CPU/cpuPostInit.c
-libagesa-y += Proc/CPU/cpuPowerMgmt.c
-libagesa-y += Proc/CPU/cpuPowerMgmtSingleSocket.c
-libagesa-y += Proc/CPU/cpuWarmReset.c
-libagesa-y += Proc/CPU/Family/0x16/cpuF16Apm.c
-libagesa-y += Proc/CPU/Family/0x16/cpuF16BrandId.c
-libagesa-y += Proc/CPU/Family/0x16/cpuF16CacheDefaults.c
-libagesa-y += Proc/CPU/Family/0x16/cpuF16Dmi.c
-libagesa-y += Proc/CPU/Family/0x16/cpuF16MmioMap.c
-libagesa-y += Proc/CPU/Family/0x16/cpuF16MsrUnknownTables.c
-libagesa-y += Proc/CPU/Family/0x16/cpuF16PciUnknownTables.c
-libagesa-y += Proc/CPU/Family/0x16/cpuF16Utilities.c
-libagesa-y += Proc/CPU/Family/0x16/cpuF16WheaInitDataTables.c
-libagesa-y += Proc/CPU/Family/0x16/KB/F16KbC6State.c
-libagesa-y += Proc/CPU/Family/0x16/KB/F16KbCacheFlushOnHalt.c
-libagesa-y += Proc/CPU/Family/0x16/KB/F16KbCoreAfterReset.c
-libagesa-y += Proc/CPU/Family/0x16/KB/F16KbCpb.c
-libagesa-y += Proc/CPU/Family/0x16/KB/F16KbDmi.c
-libagesa-y += Proc/CPU/Family/0x16/KB/F16KbEquivalenceTable.c
-libagesa-y += Proc/CPU/Family/0x16/KB/F16KbHtc.c
-libagesa-y += Proc/CPU/Family/0x16/KB/F16KbInitEarlyTable.c
-libagesa-y += Proc/CPU/Family/0x16/KB/F16KbIoCstate.c
-libagesa-y += Proc/CPU/Family/0x16/KB/F16KbLogicalIdTables.c
-libagesa-y += Proc/CPU/Family/0x16/KB/F16KbId7001MicrocodePatch.c
-libagesa-y += Proc/CPU/Family/0x16/KB/F16KbMicrocodePatchTables.c
-libagesa-y += Proc/CPU/Family/0x16/KB/F16KbMsrTables.c
-libagesa-y += Proc/CPU/Family/0x16/KB/F16KbNbAfterReset.c
-libagesa-y += Proc/CPU/Family/0x16/KB/F16KbPciTables.c
-libagesa-y += Proc/CPU/Family/0x16/KB/F16KbPowerCheck.c
-libagesa-y += Proc/CPU/Family/0x16/KB/F16KbPowerMgmtSystemTables.c
-libagesa-y += Proc/CPU/Family/0x16/KB/F16KbPsi.c
-libagesa-y += Proc/CPU/Family/0x16/KB/F16KbPstate.c
-libagesa-y += Proc/CPU/Family/0x16/KB/F16KbSharedMsrTable.c
-libagesa-y += Proc/CPU/Family/0x16/KB/F16KbUtilities.c
-libagesa-y += Proc/CPU/Feature/cpuApm.c
-libagesa-y += Proc/CPU/Feature/cpuC6State.c
-libagesa-y += Proc/CPU/Feature/cpuCacheFlushOnHalt.c
-libagesa-y += Proc/CPU/Feature/cpuCacheInit.c
-libagesa-y += Proc/CPU/Feature/cpuCdit.c
-libagesa-y += Proc/CPU/Feature/cpuCoreLeveling.c
-libagesa-y += Proc/CPU/Feature/cpuCpb.c
-libagesa-y += Proc/CPU/Feature/cpuCrat.c
-libagesa-y += Proc/CPU/Feature/cpuDmi.c
-libagesa-y += Proc/CPU/Feature/cpuFeatureLeveling.c
-libagesa-y += Proc/CPU/Feature/cpuFeatures.c
-libagesa-y += Proc/CPU/Feature/cpuHtc.c
-libagesa-y += Proc/CPU/Feature/cpuIoCstate.c
-libagesa-y += Proc/CPU/Feature/cpuPsi.c
-libagesa-y += Proc/CPU/Feature/cpuPstateGather.c
-libagesa-y += Proc/CPU/Feature/cpuPstateLeveling.c
-libagesa-y += Proc/CPU/Feature/cpuPstateTables.c
-libagesa-y += Proc/CPU/Feature/cpuSlit.c
-libagesa-y += Proc/CPU/Feature/cpuSrat.c
-libagesa-y += Proc/CPU/Feature/cpuWhea.c
-libagesa-y += Proc/CPU/heapManager.c
-libagesa-y += Proc/CPU/S3.c
-libagesa-y += Proc/CPU/Table.c
-libagesa-y += Proc/GNB/Common/GnbLibFeatures.c
-libagesa-y += Proc/GNB/GnbInitAtEarly.c
-libagesa-y += Proc/GNB/GnbInitAtEnv.c
-libagesa-y += Proc/GNB/GnbInitAtLate.c
-libagesa-y += Proc/GNB/GnbInitAtMid.c
-libagesa-y += Proc/GNB/GnbInitAtPost.c
-libagesa-y += Proc/GNB/GnbInitAtReset.c
-libagesa-y += Proc/GNB/GnbInitAtS3Save.c
-libagesa-y += Proc/GNB/Modules/GnbCommonLib/GnbLib.c
-libagesa-y += Proc/GNB/Modules/GnbCommonLib/GnbLibCpuAcc.c
-libagesa-y += Proc/GNB/Modules/GnbCommonLib/GnbLibHeap.c
-libagesa-y += Proc/GNB/Modules/GnbCommonLib/GnbLibIoAcc.c
-libagesa-y += Proc/GNB/Modules/GnbCommonLib/GnbLibMemAcc.c
-libagesa-y += Proc/GNB/Modules/GnbCommonLib/GnbLibPciAcc.c
-libagesa-y += Proc/GNB/Modules/GnbCommonLib/GnbLibPci.c
-libagesa-y += Proc/GNB/Modules/GnbCommonLib/GnbTimerLib.c
-libagesa-y += Proc/GNB/Modules/GnbFamTranslation/GnbPcieTranslation.c
-libagesa-y += Proc/GNB/Modules/GnbFamTranslation/GnbTranslation.c
-libagesa-y += Proc/GNB/Modules/GnbGfxConfig/GfxConfigEnv.c
-libagesa-y += Proc/GNB/Modules/GnbGfxConfig/GfxConfigLib.c
-libagesa-y += Proc/GNB/Modules/GnbGfxConfig/GfxConfigMid.c
-libagesa-y += Proc/GNB/Modules/GnbGfxConfig/GfxConfigPost.c
-libagesa-y += Proc/GNB/Modules/GnbGfxInitLibV1/GfxCardInfo.c
-libagesa-y += Proc/GNB/Modules/GnbGfxInitLibV1/GfxEnumConnectors.c
-libagesa-y += Proc/GNB/Modules/GnbGfxInitLibV1/GnbGfxInitLibV1.c
-libagesa-y += Proc/GNB/Modules/GnbGfxIntTableV3/GfxIntegratedInfoTable.c
-libagesa-y += Proc/GNB/Modules/GnbGfxIntTableV3/GfxLibV3.c
-libagesa-y += Proc/GNB/Modules/GnbGfxIntTableV3/GfxPwrPlayTable.c
-libagesa-y += Proc/GNB/Modules/GnbInitKB/AlibKB.c
-libagesa-y += Proc/GNB/Modules/GnbInitKB/GfxEnvInitKB.c
-libagesa-y += Proc/GNB/Modules/GnbInitKB/GfxGmcInitKB.c
-libagesa-y += Proc/GNB/Modules/GnbInitKB/GfxIntegratedInfoTableKB.c
-libagesa-y += Proc/GNB/Modules/GnbInitKB/GfxIntegratedInfoTableKB.c
-libagesa-y += Proc/GNB/Modules/GnbInitKB/GfxLibKB.c
-libagesa-y += Proc/GNB/Modules/GnbInitKB/GfxMidInitKB.c
-libagesa-y += Proc/GNB/Modules/GnbInitKB/GfxPostInitKB.c
-libagesa-y += Proc/GNB/Modules/GnbInitKB/GfxSamuInitKB.c
-libagesa-y += Proc/GNB/Modules/GnbInitKB/GfxTablesKB.c
-libagesa-y += Proc/GNB/Modules/GnbInitKB/GnbEarlyInitKB.c
-libagesa-y += Proc/GNB/Modules/GnbInitKB/GnbEnvInitKB.c
-libagesa-y += Proc/GNB/Modules/GnbInitKB/GnbF1TableKB.c
-libagesa-y += Proc/GNB/Modules/GnbInitKB/GnbIommuTablesKB.c
-libagesa-y += Proc/GNB/Modules/GnbInitKB/GnbMidInitKB.c
-libagesa-y += Proc/GNB/Modules/GnbInitKB/GnbPostInitKB.c
-libagesa-y += Proc/GNB/Modules/GnbInitKB/GnbRegisterAccKB.c
-libagesa-y += Proc/GNB/Modules/GnbInitKB/GnbTablesKB.c
-libagesa-y += Proc/GNB/Modules/GnbInitKB/GnbUraKB.c
-libagesa-y += Proc/GNB/Modules/GnbInitKB/GnbUraKB.c
-libagesa-y += Proc/GNB/Modules/GnbInitKB/GnbUraTokenMapKB.c
-libagesa-y += Proc/GNB/Modules/GnbInitKB/PcieComplexDataKB.c
-libagesa-y += Proc/GNB/Modules/GnbInitKB/PcieConfigKB.c
-libagesa-y += Proc/GNB/Modules/GnbInitKB/PcieEarlyInitKB.c
-libagesa-y += Proc/GNB/Modules/GnbInitKB/PcieEnvInitKB.c
-libagesa-y += Proc/GNB/Modules/GnbInitKB/PcieLibKB.c
-libagesa-y += Proc/GNB/Modules/GnbInitKB/PcieMidInitKB.c
-libagesa-y += Proc/GNB/Modules/GnbInitKB/PciePostInitKB.c
-libagesa-y += Proc/GNB/Modules/GnbInitKB/PcieTablesKB.c
-libagesa-y += Proc/GNB/Modules/GnbIoapic/GnbIoapic.c
-libagesa-y += Proc/GNB/Modules/GnbNbInitLibV4/GnbNbInitLibV4.c
-libagesa-y += Proc/GNB/Modules/GnbNbInitLibV5/GnbNbInitLibV5.c
-libagesa-y += Proc/GNB/Modules/GnbPcieAlibV2/PcieAlibV2.c
-libagesa-y += Proc/GNB/Modules/GnbPcieAspm/PcieAspm.c
-libagesa-y += Proc/GNB/Modules/GnbPcieClkPm/PcieClkPm.c
-libagesa-y += Proc/GNB/Modules/GnbPcieConfig/GnbHandleLib.c
-libagesa-y += Proc/GNB/Modules/GnbPcieConfig/PcieConfigData.c
-libagesa-y += Proc/GNB/Modules/GnbPcieConfig/PcieConfigLib.c
-libagesa-y += Proc/GNB/Modules/GnbPcieConfig/PcieInputParser.c
-libagesa-y += Proc/GNB/Modules/GnbPcieConfig/PcieMapTopology.c
-libagesa-y += Proc/GNB/Modules/GnbPcieInitLibV1/PcieAspmBlackList.c
-libagesa-y += Proc/GNB/Modules/GnbPcieInitLibV1/PciePifServices.c
-libagesa-y += Proc/GNB/Modules/GnbPcieInitLibV1/PciePortRegAcc.c
-libagesa-y += Proc/GNB/Modules/GnbPcieInitLibV1/PciePortServices.c
-libagesa-y += Proc/GNB/Modules/GnbPcieInitLibV1/PcieTimer.c
-libagesa-y += Proc/GNB/Modules/GnbPcieInitLibV1/PcieTopologyServices.c
-libagesa-y += Proc/GNB/Modules/GnbPcieInitLibV1/PcieUtilityLib.c
-libagesa-y += Proc/GNB/Modules/GnbPcieInitLibV1/PcieWrapperRegAcc.c
-libagesa-y += Proc/GNB/Modules/GnbPcieInitLibV4/PciePortServicesV4.c
-libagesa-y += Proc/GNB/Modules/GnbPcieInitLibV4/PcieWrapperServicesV4.c
-libagesa-y += Proc/GNB/Modules/GnbPcieInitLibV5/PciePhyServicesV5.c
-libagesa-y += Proc/GNB/Modules/GnbPcieInitLibV5/PciePifServicesV5.c
-libagesa-y += Proc/GNB/Modules/GnbPcieInitLibV5/PciePortServicesV5.c
-libagesa-y += Proc/GNB/Modules/GnbPcieInitLibV5/PcieSiliconServicesV5.c
-libagesa-y += Proc/GNB/Modules/GnbPcieInitLibV5/PcieTopologyServicesV5.c
-libagesa-y += Proc/GNB/Modules/GnbPcieInitLibV5/PcieWrapperServicesV5.c
-libagesa-y += Proc/GNB/Modules/GnbPcieMaxPayload/PcieMaxPayload.c
-libagesa-y += Proc/GNB/Modules/GnbPcieTrainingV2/PcieTrainingV2.c
-libagesa-y += Proc/GNB/Modules/GnbPcieTrainingV2/PcieWorkaroundsV2.c
-libagesa-y += Proc/GNB/Modules/GnbSbLib/GnbSbLib.c
-libagesa-y += Proc/GNB/Modules/GnbSbLib/GnbSbPcie.c
-libagesa-y += Proc/GNB/Modules/GnbScsLibV1/GnbScsLibV1.c
-libagesa-y += Proc/GNB/Modules/GnbSmuLibV7/GnbSmuInitLibV7.c
-libagesa-y += Proc/GNB/Modules/GnbSSocketLib/GnbSSocketLib.c
-libagesa-y += Proc/GNB/Modules/GnbSview/GnbSview.c
-libagesa-y += Proc/GNB/Modules/GnbTable/GnbTable.c
-libagesa-y += Proc/GNB/Modules/GnbUraLibV1/GnbUraLibV1.c
-libagesa-y += Proc/HT/Fam16/htNbFam16.c
-libagesa-y += Proc/HT/Fam16/htNbUtilitiesFam16.c
-libagesa-y += Proc/HT/htFeat.c
-libagesa-y += Proc/HT/htInterface.c
-libagesa-y += Proc/HT/htInterfaceCoherent.c
-libagesa-y += Proc/HT/htInterfaceGeneral.c
-libagesa-y += Proc/HT/htInterfaceNonCoherent.c
-libagesa-y += Proc/HT/htMain.c
-libagesa-y += Proc/HT/htNb.c
-libagesa-y += Proc/HT/htNotify.c
-libagesa-y += Proc/IDS/Debug/IdsDebug.c
-libagesa-y += Proc/IDS/Debug/IdsDebugPrint.c
-libagesa-y += Proc/IDS/Debug/IdsDpHdtout.c
-libagesa-y += Proc/IDS/Debug/IdsDpSerial.c
-libagesa-y += Proc/IDS/Family/0x16/KB/IdsF16KbAllService.c
-libagesa-y += Proc/IDS/Library/IdsLib.c
-libagesa-y += Proc/Mem/Ardk/ma.c
-libagesa-y += Proc/Mem/Feat/CSINTLV/mfcsi.c
-libagesa-y += Proc/Mem/Feat/DMI/mfDMI.c
-libagesa-y += Proc/Mem/Feat/ECC/mfecc.c
-libagesa-y += Proc/Mem/Feat/ECC/mfemp.c
-libagesa-y += Proc/Mem/Feat/EXCLUDIMM/mfdimmexclud.c
-libagesa-y += Proc/Mem/Feat/IDENDIMM/mfidendimm.c
-libagesa-y += Proc/Mem/Feat/LVDDR3/mflvddr3.c
-libagesa-y += Proc/Mem/Feat/MEMCLR/mfmemclr.c
-libagesa-y += Proc/Mem/Feat/ODTHERMAL/mfodthermal.c
-libagesa-y += Proc/Mem/Feat/PARTRN/mfParallelTraining.c
-libagesa-y += Proc/Mem/Feat/PARTRN/mfStandardTraining.c
-libagesa-y += Proc/Mem/Feat/RDWR2DTRAINING/KB/mfRdWr2DKb.c
-libagesa-y += Proc/Mem/Feat/RDWR2DTRAINING/mfRdDqs2DTraining.c
-libagesa-y += Proc/Mem/Feat/RDWR2DTRAINING/mfRdWr2DEyeRimSearch.c
-libagesa-y += Proc/Mem/Feat/RDWR2DTRAINING/mfRdWr2DPatternGeneration.c
-libagesa-y += Proc/Mem/Feat/RDWR2DTRAINING/mfRdWr2DTraining.c
-libagesa-y += Proc/Mem/Feat/S3/mfs3.c
-libagesa-y += Proc/Mem/Feat/TABLE/mftds.c
-libagesa-y += Proc/Mem/Main/KB/mmflowkb.c
-libagesa-y += Proc/Mem/Main/mdef.c
-libagesa-y += Proc/Mem/Main/merrhdl.c
-libagesa-y += Proc/Mem/Main/minit.c
-libagesa-y += Proc/Mem/Main/mm.c
-libagesa-y += Proc/Mem/Main/mmConditionalPso.c
-libagesa-y += Proc/Mem/Main/mmEcc.c
-libagesa-y += Proc/Mem/Main/mmExcludeDimm.c
-libagesa-y += Proc/Mem/Main/mmflow.c
-libagesa-y += Proc/Mem/Main/mmLvDdr3.c
-libagesa-y += Proc/Mem/Main/mmMemClr.c
-libagesa-y += Proc/Mem/Main/mmMemRestore.c
-libagesa-y += Proc/Mem/Main/mmNodeInterleave.c
-libagesa-y += Proc/Mem/Main/mmOnlineSpare.c
-libagesa-y += Proc/Mem/Main/mmParallelTraining.c
-libagesa-y += Proc/Mem/Main/mmStandardTraining.c
-libagesa-y += Proc/Mem/Main/mmUmaAlloc.c
-libagesa-y += Proc/Mem/Main/mu.c
-libagesa-y += Proc/Mem/Main/muc.c
-libagesa-y += Proc/Mem/NB/KB/mndctkb.c
-libagesa-y += Proc/Mem/NB/KB/mnflowkb.c
-libagesa-y += Proc/Mem/NB/KB/mnidendimmkb.c
-libagesa-y += Proc/Mem/NB/KB/mnkb.c
-libagesa-y += Proc/Mem/NB/KB/mnmctkb.c
-libagesa-y += Proc/Mem/NB/KB/mnotkb.c
-libagesa-y += Proc/Mem/NB/KB/mnphykb.c
-libagesa-y += Proc/Mem/NB/KB/mnregkb.c
-libagesa-y += Proc/Mem/NB/KB/mns3kb.c
-libagesa-y += Proc/Mem/NB/mn.c
-libagesa-y += Proc/Mem/NB/mndct.c
-libagesa-y += Proc/Mem/NB/mnfeat.c
-libagesa-y += Proc/Mem/NB/mnflow.c
-libagesa-y += Proc/Mem/NB/mnmct.c
-libagesa-y += Proc/Mem/NB/mnphy.c
-libagesa-y += Proc/Mem/NB/mnreg.c
-libagesa-y += Proc/Mem/NB/mnS3.c
-libagesa-y += Proc/Mem/NB/mntrain3.c
-libagesa-y += Proc/Mem/Ps/KB/FT3/mpSkbft3.c
-libagesa-y += Proc/Mem/Ps/KB/mpkb3.c
-libagesa-y += Proc/Mem/Ps/KB/mpSkb3.c
-libagesa-y += Proc/Mem/Ps/KB/mpUkb3.c
-libagesa-y += Proc/Mem/Ps/mp.c
-libagesa-y += Proc/Mem/Ps/mpmaxfreq.c
-libagesa-y += Proc/Mem/Ps/mpmr0.c
-libagesa-y += Proc/Mem/Ps/mpodtpat.c
-libagesa-y += Proc/Mem/Ps/mprtt.c
-libagesa-y += Proc/Mem/Ps/mps2d.c
-libagesa-y += Proc/Mem/Ps/mpsao.c
-libagesa-y += Proc/Mem/Tech/DDR3/mt3.c
-libagesa-y += Proc/Mem/Tech/DDR3/mtot3.c
-libagesa-y += Proc/Mem/Tech/DDR3/mtrci3.c
-libagesa-y += Proc/Mem/Tech/DDR3/mtsdi3.c
-libagesa-y += Proc/Mem/Tech/DDR3/mtspd3.c
-libagesa-y += Proc/Mem/Tech/DDR3/mttecc3.c
-libagesa-y += Proc/Mem/Tech/DDR3/mttwl3.c
-libagesa-y += Proc/Mem/Tech/mt.c
-libagesa-y += Proc/Mem/Tech/mthdi.c
-libagesa-y += Proc/Mem/Tech/mttdimbt.c
-libagesa-y += Proc/Mem/Tech/mttecc.c
-libagesa-y += Proc/Mem/Tech/mttEdgeDetect.c
-libagesa-y += Proc/Mem/Tech/mtthrc.c
-libagesa-y += Proc/Mem/Tech/mtthrcSeedTrain.c
-libagesa-y += Proc/Mem/Tech/mttml.c
-libagesa-y += Proc/Mem/Tech/mttoptsrc.c
-libagesa-y += Proc/Mem/Tech/mttRdDqs2DEyeRimSearch.c
-libagesa-y += Proc/Mem/Tech/mttRdDqs2DTraining.c
-libagesa-y += Proc/Mem/Tech/mttsrc.c
-
-libagesa-y += Proc/Fch/Azalia/AzaliaEnv.c
-libagesa-y += Proc/Fch/Azalia/AzaliaLate.c
-libagesa-y += Proc/Fch/Azalia/AzaliaMid.c
-libagesa-y += Proc/Fch/Azalia/AzaliaReset.c
-libagesa-y += Proc/Fch/Common/AcpiLib.c
-libagesa-y += Proc/Fch/Common/FchCommon.c
-libagesa-y += Proc/Fch/Common/FchLib.c
-libagesa-y += Proc/Fch/Common/FchPeLib.c
-libagesa-y += Proc/Fch/Common/MemLib.c
-libagesa-y += Proc/Fch/Common/PciLib.c
-libagesa-y += Proc/Fch/HwAcpi/Family/Yangtze/YangtzeHwAcpiEnvService.c
-libagesa-y += Proc/Fch/HwAcpi/Family/Yangtze/YangtzeHwAcpiLateService.c
-libagesa-y += Proc/Fch/HwAcpi/Family/Yangtze/YangtzeHwAcpiMidService.c
-libagesa-y += Proc/Fch/HwAcpi/Family/Yangtze/YangtzeSSService.c
-libagesa-y += Proc/Fch/HwAcpi/HwAcpiEnv.c
-libagesa-y += Proc/Fch/HwAcpi/HwAcpiLate.c
-libagesa-y += Proc/Fch/HwAcpi/HwAcpiMid.c
-libagesa-y += Proc/Fch/HwAcpi/HwAcpiReset.c
-libagesa-y += Proc/Fch/Hwm/Family/Yangtze/YangtzeHwmEnvService.c
-libagesa-y += Proc/Fch/Hwm/Family/Yangtze/YangtzeHwmLateService.c
-libagesa-y += Proc/Fch/Hwm/HwmLate.c
-libagesa-y += Proc/Fch/Ide/IdeEnv.c
-libagesa-y += Proc/Fch/Ide/IdeLate.c
-libagesa-y += Proc/Fch/Ide/IdeMid.c
-libagesa-y += Proc/Fch/Imc/Family/Yangtze/YangtzeImcService.c
-libagesa-y += Proc/Fch/Imc/FchEcEnv.c
-libagesa-y += Proc/Fch/Imc/FchEcLate.c
-libagesa-y += Proc/Fch/Imc/FchEcMid.c
-libagesa-y += Proc/Fch/Imc/ImcEnv.c
-libagesa-y += Proc/Fch/Imc/ImcLate.c
-libagesa-y += Proc/Fch/Imc/ImcLib.c
-libagesa-y += Proc/Fch/Imc/ImcMid.c
-libagesa-y += Proc/Fch/Imc/ImcReset.c
-libagesa-y += Proc/Fch/Interface/Family/Yangtze/EnvDefYangtze.c
-libagesa-y += Proc/Fch/Interface/Family/Yangtze/ResetDefYangtze.c
-libagesa-y += Proc/Fch/Interface/FchInitEnv.c
-libagesa-y += Proc/Fch/Interface/FchInitLate.c
-libagesa-y += Proc/Fch/Interface/FchInitMid.c
-libagesa-y += Proc/Fch/Interface/FchInitReset.c
-libagesa-y += Proc/Fch/Interface/FchInitS3.c
-libagesa-y += Proc/Fch/Interface/FchTaskLauncher.c
-libagesa-y += Proc/Fch/Interface/InitEnvDef.c
-libagesa-y += Proc/Fch/Interface/InitResetDef.c
-libagesa-y += Proc/Fch/Pcie/AbEnv.c
-libagesa-y += Proc/Fch/Pcie/AbLate.c
-libagesa-y += Proc/Fch/Pcie/AbMid.c
-libagesa-y += Proc/Fch/Pcie/AbReset.c
-libagesa-y += Proc/Fch/Pcie/Family/Yangtze/YangtzeAbEnvService.c
-libagesa-y += Proc/Fch/Pcie/Family/Yangtze/YangtzeAbResetService.c
-libagesa-y += Proc/Fch/Pcie/Family/Yangtze/YangtzeAbService.c
-libagesa-y += Proc/Fch/Pcie/PcieEnv.c
-libagesa-y += Proc/Fch/Pcie/PcieEnv.c
-libagesa-y += Proc/Fch/Pcie/PcieLate.c
-libagesa-y += Proc/Fch/Pcie/PcieMid.c
-libagesa-y += Proc/Fch/Pcie/PcieReset.c
-libagesa-y += Proc/Fch/Sata/AhciEnv.c
-libagesa-y += Proc/Fch/Sata/AhciLate.c
-libagesa-y += Proc/Fch/Sata/AhciLib.c
-libagesa-y += Proc/Fch/Sata/AhciMid.c
-libagesa-y += Proc/Fch/Sata/Family/Yangtze/YangtzeSataEnvService.c
-libagesa-y += Proc/Fch/Sata/Family/Yangtze/YangtzeSataResetService.c
-libagesa-y += Proc/Fch/Sata/Family/Yangtze/YangtzeSataService.c
-libagesa-y += Proc/Fch/Sata/Ide2AhciEnv.c
-libagesa-y += Proc/Fch/Sata/Ide2AhciLate.c
-libagesa-y += Proc/Fch/Sata/Ide2AhciLib.c
-libagesa-y += Proc/Fch/Sata/Ide2AhciMid.c
-libagesa-y += Proc/Fch/Sata/RaidEnv.c
-libagesa-y += Proc/Fch/Sata/RaidLate.c
-libagesa-y += Proc/Fch/Sata/RaidLib.c
-libagesa-y += Proc/Fch/Sata/RaidMid.c
-libagesa-y += Proc/Fch/Sata/SataEnv.c
-libagesa-y += Proc/Fch/Sata/SataEnvLib.c
-libagesa-y += Proc/Fch/Sata/SataIdeEnv.c
-libagesa-y += Proc/Fch/Sata/SataIdeLate.c
-libagesa-y += Proc/Fch/Sata/SataIdeLib.c
-libagesa-y += Proc/Fch/Sata/SataIdeMid.c
-libagesa-y += Proc/Fch/Sata/SataLate.c
-libagesa-y += Proc/Fch/Sata/SataLib.c
-libagesa-y += Proc/Fch/Sata/SataMid.c
-libagesa-y += Proc/Fch/Sata/SataReset.c
-libagesa-y += Proc/Fch/Sd/Family/Yangtze/YangtzeSdEnvService.c
-libagesa-y += Proc/Fch/Sd/Family/Yangtze/YangtzeSdResetService.c
-libagesa-y += Proc/Fch/Sd/Family/Yangtze/YangtzeSdService.c
-libagesa-y += Proc/Fch/Sd/SdEnv.c
-libagesa-y += Proc/Fch/Sd/SdLate.c
-libagesa-y += Proc/Fch/Sd/SdMid.c
-libagesa-y += Proc/Fch/Spi/Family/Yangtze/YangtzeLpcEnvService.c
-libagesa-y += Proc/Fch/Spi/Family/Yangtze/YangtzeLpcResetService.c
-libagesa-y += Proc/Fch/Spi/LpcEnv.c
-libagesa-y += Proc/Fch/Spi/LpcLate.c
-libagesa-y += Proc/Fch/Spi/LpcMid.c
-libagesa-y += Proc/Fch/Spi/LpcReset.c
-libagesa-y += Proc/Fch/Spi/SpiEnv.c
-libagesa-y += Proc/Fch/Spi/SpiLate.c
-libagesa-y += Proc/Fch/Spi/SpiMid.c
-libagesa-y += Proc/Fch/Spi/SpiReset.c
-libagesa-y += Proc/Fch/Usb/EhciEnv.c
-libagesa-y += Proc/Fch/Usb/EhciLate.c
-libagesa-y += Proc/Fch/Usb/EhciMid.c
-libagesa-y += Proc/Fch/Usb/EhciReset.c
-libagesa-y += Proc/Fch/Usb/Family/Yangtze/YangtzeEhciEnvService.c
-libagesa-y += Proc/Fch/Usb/Family/Yangtze/YangtzeEhciLateService.c
-libagesa-y += Proc/Fch/Usb/Family/Yangtze/YangtzeEhciMidService.c
-libagesa-y += Proc/Fch/Usb/Family/Yangtze/YangtzeOhciEnvService.c
-libagesa-y += Proc/Fch/Usb/Family/Yangtze/YangtzeOhciLateService.c
-libagesa-y += Proc/Fch/Usb/Family/Yangtze/YangtzeOhciMidService.c
-libagesa-y += Proc/Fch/Usb/Family/Yangtze/YangtzeXhciEnvService.c
-libagesa-y += Proc/Fch/Usb/Family/Yangtze/YangtzeXhciLateService.c
-libagesa-y += Proc/Fch/Usb/Family/Yangtze/YangtzeXhciMidService.c
-libagesa-y += Proc/Fch/Usb/Family/Yangtze/YangtzeXhciResetService.c
-libagesa-y += Proc/Fch/Usb/OhciEnv.c
-libagesa-y += Proc/Fch/Usb/OhciLate.c
-libagesa-y += Proc/Fch/Usb/OhciMid.c
-libagesa-y += Proc/Fch/Usb/OhciReset.c
-libagesa-y += Proc/Fch/Usb/UsbEnv.c
-libagesa-y += Proc/Fch/Usb/UsbLate.c
-libagesa-y += Proc/Fch/Usb/UsbMid.c
-libagesa-y += Proc/Fch/Usb/UsbReset.c
-libagesa-y += Proc/Fch/Usb/XhciEnv.c
-libagesa-y += Proc/Fch/Usb/XhciLate.c
-libagesa-y += Proc/Fch/Usb/XhciMid.c
-libagesa-y += Proc/Fch/Usb/XhciReset.c
+subdirs-y += Legacy/Proc
+subdirs-y += $(dir $(shell cd $(dir); find Proc -name Makefile.inc))
 
 $(obj)/libagesa.fam16kb.a: $$(libagesa-objs)
 	@printf "    AGESA        $(subst $(obj)/,,$(@))\n"
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/Makefile.inc
new file mode 100644
index 0000000000..89b9fc5b85
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/Makefile.inc
@@ -0,0 +1,21 @@
+libagesa-y += F16KbC6State.c
+libagesa-y += F16KbCacheFlushOnHalt.c
+libagesa-y += F16KbCoreAfterReset.c
+libagesa-y += F16KbCpb.c
+libagesa-y += F16KbDmi.c
+libagesa-y += F16KbEquivalenceTable.c
+libagesa-y += F16KbHtc.c
+libagesa-y += F16KbId7001MicrocodePatch.c
+libagesa-y += F16KbInitEarlyTable.c
+libagesa-y += F16KbIoCstate.c
+libagesa-y += F16KbLogicalIdTables.c
+libagesa-y += F16KbMicrocodePatchTables.c
+libagesa-y += F16KbMsrTables.c
+libagesa-y += F16KbNbAfterReset.c
+libagesa-y += F16KbPciTables.c
+libagesa-y += F16KbPowerCheck.c
+libagesa-y += F16KbPowerMgmtSystemTables.c
+libagesa-y += F16KbPsi.c
+libagesa-y += F16KbPstate.c
+libagesa-y += F16KbSharedMsrTable.c
+libagesa-y += F16KbUtilities.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/Makefile.inc
new file mode 100644
index 0000000000..5208d9ab0e
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/Makefile.inc
@@ -0,0 +1,9 @@
+libagesa-y += cpuF16Apm.c
+libagesa-y += cpuF16BrandId.c
+libagesa-y += cpuF16CacheDefaults.c
+libagesa-y += cpuF16Dmi.c
+libagesa-y += cpuF16MmioMap.c
+libagesa-y += cpuF16MsrUnknownTables.c
+libagesa-y += cpuF16PciUnknownTables.c
+libagesa-y += cpuF16Utilities.c
+libagesa-y += cpuF16WheaInitDataTables.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/Makefile.inc
new file mode 100644
index 0000000000..e389c9eefc
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Feature/Makefile.inc
@@ -0,0 +1,20 @@
+libagesa-y += cpuApm.c
+libagesa-y += cpuC6State.c
+libagesa-y += cpuCacheFlushOnHalt.c
+libagesa-y += cpuCacheInit.c
+libagesa-y += cpuCdit.c
+libagesa-y += cpuCoreLeveling.c
+libagesa-y += cpuCpb.c
+libagesa-y += cpuCrat.c
+libagesa-y += cpuDmi.c
+libagesa-y += cpuFeatureLeveling.c
+libagesa-y += cpuFeatures.c
+libagesa-y += cpuHtc.c
+libagesa-y += cpuIoCstate.c
+libagesa-y += cpuPsi.c
+libagesa-y += cpuPstateGather.c
+libagesa-y += cpuPstateLeveling.c
+libagesa-y += cpuPstateTables.c
+libagesa-y += cpuSlit.c
+libagesa-y += cpuSrat.c
+libagesa-y += cpuWhea.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Makefile.inc
new file mode 100644
index 0000000000..e60c7f2f48
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Makefile.inc
@@ -0,0 +1,17 @@
+libagesa-y += S3.c
+libagesa-y += Table.c
+libagesa-y += cahalt.c
+libagesa-y += cahaltasm.S
+libagesa-y += cpuApicUtilities.c
+libagesa-y += cpuBist.c
+libagesa-y += cpuEarlyInit.c
+libagesa-y += cpuEventLog.c
+libagesa-y += cpuFamilyTranslation.c
+libagesa-y += cpuGeneralServices.c
+libagesa-y += cpuLateInit.c
+libagesa-y += cpuMicrocodePatch.c
+libagesa-y += cpuPostInit.c
+libagesa-y += cpuPowerMgmt.c
+libagesa-y += cpuPowerMgmtSingleSocket.c
+libagesa-y += cpuWarmReset.c
+libagesa-y += heapManager.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Common/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Common/Makefile.inc
new file mode 100644
index 0000000000..957c98f639
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Common/Makefile.inc
@@ -0,0 +1,15 @@
+libagesa-y += AmdInitEarly.c
+libagesa-y += AmdInitEnv.c
+libagesa-y += AmdInitLate.c
+libagesa-y += AmdInitMid.c
+libagesa-y += AmdInitPost.c
+libagesa-y += AmdInitReset.c
+libagesa-y += AmdInitResume.c
+libagesa-y += AmdLateRunApTask.c
+libagesa-y += AmdS3LateRestore.c
+libagesa-y += AmdS3Save.c
+libagesa-y += CommonInits.c
+libagesa-y += CommonReturns.c
+libagesa-y += CreateStruct.c
+libagesa-y += S3RestoreState.c
+libagesa-y += S3SaveState.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Azalia/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Azalia/Makefile.inc
new file mode 100644
index 0000000000..d7af4ffb15
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Azalia/Makefile.inc
@@ -0,0 +1,4 @@
+libagesa-y += AzaliaEnv.c
+libagesa-y += AzaliaLate.c
+libagesa-y += AzaliaMid.c
+libagesa-y += AzaliaReset.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Common/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Common/Makefile.inc
new file mode 100644
index 0000000000..ffa00dadae
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Common/Makefile.inc
@@ -0,0 +1,6 @@
+libagesa-y += AcpiLib.c
+libagesa-y += FchCommon.c
+libagesa-y += FchLib.c
+libagesa-y += FchPeLib.c
+libagesa-y += MemLib.c
+libagesa-y += PciLib.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Fch/HwAcpi/Family/Yangtze/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/HwAcpi/Family/Yangtze/Makefile.inc
new file mode 100644
index 0000000000..f48af9b8de
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/HwAcpi/Family/Yangtze/Makefile.inc
@@ -0,0 +1,4 @@
+libagesa-y += YangtzeHwAcpiEnvService.c
+libagesa-y += YangtzeHwAcpiLateService.c
+libagesa-y += YangtzeHwAcpiMidService.c
+libagesa-y += YangtzeSSService.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Fch/HwAcpi/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/HwAcpi/Makefile.inc
new file mode 100644
index 0000000000..b30cc7862e
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/HwAcpi/Makefile.inc
@@ -0,0 +1,4 @@
+libagesa-y += HwAcpiEnv.c
+libagesa-y += HwAcpiLate.c
+libagesa-y += HwAcpiMid.c
+libagesa-y += HwAcpiReset.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Hwm/Family/Yangtze/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Hwm/Family/Yangtze/Makefile.inc
new file mode 100644
index 0000000000..c169e97ee2
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Hwm/Family/Yangtze/Makefile.inc
@@ -0,0 +1,2 @@
+libagesa-y += YangtzeHwmEnvService.c
+libagesa-y += YangtzeHwmLateService.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Hwm/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Hwm/Makefile.inc
new file mode 100644
index 0000000000..9e14856e0b
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Hwm/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += HwmLate.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Ide/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Ide/Makefile.inc
new file mode 100644
index 0000000000..561afd5ece
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Ide/Makefile.inc
@@ -0,0 +1,3 @@
+libagesa-y += IdeEnv.c
+libagesa-y += IdeLate.c
+libagesa-y += IdeMid.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Imc/Family/Yangtze/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Imc/Family/Yangtze/Makefile.inc
new file mode 100644
index 0000000000..9ddd3338a4
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Imc/Family/Yangtze/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += YangtzeImcService.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Imc/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Imc/Makefile.inc
new file mode 100644
index 0000000000..b2c49a9748
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Imc/Makefile.inc
@@ -0,0 +1,8 @@
+libagesa-y += FchEcEnv.c
+libagesa-y += FchEcLate.c
+libagesa-y += FchEcMid.c
+libagesa-y += ImcEnv.c
+libagesa-y += ImcLate.c
+libagesa-y += ImcLib.c
+libagesa-y += ImcMid.c
+libagesa-y += ImcReset.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Interface/Family/Yangtze/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Interface/Family/Yangtze/Makefile.inc
new file mode 100644
index 0000000000..58d762cea0
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Interface/Family/Yangtze/Makefile.inc
@@ -0,0 +1,2 @@
+libagesa-y += EnvDefYangtze.c
+libagesa-y += ResetDefYangtze.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Interface/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Interface/Makefile.inc
new file mode 100644
index 0000000000..cdfb60ba91
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Interface/Makefile.inc
@@ -0,0 +1,8 @@
+libagesa-y += FchInitEnv.c
+libagesa-y += FchInitLate.c
+libagesa-y += FchInitMid.c
+libagesa-y += FchInitReset.c
+libagesa-y += FchInitS3.c
+libagesa-y += FchTaskLauncher.c
+libagesa-y += InitEnvDef.c
+libagesa-y += InitResetDef.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Pcie/Family/Yangtze/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Pcie/Family/Yangtze/Makefile.inc
new file mode 100644
index 0000000000..1f47f7758d
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Pcie/Family/Yangtze/Makefile.inc
@@ -0,0 +1,3 @@
+libagesa-y += YangtzeAbEnvService.c
+libagesa-y += YangtzeAbResetService.c
+libagesa-y += YangtzeAbService.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Pcie/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Pcie/Makefile.inc
new file mode 100644
index 0000000000..b29db0a850
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Pcie/Makefile.inc
@@ -0,0 +1,9 @@
+libagesa-y += AbEnv.c
+libagesa-y += AbLate.c
+libagesa-y += AbMid.c
+libagesa-y += AbReset.c
+libagesa-y += PcieEnv.c
+libagesa-y += PcieEnv.c
+libagesa-y += PcieLate.c
+libagesa-y += PcieMid.c
+libagesa-y += PcieReset.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Sata/Family/Yangtze/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Sata/Family/Yangtze/Makefile.inc
new file mode 100644
index 0000000000..867045d487
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Sata/Family/Yangtze/Makefile.inc
@@ -0,0 +1,3 @@
+libagesa-y += YangtzeSataEnvService.c
+libagesa-y += YangtzeSataResetService.c
+libagesa-y += YangtzeSataService.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Sata/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Sata/Makefile.inc
new file mode 100644
index 0000000000..1855216616
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Sata/Makefile.inc
@@ -0,0 +1,22 @@
+libagesa-y += AhciEnv.c
+libagesa-y += AhciLate.c
+libagesa-y += AhciLib.c
+libagesa-y += AhciMid.c
+libagesa-y += Ide2AhciEnv.c
+libagesa-y += Ide2AhciLate.c
+libagesa-y += Ide2AhciLib.c
+libagesa-y += Ide2AhciMid.c
+libagesa-y += RaidEnv.c
+libagesa-y += RaidLate.c
+libagesa-y += RaidLib.c
+libagesa-y += RaidMid.c
+libagesa-y += SataEnv.c
+libagesa-y += SataEnvLib.c
+libagesa-y += SataIdeEnv.c
+libagesa-y += SataIdeLate.c
+libagesa-y += SataIdeLib.c
+libagesa-y += SataIdeMid.c
+libagesa-y += SataLate.c
+libagesa-y += SataLib.c
+libagesa-y += SataMid.c
+libagesa-y += SataReset.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Sd/Family/Yangtze/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Sd/Family/Yangtze/Makefile.inc
new file mode 100644
index 0000000000..5cfdbafceb
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Sd/Family/Yangtze/Makefile.inc
@@ -0,0 +1,3 @@
+libagesa-y += YangtzeSdEnvService.c
+libagesa-y += YangtzeSdResetService.c
+libagesa-y += YangtzeSdService.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Sd/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Sd/Makefile.inc
new file mode 100644
index 0000000000..bb72b4d150
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Sd/Makefile.inc
@@ -0,0 +1,3 @@
+libagesa-y += SdEnv.c
+libagesa-y += SdLate.c
+libagesa-y += SdMid.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Spi/Family/Yangtze/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Spi/Family/Yangtze/Makefile.inc
new file mode 100644
index 0000000000..9c56ac7dbb
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Spi/Family/Yangtze/Makefile.inc
@@ -0,0 +1,2 @@
+libagesa-y += YangtzeLpcEnvService.c
+libagesa-y += YangtzeLpcResetService.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Spi/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Spi/Makefile.inc
new file mode 100644
index 0000000000..191f922fe4
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Spi/Makefile.inc
@@ -0,0 +1,8 @@
+libagesa-y += LpcEnv.c
+libagesa-y += LpcLate.c
+libagesa-y += LpcMid.c
+libagesa-y += LpcReset.c
+libagesa-y += SpiEnv.c
+libagesa-y += SpiLate.c
+libagesa-y += SpiMid.c
+libagesa-y += SpiReset.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Usb/Family/Yangtze/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Usb/Family/Yangtze/Makefile.inc
new file mode 100644
index 0000000000..70223b628a
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Usb/Family/Yangtze/Makefile.inc
@@ -0,0 +1,10 @@
+libagesa-y += YangtzeEhciEnvService.c
+libagesa-y += YangtzeEhciLateService.c
+libagesa-y += YangtzeEhciMidService.c
+libagesa-y += YangtzeOhciEnvService.c
+libagesa-y += YangtzeOhciLateService.c
+libagesa-y += YangtzeOhciMidService.c
+libagesa-y += YangtzeXhciEnvService.c
+libagesa-y += YangtzeXhciLateService.c
+libagesa-y += YangtzeXhciMidService.c
+libagesa-y += YangtzeXhciResetService.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Usb/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Usb/Makefile.inc
new file mode 100644
index 0000000000..d1f1876d43
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Fch/Usb/Makefile.inc
@@ -0,0 +1,16 @@
+libagesa-y += EhciEnv.c
+libagesa-y += EhciLate.c
+libagesa-y += EhciMid.c
+libagesa-y += EhciReset.c
+libagesa-y += OhciEnv.c
+libagesa-y += OhciLate.c
+libagesa-y += OhciMid.c
+libagesa-y += OhciReset.c
+libagesa-y += UsbEnv.c
+libagesa-y += UsbLate.c
+libagesa-y += UsbMid.c
+libagesa-y += UsbReset.c
+libagesa-y += XhciEnv.c
+libagesa-y += XhciLate.c
+libagesa-y += XhciMid.c
+libagesa-y += XhciReset.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Common/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Common/Makefile.inc
new file mode 100644
index 0000000000..bcde69e731
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Common/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += GnbLibFeatures.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Makefile.inc
new file mode 100644
index 0000000000..710c3d4ceb
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Makefile.inc
@@ -0,0 +1,7 @@
+libagesa-y += GnbInitAtEarly.c
+libagesa-y += GnbInitAtEnv.c
+libagesa-y += GnbInitAtLate.c
+libagesa-y += GnbInitAtMid.c
+libagesa-y += GnbInitAtPost.c
+libagesa-y += GnbInitAtReset.c
+libagesa-y += GnbInitAtS3Save.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/Makefile.inc
new file mode 100644
index 0000000000..ce9e7f9fc0
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbCommonLib/Makefile.inc
@@ -0,0 +1,8 @@
+libagesa-y += GnbLib.c
+libagesa-y += GnbLibCpuAcc.c
+libagesa-y += GnbLibHeap.c
+libagesa-y += GnbLibIoAcc.c
+libagesa-y += GnbLibMemAcc.c
+libagesa-y += GnbLibPci.c
+libagesa-y += GnbLibPciAcc.c
+libagesa-y += GnbTimerLib.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbFamTranslation/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbFamTranslation/Makefile.inc
new file mode 100644
index 0000000000..74c014eb70
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbFamTranslation/Makefile.inc
@@ -0,0 +1,2 @@
+libagesa-y += GnbPcieTranslation.c
+libagesa-y += GnbTranslation.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxConfig/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxConfig/Makefile.inc
new file mode 100644
index 0000000000..ac756a4545
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxConfig/Makefile.inc
@@ -0,0 +1,4 @@
+libagesa-y += GfxConfigEnv.c
+libagesa-y += GfxConfigLib.c
+libagesa-y += GfxConfigMid.c
+libagesa-y += GfxConfigPost.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxInitLibV1/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxInitLibV1/Makefile.inc
new file mode 100644
index 0000000000..1d0b5cc0fd
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxInitLibV1/Makefile.inc
@@ -0,0 +1,3 @@
+libagesa-y += GfxCardInfo.c
+libagesa-y += GfxEnumConnectors.c
+libagesa-y += GnbGfxInitLibV1.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxIntTableV3/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxIntTableV3/Makefile.inc
new file mode 100644
index 0000000000..e5ba0a0501
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbGfxIntTableV3/Makefile.inc
@@ -0,0 +1,3 @@
+libagesa-y += GfxIntegratedInfoTable.c
+libagesa-y += GfxLibV3.c
+libagesa-y += GfxPwrPlayTable.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/Makefile.inc
new file mode 100644
index 0000000000..9c97ac34bc
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbInitKB/Makefile.inc
@@ -0,0 +1,29 @@
+libagesa-y += AlibKB.c
+libagesa-y += GfxEnvInitKB.c
+libagesa-y += GfxGmcInitKB.c
+libagesa-y += GfxIntegratedInfoTableKB.c
+libagesa-y += GfxIntegratedInfoTableKB.c
+libagesa-y += GfxLibKB.c
+libagesa-y += GfxMidInitKB.c
+libagesa-y += GfxPostInitKB.c
+libagesa-y += GfxSamuInitKB.c
+libagesa-y += GfxTablesKB.c
+libagesa-y += GnbEarlyInitKB.c
+libagesa-y += GnbEnvInitKB.c
+libagesa-y += GnbF1TableKB.c
+libagesa-y += GnbIommuTablesKB.c
+libagesa-y += GnbMidInitKB.c
+libagesa-y += GnbPostInitKB.c
+libagesa-y += GnbRegisterAccKB.c
+libagesa-y += GnbTablesKB.c
+libagesa-y += GnbUraKB.c
+libagesa-y += GnbUraKB.c
+libagesa-y += GnbUraTokenMapKB.c
+libagesa-y += PcieComplexDataKB.c
+libagesa-y += PcieConfigKB.c
+libagesa-y += PcieEarlyInitKB.c
+libagesa-y += PcieEnvInitKB.c
+libagesa-y += PcieLibKB.c
+libagesa-y += PcieMidInitKB.c
+libagesa-y += PciePostInitKB.c
+libagesa-y += PcieTablesKB.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbIoapic/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbIoapic/Makefile.inc
new file mode 100644
index 0000000000..375a8caf98
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbIoapic/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += GnbIoapic.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbNbInitLibV4/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbNbInitLibV4/Makefile.inc
new file mode 100644
index 0000000000..0a4261f845
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbNbInitLibV4/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += GnbNbInitLibV4.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbNbInitLibV5/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbNbInitLibV5/Makefile.inc
new file mode 100644
index 0000000000..3f36094585
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbNbInitLibV5/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += GnbNbInitLibV5.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieAlibV2/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieAlibV2/Makefile.inc
new file mode 100644
index 0000000000..9075436d1f
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieAlibV2/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += PcieAlibV2.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieAspm/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieAspm/Makefile.inc
new file mode 100644
index 0000000000..1582ff0d43
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieAspm/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += PcieAspm.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieClkPm/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieClkPm/Makefile.inc
new file mode 100644
index 0000000000..e0b6519a8e
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieClkPm/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += PcieClkPm.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieConfig/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieConfig/Makefile.inc
new file mode 100644
index 0000000000..2447fea46c
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieConfig/Makefile.inc
@@ -0,0 +1,5 @@
+libagesa-y += GnbHandleLib.c
+libagesa-y += PcieConfigData.c
+libagesa-y += PcieConfigLib.c
+libagesa-y += PcieInputParser.c
+libagesa-y += PcieMapTopology.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/Makefile.inc
new file mode 100644
index 0000000000..d7d8640f96
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV1/Makefile.inc
@@ -0,0 +1,8 @@
+libagesa-y += PcieAspmBlackList.c
+libagesa-y += PciePifServices.c
+libagesa-y += PciePortRegAcc.c
+libagesa-y += PciePortServices.c
+libagesa-y += PcieTimer.c
+libagesa-y += PcieTopologyServices.c
+libagesa-y += PcieUtilityLib.c
+libagesa-y += PcieWrapperRegAcc.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV4/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV4/Makefile.inc
new file mode 100644
index 0000000000..038feb3e86
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV4/Makefile.inc
@@ -0,0 +1,2 @@
+libagesa-y += PciePortServicesV4.c
+libagesa-y += PcieWrapperServicesV4.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/Makefile.inc
new file mode 100644
index 0000000000..f157593995
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieInitLibV5/Makefile.inc
@@ -0,0 +1,6 @@
+libagesa-y += PciePhyServicesV5.c
+libagesa-y += PciePifServicesV5.c
+libagesa-y += PciePortServicesV5.c
+libagesa-y += PcieSiliconServicesV5.c
+libagesa-y += PcieTopologyServicesV5.c
+libagesa-y += PcieWrapperServicesV5.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieMaxPayload/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieMaxPayload/Makefile.inc
new file mode 100644
index 0000000000..e60d521e84
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieMaxPayload/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += PcieMaxPayload.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieTrainingV2/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieTrainingV2/Makefile.inc
new file mode 100644
index 0000000000..375fde09d6
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbPcieTrainingV2/Makefile.inc
@@ -0,0 +1,2 @@
+libagesa-y += PcieTrainingV2.c
+libagesa-y += PcieWorkaroundsV2.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSSocketLib/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSSocketLib/Makefile.inc
new file mode 100644
index 0000000000..183fd8c3f1
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSSocketLib/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += GnbSSocketLib.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSbLib/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSbLib/Makefile.inc
new file mode 100644
index 0000000000..e5434c2041
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSbLib/Makefile.inc
@@ -0,0 +1,2 @@
+libagesa-y += GnbSbLib.c
+libagesa-y += GnbSbPcie.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbScsLibV1/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbScsLibV1/Makefile.inc
new file mode 100644
index 0000000000..8c2f02b600
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbScsLibV1/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += GnbScsLibV1.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSmuLibV7/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSmuLibV7/Makefile.inc
new file mode 100644
index 0000000000..7c4fff6c8f
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSmuLibV7/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += GnbSmuInitLibV7.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSview/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSview/Makefile.inc
new file mode 100644
index 0000000000..2ed638f2d4
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbSview/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += GnbSview.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbTable/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbTable/Makefile.inc
new file mode 100644
index 0000000000..fe180f9041
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbTable/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += GnbTable.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbUraLibV1/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbUraLibV1/Makefile.inc
new file mode 100644
index 0000000000..8d47934b1a
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/GNB/Modules/GnbUraLibV1/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += GnbUraLibV1.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/HT/Fam16/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/HT/Fam16/Makefile.inc
new file mode 100644
index 0000000000..6b028d2edc
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/HT/Fam16/Makefile.inc
@@ -0,0 +1,2 @@
+libagesa-y += htNbFam16.c
+libagesa-y += htNbUtilitiesFam16.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/HT/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/HT/Makefile.inc
new file mode 100644
index 0000000000..f54568a1f1
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/HT/Makefile.inc
@@ -0,0 +1,8 @@
+libagesa-y += htFeat.c
+libagesa-y += htInterface.c
+libagesa-y += htInterfaceCoherent.c
+libagesa-y += htInterfaceGeneral.c
+libagesa-y += htInterfaceNonCoherent.c
+libagesa-y += htMain.c
+libagesa-y += htNb.c
+libagesa-y += htNotify.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/IDS/Debug/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/IDS/Debug/Makefile.inc
new file mode 100644
index 0000000000..abfc533f3b
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/IDS/Debug/Makefile.inc
@@ -0,0 +1,4 @@
+libagesa-y += IdsDebug.c
+libagesa-y += IdsDebugPrint.c
+libagesa-y += IdsDpHdtout.c
+libagesa-y += IdsDpSerial.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/IDS/Family/0x16/KB/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/IDS/Family/0x16/KB/Makefile.inc
new file mode 100644
index 0000000000..fdd45fab5d
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/IDS/Family/0x16/KB/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += IdsF16KbAllService.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/IDS/Library/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/IDS/Library/Makefile.inc
new file mode 100644
index 0000000000..ea5e9928f0
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/IDS/Library/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += IdsLib.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Ardk/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Ardk/Makefile.inc
new file mode 100644
index 0000000000..3b5087cbcb
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Ardk/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += ma.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/CSINTLV/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/CSINTLV/Makefile.inc
new file mode 100644
index 0000000000..c7dc75b38c
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/CSINTLV/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += mfcsi.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/DMI/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/DMI/Makefile.inc
new file mode 100644
index 0000000000..c5c1eac7d8
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/DMI/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += mfDMI.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/ECC/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/ECC/Makefile.inc
new file mode 100644
index 0000000000..25c0f38607
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/ECC/Makefile.inc
@@ -0,0 +1,2 @@
+libagesa-y += mfecc.c
+libagesa-y += mfemp.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/EXCLUDIMM/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/EXCLUDIMM/Makefile.inc
new file mode 100644
index 0000000000..31cf348efc
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/EXCLUDIMM/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += mfdimmexclud.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/IDENDIMM/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/IDENDIMM/Makefile.inc
new file mode 100644
index 0000000000..8f98ec3c1b
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/IDENDIMM/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += mfidendimm.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/LVDDR3/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/LVDDR3/Makefile.inc
new file mode 100644
index 0000000000..436ceb372c
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/LVDDR3/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += mflvddr3.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/MEMCLR/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/MEMCLR/Makefile.inc
new file mode 100644
index 0000000000..94d80c7187
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/MEMCLR/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += mfmemclr.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/ODTHERMAL/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/ODTHERMAL/Makefile.inc
new file mode 100644
index 0000000000..e1b5923668
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/ODTHERMAL/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += mfodthermal.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/PARTRN/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/PARTRN/Makefile.inc
new file mode 100644
index 0000000000..90c8566627
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/PARTRN/Makefile.inc
@@ -0,0 +1,2 @@
+libagesa-y += mfParallelTraining.c
+libagesa-y += mfStandardTraining.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/RDWR2DTRAINING/KB/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/RDWR2DTRAINING/KB/Makefile.inc
new file mode 100644
index 0000000000..352e5e0bab
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/RDWR2DTRAINING/KB/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += mfRdWr2DKb.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/RDWR2DTRAINING/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/RDWR2DTRAINING/Makefile.inc
new file mode 100644
index 0000000000..0ff42d8fa7
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/RDWR2DTRAINING/Makefile.inc
@@ -0,0 +1,4 @@
+libagesa-y += mfRdDqs2DTraining.c
+libagesa-y += mfRdWr2DEyeRimSearch.c
+libagesa-y += mfRdWr2DPatternGeneration.c
+libagesa-y += mfRdWr2DTraining.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/S3/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/S3/Makefile.inc
new file mode 100644
index 0000000000..506cda03d7
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/S3/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += mfs3.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/TABLE/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/TABLE/Makefile.inc
new file mode 100644
index 0000000000..27dcfe7f00
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Feat/TABLE/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += mftds.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Main/KB/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Main/KB/Makefile.inc
new file mode 100644
index 0000000000..ffcef131b5
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Main/KB/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += mmflowkb.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Main/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Main/Makefile.inc
new file mode 100644
index 0000000000..4c61d95629
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Main/Makefile.inc
@@ -0,0 +1,18 @@
+libagesa-y += mdef.c
+libagesa-y += merrhdl.c
+libagesa-y += minit.c
+libagesa-y += mm.c
+libagesa-y += mmConditionalPso.c
+libagesa-y += mmEcc.c
+libagesa-y += mmExcludeDimm.c
+libagesa-y += mmLvDdr3.c
+libagesa-y += mmMemClr.c
+libagesa-y += mmMemRestore.c
+libagesa-y += mmNodeInterleave.c
+libagesa-y += mmOnlineSpare.c
+libagesa-y += mmParallelTraining.c
+libagesa-y += mmStandardTraining.c
+libagesa-y += mmUmaAlloc.c
+libagesa-y += mmflow.c
+libagesa-y += mu.c
+libagesa-y += muc.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/NB/KB/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/NB/KB/Makefile.inc
new file mode 100644
index 0000000000..bccb363798
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/NB/KB/Makefile.inc
@@ -0,0 +1,9 @@
+libagesa-y += mndctkb.c
+libagesa-y += mnflowkb.c
+libagesa-y += mnidendimmkb.c
+libagesa-y += mnkb.c
+libagesa-y += mnmctkb.c
+libagesa-y += mnotkb.c
+libagesa-y += mnphykb.c
+libagesa-y += mnregkb.c
+libagesa-y += mns3kb.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/NB/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/NB/Makefile.inc
new file mode 100644
index 0000000000..eb029c2692
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/NB/Makefile.inc
@@ -0,0 +1,9 @@
+libagesa-y += mn.c
+libagesa-y += mnS3.c
+libagesa-y += mndct.c
+libagesa-y += mnfeat.c
+libagesa-y += mnflow.c
+libagesa-y += mnmct.c
+libagesa-y += mnphy.c
+libagesa-y += mnreg.c
+libagesa-y += mntrain3.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Ps/KB/FT3/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Ps/KB/FT3/Makefile.inc
new file mode 100644
index 0000000000..e96c62a0a7
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Ps/KB/FT3/Makefile.inc
@@ -0,0 +1 @@
+libagesa-y += mpSkbft3.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Ps/KB/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Ps/KB/Makefile.inc
new file mode 100644
index 0000000000..6eaf3c264d
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Ps/KB/Makefile.inc
@@ -0,0 +1,3 @@
+libagesa-y += mpSkb3.c
+libagesa-y += mpUkb3.c
+libagesa-y += mpkb3.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Ps/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Ps/Makefile.inc
new file mode 100644
index 0000000000..8e0cb863fd
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Ps/Makefile.inc
@@ -0,0 +1,7 @@
+libagesa-y += mp.c
+libagesa-y += mpmaxfreq.c
+libagesa-y += mpmr0.c
+libagesa-y += mpodtpat.c
+libagesa-y += mprtt.c
+libagesa-y += mps2d.c
+libagesa-y += mpsao.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Tech/DDR3/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Tech/DDR3/Makefile.inc
new file mode 100644
index 0000000000..72844f2def
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Tech/DDR3/Makefile.inc
@@ -0,0 +1,7 @@
+libagesa-y += mt3.c
+libagesa-y += mtot3.c
+libagesa-y += mtrci3.c
+libagesa-y += mtsdi3.c
+libagesa-y += mtspd3.c
+libagesa-y += mttecc3.c
+libagesa-y += mttwl3.c
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Tech/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Tech/Makefile.inc
new file mode 100644
index 0000000000..e512d7ba06
--- /dev/null
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Tech/Makefile.inc
@@ -0,0 +1,12 @@
+libagesa-y += mt.c
+libagesa-y += mthdi.c
+libagesa-y += mttEdgeDetect.c
+libagesa-y += mttRdDqs2DEyeRimSearch.c
+libagesa-y += mttRdDqs2DTraining.c
+libagesa-y += mttdimbt.c
+libagesa-y += mttecc.c
+libagesa-y += mtthrc.c
+libagesa-y += mtthrcSeedTrain.c
+libagesa-y += mttml.c
+libagesa-y += mttoptsrc.c
+libagesa-y += mttsrc.c