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

mb/google/octopus: make new targets have DRAM part in CBI by default 

All new targets utilizing octopus mainboard support default
to always using DRAM_PART_NUM_IN_CBI. This allows easier addition
of new targets.

BUG=b:132668378
BRANCH=octopus

Change-Id: Idb136aa960260abe1657b16ded02a7dfb63c6849
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33370
Reviewed-by: Justin TerAvest <teravest@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Kevin Chiu <Kevin.Chiu@quantatw.com>
Reviewed-by: Karthik Ramasubramanian <kramasub@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Aaron Durbin 2019-06-10 10:37:40 -06:00
parent 58ed173a2c
commit 702d2364bd
3 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/mainboard/google/octopus/Kconfig
View File

@ -121,26 +121,18 @@ config TPM_TIS_ACPI_INTERRUPT
int int
default 63 # GPE0_DW1_31 (GPIO_63) default 63 # GPE0_DW1_31 (GPIO_63)
config DRAM_PART_NUM_IN_CBI config DRAM_PART_NUM_NOT_ALWAYS_IN_CBI
bool bool
default y if BOARD_GOOGLE_PHASER
default y if BOARD_GOOGLE_MEEP
default y if BOARD_GOOGLE_AMPTON
default y if BOARD_GOOGLE_FLEEX
default y if BOARD_GOOGLE_BOBBA default y if BOARD_GOOGLE_BOBBA
default y if BOARD_GOOGLE_CASTA default y if BOARD_GOOGLE_FLEEX
default y if BOARD_GOOGLE_BLOOG default y if BOARD_GOOGLE_MEEP
default y if BOARD_GOOGLE_OCTOPUS
config DRAM_PART_NUM_ALWAYS_IN_CBI default y if BOARD_GOOGLE_PHASER
bool default y if BOARD_GOOGLE_YORP
depends on DRAM_PART_NUM_IN_CBI
default y if BOARD_GOOGLE_AMPTON
default y if BOARD_GOOGLE_CASTA
default y if BOARD_GOOGLE_BLOOG
config DRAM_PART_IN_CBI_BOARD_ID_MIN config DRAM_PART_IN_CBI_BOARD_ID_MIN
int int
depends on DRAM_PART_NUM_IN_CBI && !DRAM_PART_NUM_ALWAYS_IN_CBI depends on DRAM_PART_NUM_NOT_ALWAYS_IN_CBI
default 255 if BOARD_GOOGLE_YORP default 255 if BOARD_GOOGLE_YORP
default 2 if BOARD_GOOGLE_PHASER default 2 if BOARD_GOOGLE_PHASER
default 2 if BOARD_GOOGLE_FLEEX default 2 if BOARD_GOOGLE_FLEEX

7
src/mainboard/google/octopus/romstage.c
View File

@ -37,12 +37,7 @@ void mainboard_save_dimm_info(void)
char part_num_store[DIMM_INFO_PART_NUMBER_SIZE]; char part_num_store[DIMM_INFO_PART_NUMBER_SIZE];
const char *part_num = NULL; const char *part_num = NULL;
if (!CONFIG(DRAM_PART_NUM_IN_CBI)) { if (CONFIG(DRAM_PART_NUM_NOT_ALWAYS_IN_CBI)) {
save_dimm_info_by_sku_config();
return;
}
if (!CONFIG(DRAM_PART_NUM_ALWAYS_IN_CBI)) {
/* Fall back on part numbers encoded in lp4cfg array. */ /* Fall back on part numbers encoded in lp4cfg array. */
if ((int)board_id() < CONFIG_DRAM_PART_IN_CBI_BOARD_ID_MIN) { if ((int)board_id() < CONFIG_DRAM_PART_IN_CBI_BOARD_ID_MIN) {
save_dimm_info_by_sku_config(); save_dimm_info_by_sku_config();

5
src/mainboard/google/octopus/variants/baseboard/memory.c
View File

@ -205,10 +205,7 @@ static const struct lpddr4_cfg cbi_lp4cfg = {
const struct lpddr4_cfg *__weak variant_lpddr4_config(void) const struct lpddr4_cfg *__weak variant_lpddr4_config(void)
{ {
if (!CONFIG(DRAM_PART_NUM_IN_CBI)) if (CONFIG(DRAM_PART_NUM_NOT_ALWAYS_IN_CBI)) {
return &non_cbi_lp4cfg;
if (!CONFIG(DRAM_PART_NUM_ALWAYS_IN_CBI)) {
/* Fall back non cbi memory config. */ /* Fall back non cbi memory config. */
if ((int)board_id() < CONFIG_DRAM_PART_IN_CBI_BOARD_ID_MIN) if ((int)board_id() < CONFIG_DRAM_PART_IN_CBI_BOARD_ID_MIN)
return &non_cbi_lp4cfg; return &non_cbi_lp4cfg;