summaryrefslogtreecommitdiff
path: root/src/mainboard/google/octopus/variants/baseboard
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2019-06-10 10:37:40 -0600
committerAaron Durbin <adurbin@chromium.org>2019-06-12 18:15:48 +0000
commit702d2364bd6aef6871201fc324534c2695e1a632 (patch)
treebf6957a9d9e0178f34e7c4ce431d785db97300df /src/mainboard/google/octopus/variants/baseboard
parent58ed173a2c8c42bf9d074e026ecedad14ef42f90 (diff)
downloadcoreboot-702d2364bd6aef6871201fc324534c2695e1a632.tar.xz
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>
Diffstat (limited to 'src/mainboard/google/octopus/variants/baseboard')
-rw-r--r--src/mainboard/google/octopus/variants/baseboard/memory.c5
1 files changed, 1 insertions, 4 deletions
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;