GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

src: De-conflict CALIBRATION_REGION definitions 

Change the name of the CALIBRATION_REGION definitions used in two
separate locations.  This conflict was causing an error for the
lint-001-no-global-config-in-romstage test.

Signed-off-by: Martin Roth <gaumless@gmail.com>
Change-Id: If6734f2a7d9be669586ea350fb9979fcd422b591
Reviewed-on: https://review.coreboot.org/c/coreboot/+/67382
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Yu-Ping Wu <yupingso@google.com>
This commit is contained in:
Martin Roth 2022-09-05 14:51:34 -06:00 committed by Martin Roth
parent 8baa3712c5
commit b6a0b26e88
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mainboard/google/kukui/romstage.c
View File

@ -13,16 +13,16 @@
#include "early_init.h" #include "early_init.h"
/* This must be defined in chromeos.fmd in same name and size. */ /* This must be defined in chromeos.fmd in same name and size. */
#define CALIBRATION_REGION "RW_DDR_TRAINING" #define CAL_REGION_RW_DDR_TRAINING "RW_DDR_TRAINING"
#define CALIBRATION_REGION_SIZE 0x2000 #define CAL_REGION_RW_DDR_TRAINING_SIZE 0x2000
_Static_assert(sizeof(struct dramc_param) <= CALIBRATION_REGION_SIZE, _Static_assert(sizeof(struct dramc_param) <= CAL_REGION_RW_DDR_TRAINING_SIZE,
"sizeof(struct dramc_param) exceeds " CALIBRATION_REGION); "sizeof(struct dramc_param) exceeds " CAL_REGION_RW_DDR_TRAINING);
static bool read_calibration_data_from_flash(struct dramc_param *dparam) static bool read_calibration_data_from_flash(struct dramc_param *dparam)
{ {
const size_t length = sizeof(*dparam); const size_t length = sizeof(*dparam);
size_t ret = fmap_read_area(CALIBRATION_REGION, dparam, length); size_t ret = fmap_read_area(CAL_REGION_RW_DDR_TRAINING, dparam, length);
printk(BIOS_DEBUG, "%s: ret=%#lx, length=%#lx\n", printk(BIOS_DEBUG, "%s: ret=%#lx, length=%#lx\n",
__func__, ret, length); __func__, ret, length);
@ -32,7 +32,7 @@ static bool read_calibration_data_from_flash(struct dramc_param *dparam)
static bool write_calibration_data_to_flash(const struct dramc_param *dparam) static bool write_calibration_data_to_flash(const struct dramc_param *dparam)
{ {
const size_t length = sizeof(*dparam); const size_t length = sizeof(*dparam);
size_t ret = fmap_overwrite_area(CALIBRATION_REGION, dparam, length); size_t ret = fmap_overwrite_area(CAL_REGION_RW_DDR_TRAINING, dparam, length);
printk(BIOS_DEBUG, "%s: ret=%#lx, length=%#lx\n", printk(BIOS_DEBUG, "%s: ret=%#lx, length=%#lx\n",
__func__, ret, length); __func__, ret, length);

8
src/soc/mediatek/common/memory.c
View File

@ -15,11 +15,11 @@
#include <timer.h> #include <timer.h>
/* This must be defined in chromeos.fmd in same name and size. */ /* This must be defined in chromeos.fmd in same name and size. */
#define CALIBRATION_REGION "RW_MRC_CACHE" #define CAL_REGION_RW_MRC_CACHE "RW_MRC_CACHE"
#define CALIBRATION_REGION_SIZE 0x2000 #define CAL_REGION_RW_MRC_CACHE_SIZE 0x2000
_Static_assert(sizeof(struct dramc_param) <= CALIBRATION_REGION_SIZE, _Static_assert(sizeof(struct dramc_param) <= CAL_REGION_RW_MRC_CACHE_SIZE,
"sizeof(struct dramc_param) exceeds " CALIBRATION_REGION); "sizeof(struct dramc_param) exceeds " CAL_REGION_RW_MRC_CACHE);
const char *get_dram_geometry_str(u32 ddr_geometry); const char *get_dram_geometry_str(u32 ddr_geometry);
const char *get_dram_type_str(u32 ddr_type); const char *get_dram_type_str(u32 ddr_type);