diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2019-06-10 10:37:40 -0600 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2019-06-12 18:15:48 +0000 |
| commit | 702d2364bd6aef6871201fc324534c2695e1a632 (patch) | |
| tree | bf6957a9d9e0178f34e7c4ce431d785db97300df | |
| parent | 58ed173a2c8c42bf9d074e026ecedad14ef42f90 (diff) | |
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>
| -rw-r--r-- | src/mainboard/google/octopus/Kconfig | 22 | ||||
| -rw-r--r-- | src/mainboard/google/octopus/romstage.c | 7 | ||||
| -rw-r--r-- | src/mainboard/google/octopus/variants/baseboard/memory.c | 5 |
3 files changed, 9 insertions, 25 deletions
diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig index 48753ed4b1..8ca9251cfc 100644 --- a/src/mainboard/google/octopus/Kconfig +++ b/src/mainboard/google/octopus/Kconfig @@ -121,26 +121,18 @@ config TPM_TIS_ACPI_INTERRUPT int default 63 # GPE0_DW1_31 (GPIO_63) -config DRAM_PART_NUM_IN_CBI +config DRAM_PART_NUM_NOT_ALWAYS_IN_CBI 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_CASTA - default y if BOARD_GOOGLE_BLOOG - -config DRAM_PART_NUM_ALWAYS_IN_CBI - bool - 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 + default y if BOARD_GOOGLE_FLEEX + default y if BOARD_GOOGLE_MEEP + default y if BOARD_GOOGLE_OCTOPUS + default y if BOARD_GOOGLE_PHASER + default y if BOARD_GOOGLE_YORP config DRAM_PART_IN_CBI_BOARD_ID_MIN 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 2 if BOARD_GOOGLE_PHASER default 2 if BOARD_GOOGLE_FLEEX diff --git a/src/mainboard/google/octopus/romstage.c b/src/mainboard/google/octopus/romstage.c index ff0354dc10..d878d0d33f 100644 --- a/src/mainboard/google/octopus/romstage.c +++ b/src/mainboard/google/octopus/romstage.c @@ -37,12 +37,7 @@ void mainboard_save_dimm_info(void) char part_num_store[DIMM_INFO_PART_NUMBER_SIZE]; const char *part_num = NULL; - if (!CONFIG(DRAM_PART_NUM_IN_CBI)) { - save_dimm_info_by_sku_config(); - return; - } - - if (!CONFIG(DRAM_PART_NUM_ALWAYS_IN_CBI)) { + if (CONFIG(DRAM_PART_NUM_NOT_ALWAYS_IN_CBI)) { /* Fall back on part numbers encoded in lp4cfg array. */ if ((int)board_id() < CONFIG_DRAM_PART_IN_CBI_BOARD_ID_MIN) { save_dimm_info_by_sku_config(); diff --git a/src/mainboard/google/octopus/variants/baseboard/memory.c b/src/mainboard/google/octopus/variants/baseboard/memory.c index fc7c87dcb2..604295b283 100644 --- a/src/mainboard/google/octopus/variants/baseboard/memory.c +++ b/src/mainboard/google/octopus/variants/baseboard/memory.c @@ -205,10 +205,7 @@ static const struct lpddr4_cfg cbi_lp4cfg = { const struct lpddr4_cfg *__weak variant_lpddr4_config(void) { - if (!CONFIG(DRAM_PART_NUM_IN_CBI)) - return &non_cbi_lp4cfg; - - if (!CONFIG(DRAM_PART_NUM_ALWAYS_IN_CBI)) { + if (CONFIG(DRAM_PART_NUM_NOT_ALWAYS_IN_CBI)) { /* Fall back non cbi memory config. */ if ((int)board_id() < CONFIG_DRAM_PART_IN_CBI_BOARD_ID_MIN) return &non_cbi_lp4cfg; |