From 8d3640d22610eeb9a21c803d75c698e681a1dc62 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Mon, 16 May 2022 12:27:36 +0200 Subject: vendorcode/amd/agesa/f15tn: Fix all improper use of .data AGESA has a lot of code in the .data section which is for initialized data, that in fact should be .rodata. This adds the 'CONST' keyword everywhere it is needed. TEST: See in the .elf file (e.g. using readelf) that there is nothing in .data section. Change-Id: I9593c24f764319f66a64715d91175f64edf10608 Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/64386 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons Reviewed-by: Stefan Reinauer --- .../agesa/f15tn/Config/OptionCpuFeaturesInstall.h | 2 +- .../agesa/f15tn/Config/OptionFamily15hInstall.h | 6 +- .../amd/agesa/f15tn/Config/OptionFchInstall.h | 2 +- .../amd/agesa/f15tn/Config/OptionGnbInstall.h | 12 +-- .../amd/agesa/f15tn/Config/OptionMemoryInstall.h | 86 +++++++++++----------- .../agesa/f15tn/Config/OptionMultiSocketInstall.h | 2 +- .../amd/agesa/f15tn/Config/OptionPstateInstall.h | 2 +- .../amd/agesa/f15tn/Config/PlatformInstall.h | 6 +- 8 files changed, 59 insertions(+), 59 deletions(-) (limited to 'src/vendorcode/amd/agesa/f15tn/Config') diff --git a/src/vendorcode/amd/agesa/f15tn/Config/OptionCpuFeaturesInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionCpuFeaturesInstall.h index 50829bdbde..c8f520750c 100644 --- a/src/vendorcode/amd/agesa/f15tn/Config/OptionCpuFeaturesInstall.h +++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionCpuFeaturesInstall.h @@ -58,7 +58,7 @@ #include "OptionHtcInstall.h" #include "OptionPreserveMailboxInstall.h" -CONST CPU_FEATURE_DESCRIPTOR* ROMDATA SupportedCpuFeatureList[] = +CONST CPU_FEATURE_DESCRIPTOR* ROMDATA CONST SupportedCpuFeatureList[] = { OPTION_HW_C1E_FEAT OPTION_MSG_BASED_C1E_FEAT diff --git a/src/vendorcode/amd/agesa/f15tn/Config/OptionFamily15hInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionFamily15hInstall.h index bd00756c43..977c82c57e 100644 --- a/src/vendorcode/amd/agesa/f15tn/Config/OptionFamily15hInstall.h +++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionFamily15hInstall.h @@ -552,7 +552,7 @@ extern F_IS_NB_PSTATE_ENABLED F15IsNbPstateEnabled; #if USES_REGISTER_TABLES == TRUE - CONST REGISTER_TABLE ROMDATA *F15TnRegisterTables[] = + CONST REGISTER_TABLE ROMDATA * CONST F15TnRegisterTables[] = { #if BASE_FAMILY_PCI == TRUE &F15PciRegisterTable, @@ -757,7 +757,7 @@ extern F_IS_NB_PSTATE_ENABLED F15IsNbPstateEnabled; (PF_GET_NEXT_HT_LINK_FEATURES) CommonAssert, #endif #if USES_REGISTER_TABLES == TRUE - (REGISTER_TABLE **) F15TnRegisterTables, + (CONST REGISTER_TABLE **) F15TnRegisterTables, #else NULL, #endif @@ -814,7 +814,7 @@ extern F_IS_NB_PSTATE_ENABLED F15IsNbPstateEnabled; #endif - CONST UINT8 ROMDATA *CpuF15TnMicroCodePatchArray[] = + CONST UINT8 ROMDATA * CONST CpuF15TnMicroCodePatchArray[] = { F15_TN_UCODE_10F F15_TN_UCODE_0E diff --git a/src/vendorcode/amd/agesa/f15tn/Config/OptionFchInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionFchInstall.h index 5ea5fd1595..156d1d27a4 100644 --- a/src/vendorcode/amd/agesa/f15tn/Config/OptionFchInstall.h +++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionFchInstall.h @@ -828,7 +828,7 @@ // // Define task list for InitReset phase // - FCH_TASK_ENTRY ROMDATA *FchInitResetTaskTable[] = { + FCH_TASK_ENTRY ROMDATA * CONST FchInitResetTaskTable[] = { InstallFchInitResetHwAcpiP, InstallFchInitResetAb, InstallFchInitResetSpi, diff --git a/src/vendorcode/amd/agesa/f15tn/Config/OptionGnbInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionGnbInstall.h index f6fc162919..940ab9e472 100644 --- a/src/vendorcode/amd/agesa/f15tn/Config/OptionGnbInstall.h +++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionGnbInstall.h @@ -90,7 +90,7 @@ #if (GNB_TYPE_TN == TRUE) #include #endif - GNB_SERVICE *ServiceTable = SERVICES_POINTER; + CONST GNB_SERVICE * CONST ServiceTable = SERVICES_POINTER; //--------------------------------------------------------------------------------------------------- // BUILD options @@ -254,7 +254,7 @@ #define CFG_LOADLINE_ENABLE TRUE #endif - GNB_BUILD_OPTIONS ROMDATA GnbBuildOptions = { + CONST GNB_BUILD_OPTIONS ROMDATA GnbBuildOptions = { CFG_IGFX_AS_PCIE_EP, CFG_LCLK_DEEP_SLEEP_EN, CFG_LCLK_DPM_EN, @@ -352,7 +352,7 @@ #endif //--------------------------------------------------------------------------------------------------- - OPTION_GNB_CONFIGURATION GnbEarlyFeatureTable[] = { + CONST OPTION_GNB_CONFIGURATION GnbEarlyFeatureTable[] = { OPTION_NBINITATEARLY_ENTRY OPTION_GNBEARLYINTERFACETN_ENTRY OPTION_F12NBSMUINITFEATURE_ENTRY @@ -384,7 +384,7 @@ #define OPTION_GNBEARLIERINTERFACETN_ENTRY #endif - OPTION_GNB_CONFIGURATION GnbEarlierFeatureTable[] = { + CONST OPTION_GNB_CONFIGURATION GnbEarlierFeatureTable[] = { OPTION_PCIECONFIGURATIONINIT_ENTRY OPTION_GNBEARLIERINTERFACETN_ENTRY {0, NULL} @@ -471,7 +471,7 @@ #endif //--------------------------------------------------------------------------------------------------- - OPTION_GNB_CONFIGURATION GnbPostFeatureTable[] = { + CONST OPTION_GNB_CONFIGURATION GnbPostFeatureTable[] = { OPTION_PCIEINITATPOSTEARLY_ENTRY OPTION_PCIEPOSTEARLYINTERFACETN_ENTRY OPTION_GFXCONFIGPOSTINTERFACE_ENTRY @@ -480,7 +480,7 @@ {0, NULL} }; - OPTION_GNB_CONFIGURATION GnbPostAfterDramFeatureTable[] = { + CONST OPTION_GNB_CONFIGURATION GnbPostAfterDramFeatureTable[] = { OPTION_NBINITATPOST_ENTRY OPTION_GNBPOSTINTERFACETN_ENTRY OPTION_PCIEINITATPOST_ENTRY diff --git a/src/vendorcode/amd/agesa/f15tn/Config/OptionMemoryInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionMemoryInstall.h index f662db285b..eaca53e129 100644 --- a/src/vendorcode/amd/agesa/f15tn/Config/OptionMemoryInstall.h +++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionMemoryInstall.h @@ -405,7 +405,7 @@ BOOLEAN MemFS3DefConstructorRet ( #define MEM_MAIN_FLOW_CONTROL_PTR_TN MemMFlowDef, #endif - MEM_FLOW_CFG* memFlowControlInstalled[] = { + MEM_FLOW_CFG* CONST memFlowControlInstalled[] = { MEM_MAIN_FLOW_CONTROL_PTR_Dr MEM_MAIN_FLOW_CONTROL_PTR_DA MEM_MAIN_FLOW_CONTROL_PTR_RB @@ -1209,7 +1209,7 @@ BOOLEAN MemFS3DefConstructorRet ( #define MEM_MAIN_FEATURE_TRAINING MemMStandardTraining #define MEM_FEATURE_TRAINING MemFStandardTraining - MEM_FEAT_BLOCK_NB MemFeatBlockTN = { + CONST MEM_FEAT_BLOCK_NB MemFeatBlockTN = { MEM_FEAT_BLOCK_NB_STRUCT_VERSION, MEM_FEATURE_ONLINE_SPARE, MEM_FEATURE_BANK_INTERLEAVE, @@ -1242,7 +1242,7 @@ BOOLEAN MemFS3DefConstructorRet ( * MAIN FEATURE BLOCK *--------------------------------------------------------------------------------------------------- */ - MEM_FEAT_BLOCK_MAIN MemFeatMain = { + CONST MEM_FEAT_BLOCK_MAIN MemFeatMain = { MEM_FEAT_BLOCK_MAIN_STRUCT_VERSION, MEM_MAIN_FEATURE_TRAINING, MEM_MAIN_FEATURE_DIMM_EXCLUDE, @@ -2665,7 +2665,7 @@ BOOLEAN MemFS3DefConstructorRet ( #else #define TECH_TRAIN_MAX_RD_LAT_DDR3 MemTFeatDef #endif - MEM_TECH_FEAT_BLOCK memTechTrainingFeatSequenceDDR3TN = { + CONST MEM_TECH_FEAT_BLOCK memTechTrainingFeatSequenceDDR3TN = { MEM_TECH_FEAT_BLOCK_STRUCT_VERSION, TECH_TRAIN_ENTER_HW_TRN_DDR3, TECH_TRAIN_SW_WL_DDR3, @@ -2725,7 +2725,7 @@ BOOLEAN MemFS3DefConstructorRet ( MEM_TECH_ENABLE_TRAINING_SEQUENCE_END }; - MEM_FEAT_TRAIN_SEQ memTrainSequenceDDR3[] = { + CONST MEM_FEAT_TRAIN_SEQ memTrainSequenceDDR3[] = { MEM_TECH_ENABLE_TRAINING_SEQUENCE_DDR3_DR MEM_TECH_ENABLE_TRAINING_SEQUENCE_DDR3_DA MEM_TECH_ENABLE_TRAINING_SEQUENCE_DDR3_HY @@ -2745,7 +2745,7 @@ BOOLEAN MemFS3DefConstructorRet ( * *--------------------------------------------------------------------------------------------------- */ - OPTION_MEM_FEATURE_NB* memNTrainFlowControl[] = { // Training flow control + OPTION_MEM_FEATURE_NB* CONST memNTrainFlowControl[] = { // Training flow control NB_TRAIN_FLOW_DDR2, NB_TRAIN_FLOW_DDR3, }; @@ -2755,7 +2755,7 @@ BOOLEAN MemFS3DefConstructorRet ( * *--------------------------------------------------------------------------------------------------- */ - MEM_TECH_CONSTRUCTOR* memTechInstalled[] = { // Types of technology installed + MEM_TECH_CONSTRUCTOR* CONST memTechInstalled[] = { // Types of technology installed MEM_TECH_CONSTRUCTOR_DDR2 MEM_TECH_CONSTRUCTOR_DDR3 NULL @@ -3665,7 +3665,7 @@ BOOLEAN MemFS3DefConstructorRet ( */ #define MEM_PSC_FLOW_BLOCK_END NULL #define PSC_TBL_END NULL - #define MEM_PSC_FLOW_DEFTRUE (BOOLEAN (*) (MEM_NB_BLOCK*, MEM_PSC_TABLE_BLOCK *)) memDefTrue + #define MEM_PSC_FLOW_DEFTRUE (BOOLEAN (*) (MEM_NB_BLOCK*, CONST MEM_PSC_TABLE_BLOCK *)) memDefTrue #if OPTION_MEMCTLR_OR #if OPTION_UDIMMS @@ -4517,43 +4517,43 @@ BOOLEAN MemFS3DefConstructorRet ( #define PSC_TBL_TN_CS_TRI_FP2 #endif - PSC_TBL_ENTRY* memPSCTblMaxFreqArrayTN[] = { + PSC_TBL_ENTRY* CONST memPSCTblMaxFreqArrayTN[] = { PSC_TBL_TN_SODIMM3_MAX_FREQ PSC_TBL_TN_SODWN_SODIMM3_MAX_FREQ PSC_TBL_TN_UDIMM3_MAX_FREQ PSC_TBL_END }; - PSC_TBL_ENTRY* memPSCTblDramTermArrayTN[] = { + PSC_TBL_ENTRY* CONST memPSCTblDramTermArrayTN[] = { PSC_TBL_TN_UDIMM3_DRAM_TERM PSC_TBL_TN_SODIMM3_DRAM_TERM PSC_TBL_TN_SODWN_SODIMM3_DRAM_TERM PSC_TBL_END }; - PSC_TBL_ENTRY* memPSCTblODTPatArrayTN[] = { + PSC_TBL_ENTRY* CONST memPSCTblODTPatArrayTN[] = { &TNOdtPatTblEnt, PSC_TBL_END }; - PSC_TBL_ENTRY* memPSCTblSAOArrayTN[] = { + PSC_TBL_ENTRY* CONST memPSCTblSAOArrayTN[] = { PSC_TBL_TN_SODIMM3_SAO PSC_TBL_TN_SODWN_SODIMM3_SAO PSC_TBL_TN_UDIMM3_SAO PSC_TBL_END }; - PSC_TBL_ENTRY* memPSCTblMR0WRArrayTN[] = { + PSC_TBL_ENTRY* CONST memPSCTblMR0WRArrayTN[] = { &TNMR0WrTblEntry, PSC_TBL_END }; - PSC_TBL_ENTRY* memPSCTblMR0CLArrayTN[] = { + PSC_TBL_ENTRY* CONST memPSCTblMR0CLArrayTN[] = { &TNMR0CLTblEntry, PSC_TBL_END }; - PSC_TBL_ENTRY* memPSCTblGenArrayTN[] = { + PSC_TBL_ENTRY* CONST memPSCTblGenArrayTN[] = { &TNDdr3CKETriEnt, PSC_TBL_TN_CLK_DIS_FM2 PSC_TBL_TN_ODT_TRI_FM2 @@ -4567,7 +4567,7 @@ BOOLEAN MemFS3DefConstructorRet ( PSC_TBL_END }; - PSC_TBL_ENTRY* memPSCTblS2DArrayTN[] = { + PSC_TBL_ENTRY* CONST memPSCTblS2DArrayTN[] = { PSC_TBL_TN_UDIMM3_S2D_FM2 PSC_TBL_TN_SODIMM3_S2D_FS1 PSC_TBL_TN_SODIMM3_S2D_FP2 @@ -4575,7 +4575,7 @@ BOOLEAN MemFS3DefConstructorRet ( PSC_TBL_END }; - MEM_PSC_TABLE_BLOCK memPSCTblBlockTN = { + CONST MEM_PSC_TABLE_BLOCK memPSCTblBlockTN = { (PSC_TBL_ENTRY **)&memPSCTblMaxFreqArrayTN, (PSC_TBL_ENTRY **)&memPSCTblDramTermArrayTN, (PSC_TBL_ENTRY **)&memPSCTblODTPatArrayTN, @@ -4599,7 +4599,7 @@ BOOLEAN MemFS3DefConstructorRet ( extern MEM_PSC_FLOW MemPGetSAO; extern MEM_PSC_FLOW MemPGetMR0WrCL; - MEM_PSC_FLOW_BLOCK memPlatSpecFlowTN = { + CONST MEM_PSC_FLOW_BLOCK memPlatSpecFlowTN = { &memPSCTblBlockTN, MemPGetMaxFreqSupported, MemPGetRttNomWr, @@ -4620,7 +4620,7 @@ BOOLEAN MemFS3DefConstructorRet ( #endif - MEM_PSC_FLOW_BLOCK* memPlatSpecFlowArray[] = { + CONST MEM_PSC_FLOW_BLOCK* CONST memPlatSpecFlowArray[] = { MEM_PSC_FLOW_BLOCK_OR MEM_PSC_FLOW_BLOCK_TN MEM_PSC_FLOW_BLOCK_END @@ -4641,7 +4641,7 @@ BOOLEAN MemFS3DefConstructorRet ( #else //#if (OPTION_LRDIMMS == FALSE) #define MEM_TECH_FEATURE_LRDIMM_INIT MemTFeatDef #endif - MEM_TECH_LRDIMM memLrdimmSupported = { + CONST MEM_TECH_LRDIMM memLrdimmSupported = { MEM_TECH_LRDIMM_STRUCT_VERSION, MEM_TECH_FEATURE_LRDIMM_INIT }; @@ -4652,7 +4652,7 @@ BOOLEAN MemFS3DefConstructorRet ( * *--------------------------------------------------------------------------------------------------- */ - MEM_FLOW_CFG* memFlowControlInstalled[] = { + MEM_FLOW_CFG* CONST memFlowControlInstalled[] = { NULL }; /*--------------------------------------------------------------------------------------------------- @@ -4661,7 +4661,7 @@ BOOLEAN MemFS3DefConstructorRet ( * *--------------------------------------------------------------------------------------------------- */ - OPTION_MEM_FEATURE_NB* memNTrainFlowControl[] = { // Training flow control + OPTION_MEM_FEATURE_NB* CONST memNTrainFlowControl[] = { // Training flow control NULL, NULL, }; @@ -4671,7 +4671,7 @@ BOOLEAN MemFS3DefConstructorRet ( * *--------------------------------------------------------------------------------------------------- */ - MEM_TECH_CONSTRUCTOR* memTechInstalled[] = { // Types of technology installed + MEM_TECH_CONSTRUCTOR* CONST memTechInstalled[] = { // Types of technology installed NULL }; @@ -4681,13 +4681,13 @@ BOOLEAN MemFS3DefConstructorRet ( * *--------------------------------------------------------------------------------------------------- */ - UINT8 MemoryTechnologyMap[MAX_SOCKETS_SUPPORTED] = {0, 0, 0, 0, 0, 0, 0, 0}; + CONST UINT8 MemoryTechnologyMap[MAX_SOCKETS_SUPPORTED] = {0, 0, 0, 0, 0, 0, 0, 0}; /*--------------------------------------------------------------------------------------------------- * DEFAULT MAIN FEATURE BLOCK *--------------------------------------------------------------------------------------------------- */ - MEM_FEAT_BLOCK_MAIN MemFeatMain = { + CONST MEM_FEAT_BLOCK_MAIN MemFeatMain = { 0 }; @@ -4744,18 +4744,18 @@ BOOLEAN MemFS3DefConstructorRet ( *--------------------------------------------------------------------------------------------------- */ #if OPTION_DDR2 - MEM_TECH_FEAT_BLOCK memTechTrainingFeatDDR2 = { + CONST MEM_TECH_FEAT_BLOCK memTechTrainingFeatDDR2 = { 0 }; - MEM_FEAT_TRAIN_SEQ memTrainSequenceDDR2[] = { + CONST MEM_FEAT_TRAIN_SEQ memTrainSequenceDDR2[] = { { 0 } }; #endif #if OPTION_DDR3 - MEM_TECH_FEAT_BLOCK memTechTrainingFeatDDR3 = { + CONST MEM_TECH_FEAT_BLOCK memTechTrainingFeatDDR3 = { 0 }; - MEM_FEAT_TRAIN_SEQ memTrainSequenceDDR3[] = { + CONST MEM_FEAT_TRAIN_SEQ memTrainSequenceDDR3[] = { { 0 } }; #endif @@ -4766,52 +4766,52 @@ BOOLEAN MemFS3DefConstructorRet ( *--------------------------------------------------------------------------------------------------- */ #if (OPTION_MEMCTLR_DR == TRUE) - MEM_PLAT_SPEC_CFG* memPlatSpecFFInstalledDr[MAX_FF_TYPES] = { + MEM_PLAT_SPEC_CFG* CONST memPlatSpecFFInstalledDr[MAX_FF_TYPES] = { NULL }; #endif #if (OPTION_MEMCTLR_RB == TRUE) - MEM_PLAT_SPEC_CFG* memPlatSpecFFInstalledRb[MAX_FF_TYPES] = { + MEM_PLAT_SPEC_CFG* CONST memPlatSpecFFInstalledRb[MAX_FF_TYPES] = { NULL }; #endif #if (OPTION_MEMCTLR_DA == TRUE) - MEM_PLAT_SPEC_CFG* memPlatSpecFFInstalledDA[MAX_FF_TYPES] = { + MEM_PLAT_SPEC_CFG* CONST memPlatSpecFFInstalledDA[MAX_FF_TYPES] = { NULL }; #endif #if (OPTION_MEMCTLR_Ni == TRUE) - MEM_PLAT_SPEC_CFG* memPlatSpecFFInstalledNi[MAX_FF_TYPES] = { + MEM_PLAT_SPEC_CFG* CONST memPlatSpecFFInstalledNi[MAX_FF_TYPES] = { NULL }; #endif #if (OPTION_MEMCTLR_PH == TRUE) - MEM_PLAT_SPEC_CFG* memPlatSpecFFInstalledPh[MAX_FF_TYPES] = { + MEM_PLAT_SPEC_CFG* CONST memPlatSpecFFInstalledPh[MAX_FF_TYPES] = { NULL }; #endif #if (OPTION_MEMCTLR_LN == TRUE) - MEM_PLAT_SPEC_CFG* memPlatSpecFFInstalledLN[MAX_FF_TYPES] = { + MEM_PLAT_SPEC_CFG* CONST memPlatSpecFFInstalledLN[MAX_FF_TYPES] = { NULL }; #endif #if (OPTION_MEMCTLR_HY == TRUE) - MEM_PLAT_SPEC_CFG* memPlatSpecFFInstalledHy[MAX_FF_TYPES] = { + MEM_PLAT_SPEC_CFG* CONST memPlatSpecFFInstalledHy[MAX_FF_TYPES] = { NULL }; #endif #if (OPTION_MEMCTLR_OR == TRUE) - MEM_PLAT_SPEC_CFG* memPlatSpecFFInstalledOr[MAX_FF_TYPES] = { + MEM_PLAT_SPEC_CFG* CONST memPlatSpecFFInstalledOr[MAX_FF_TYPES] = { NULL }; #endif #if (OPTION_MEMCTLR_C32 == TRUE) - MEM_PLAT_SPEC_CFG* memPlatSpecFFInstalledC32[MAX_FF_TYPES] = { + MEM_PLAT_SPEC_CFG* CONST memPlatSpecFFInstalledC32[MAX_FF_TYPES] = { NULL }; #endif #if (OPTION_MEMCTLR_ON == TRUE) - MEM_PLAT_SPEC_CFG* memPlatSpecFFInstalledON[MAX_FF_TYPES] = { + MEM_PLAT_SPEC_CFG* CONST memPlatSpecFFInstalledON[MAX_FF_TYPES] = { NULL }; #endif @@ -4820,7 +4820,7 @@ BOOLEAN MemFS3DefConstructorRet ( * *---------------------------------------------------------------------- */ - MEM_PLATFORM_CFG* memPlatformTypeInstalled[] = { + MEM_PLATFORM_CFG* CONST memPlatformTypeInstalled[] = { NULL }; @@ -4829,11 +4829,11 @@ BOOLEAN MemFS3DefConstructorRet ( * *---------------------------------------------------------------------- */ - MEM_PSC_FLOW_BLOCK* memPlatSpecFlowArray[] = { + MEM_PSC_FLOW_BLOCK* CONST memPlatSpecFlowArray[] = { NULL }; - MEM_TECH_LRDIMM memLrdimmSupported = { + CONST MEM_TECH_LRDIMM memLrdimmSupported = { MEM_TECH_LRDIMM_STRUCT_VERSION, NULL }; @@ -4845,7 +4845,7 @@ BOOLEAN MemFS3DefConstructorRet ( * *--------------------------------------------------------------------------------------------------- */ -MEM_NB_SUPPORT memNBInstalled[] = { +CONST MEM_NB_SUPPORT memNBInstalled[] = { MEM_NB_SUPPORT_RB MEM_NB_SUPPORT_DA MEM_NB_SUPPORT_Ni diff --git a/src/vendorcode/amd/agesa/f15tn/Config/OptionMultiSocketInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionMultiSocketInstall.h index 46c303330b..2bf3eed648 100644 --- a/src/vendorcode/amd/agesa/f15tn/Config/OptionMultiSocketInstall.h +++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionMultiSocketInstall.h @@ -89,7 +89,7 @@ #endif /* Declare the instance of the multisocket option configuration structure */ -OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration = { +CONST OPTION_MULTISOCKET_CONFIGURATION OptionMultiSocketConfiguration = { MULTISOCKET_STRUCT_VERSION, GET_NUM_PM_STEPS, CORE0_PM_TASK, diff --git a/src/vendorcode/amd/agesa/f15tn/Config/OptionPstateInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/OptionPstateInstall.h index e80a69ddb3..8d5557b392 100644 --- a/src/vendorcode/amd/agesa/f15tn/Config/OptionPstateInstall.h +++ b/src/vendorcode/amd/agesa/f15tn/Config/OptionPstateInstall.h @@ -219,7 +219,7 @@ #endif /* Declare the instance of the PSTATE option configuration structure */ -OPTION_PSTATE_POST_CONFIGURATION OptionPstatePostConfiguration = { +CONST OPTION_PSTATE_POST_CONFIGURATION OptionPstatePostConfiguration = { PSTATE_STRUCT_VERSION, USER_PSTATE_OPTION_GATHER, USER_PSTATE_OPTION_LEVEL diff --git a/src/vendorcode/amd/agesa/f15tn/Config/PlatformInstall.h b/src/vendorcode/amd/agesa/f15tn/Config/PlatformInstall.h index 798c1cc0cd..6071356dca 100644 --- a/src/vendorcode/amd/agesa/f15tn/Config/PlatformInstall.h +++ b/src/vendorcode/amd/agesa/f15tn/Config/PlatformInstall.h @@ -48,7 +48,7 @@ * ****************************************************************************/ -VOLATILE AMD_MODULE_HEADER mCpuModuleID = { +CONST AMD_MODULE_HEADER mCpuModuleID = { //ModuleHeaderSignature // Remove 'DOM$' as temp solution before update BinUtil.exe , Int32FromChar ('0', '0', '0', '0'), @@ -2624,7 +2624,7 @@ CONST UINT32 ROMDATA AmdPlatformTypeCgf = CFG_AMD_PLATFORM_TYPE; * ****************************************************************************/ -FCH_PLATFORM_POLICY FchUserOptions = { +CONST FCH_PLATFORM_POLICY FchUserOptions = { CFG_SMBUS0_BASE_ADDRESS, // CfgSmbus0BaseAddress CFG_SMBUS1_BASE_ADDRESS, // CfgSmbus1BaseAddress CFG_SIO_PME_BASE_ADDRESS, // CfgSioPmeBaseAddress @@ -2671,7 +2671,7 @@ FCH_PLATFORM_POLICY FchUserOptions = { CFG_FCH_GPIO_CONTROL_LIST // *CfgFchGpioControl }; -BUILD_OPT_CFG UserOptions = { +CONST BUILD_OPT_CFG UserOptions = { { // AGESA version string AGESA_CODE_SIGNATURE, // code header Signature AGESA_PACKAGE_STRING, // 8 character ID -- cgit v1.2.3