mb/google/rambi: Use <device/dram/ddr3.h>
Change-Id: I3aa669042908b92d7b270df077a352e197071780
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/82354
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/src/mainboard/google/rambi/romstage.c b/src/mainboard/google/rambi/romstage.c
index 28496b1..b9aa870 100644
--- a/src/mainboard/google/rambi/romstage.c
+++ b/src/mainboard/google/rambi/romstage.c
@@ -2,6 +2,7 @@
#include <cbfs.h>
#include <console/console.h>
+#include <device/dram/ddr3.h>
#include <soc/gpio.h>
#include <soc/mrc_wrapper.h>
#include <soc/romstage.h>
@@ -38,7 +39,7 @@
if (dual_channel_config & (1 << ram_id))
*dual = 1;
- return &spd_file_content[SPD_SIZE * ram_id];
+ return &spd_file_content[SPD_SIZE_MAX_DDR3 * ram_id];
}
void mainboard_fill_mrc_params(struct mrc_params *mp)
@@ -52,7 +53,7 @@
if (!spd_file)
die("SPD data not found.");
- spd_content = get_spd_pointer(spd_file, spd_fsize / SPD_SIZE,
+ spd_content = get_spd_pointer(spd_file, spd_fsize / SPD_SIZE_MAX_DDR3,
&dual_channel);
mp->mainboard.dram_type = DRAM_DDR3L;
diff --git a/src/mainboard/google/rambi/variants/banjo/include/variant/variant.h b/src/mainboard/google/rambi/variants/banjo/include/variant/variant.h
index c9cf327..47e0a26 100644
--- a/src/mainboard/google/rambi/variants/banjo/include/variant/variant.h
+++ b/src/mainboard/google/rambi/variants/banjo/include/variant/variant.h
@@ -18,7 +18,6 @@
static const uint32_t dual_channel_config =
(1 << 1) | (1 << 3) | (1 << 5);
-#define SPD_SIZE 256
#define GPIO_SSUS_37_PAD 57
#define GPIO_SSUS_38_PAD 50
#define GPIO_SSUS_39_PAD 58
diff --git a/src/mainboard/google/rambi/variants/candy/include/variant/variant.h b/src/mainboard/google/rambi/variants/candy/include/variant/variant.h
index dcecbbe..33ad2e6 100644
--- a/src/mainboard/google/rambi/variants/candy/include/variant/variant.h
+++ b/src/mainboard/google/rambi/variants/candy/include/variant/variant.h
@@ -24,7 +24,6 @@
static const uint32_t dual_channel_config =
(1 << 0) | (1 << 1) | (1 << 2) | (1 << 6) | (1 << 7) | (1 << 10);
-#define SPD_SIZE 256
#define GPIO_SSUS_37_PAD 57
#define GPIO_SSUS_38_PAD 50
#define GPIO_SSUS_39_PAD 58
diff --git a/src/mainboard/google/rambi/variants/clapper/include/variant/variant.h b/src/mainboard/google/rambi/variants/clapper/include/variant/variant.h
index c41b4aa..5105201 100644
--- a/src/mainboard/google/rambi/variants/clapper/include/variant/variant.h
+++ b/src/mainboard/google/rambi/variants/clapper/include/variant/variant.h
@@ -20,7 +20,6 @@
static const uint32_t dual_channel_config =
(1 << 0) | (1 << 1) | (1 << 2) | (1 << 3) | (1 << 6);
-#define SPD_SIZE 256
#define GPIO_SSUS_37_PAD 57
#define GPIO_SSUS_38_PAD 50
#define GPIO_SSUS_39_PAD 58
diff --git a/src/mainboard/google/rambi/variants/enguarde/include/variant/variant.h b/src/mainboard/google/rambi/variants/enguarde/include/variant/variant.h
index 8944e7b..60c424d 100644
--- a/src/mainboard/google/rambi/variants/enguarde/include/variant/variant.h
+++ b/src/mainboard/google/rambi/variants/enguarde/include/variant/variant.h
@@ -20,7 +20,6 @@
static const uint32_t dual_channel_config =
(1 << 0) | (1 << 1) | (1 << 2) | (1 << 3) | (1 << 5) | (1 << 6);
-#define SPD_SIZE 256
#define GPIO_SSUS_37_PAD 57
#define GPIO_SSUS_38_PAD 50
#define GPIO_SSUS_39_PAD 58
diff --git a/src/mainboard/google/rambi/variants/expresso/include/variant/variant.h b/src/mainboard/google/rambi/variants/expresso/include/variant/variant.h
index 17d9acc3..1536601 100644
--- a/src/mainboard/google/rambi/variants/expresso/include/variant/variant.h
+++ b/src/mainboard/google/rambi/variants/expresso/include/variant/variant.h
@@ -18,7 +18,6 @@
static const uint32_t dual_channel_config =
(1 << 0) | (1 << 1) | (1 << 2) | (1 << 3);
-#define SPD_SIZE 256
#define GPIO_SSUS_37_PAD 57
#define GPIO_SSUS_38_PAD 50
#define GPIO_SSUS_39_PAD 58
diff --git a/src/mainboard/google/rambi/variants/glimmer/include/variant/variant.h b/src/mainboard/google/rambi/variants/glimmer/include/variant/variant.h
index d581de8..e264023 100644
--- a/src/mainboard/google/rambi/variants/glimmer/include/variant/variant.h
+++ b/src/mainboard/google/rambi/variants/glimmer/include/variant/variant.h
@@ -24,7 +24,6 @@
(1 << 0) | (1 << 1) | (1 << 2) | (1 << 3) |
(1 << 4) | (1 << 6) | (1 << 7);
-#define SPD_SIZE 256
#define GPIO_SSUS_37_PAD 57
#define GPIO_SSUS_38_PAD 50
#define GPIO_SSUS_39_PAD 58
diff --git a/src/mainboard/google/rambi/variants/gnawty/include/variant/variant.h b/src/mainboard/google/rambi/variants/gnawty/include/variant/variant.h
index 50e9ad8..4df3c8d 100644
--- a/src/mainboard/google/rambi/variants/gnawty/include/variant/variant.h
+++ b/src/mainboard/google/rambi/variants/gnawty/include/variant/variant.h
@@ -20,7 +20,6 @@
static const uint32_t dual_channel_config =
(1 << 0) | (1 << 1) | (1 << 2) | (1 << 6) | (1 << 7);
-#define SPD_SIZE 256
#define GPIO_SSUS_37_PAD 57
#define GPIO_SSUS_38_PAD 50
#define GPIO_SSUS_39_PAD 58
diff --git a/src/mainboard/google/rambi/variants/heli/include/variant/variant.h b/src/mainboard/google/rambi/variants/heli/include/variant/variant.h
index 2e00104..b357c6f 100644
--- a/src/mainboard/google/rambi/variants/heli/include/variant/variant.h
+++ b/src/mainboard/google/rambi/variants/heli/include/variant/variant.h
@@ -18,7 +18,6 @@
static const uint32_t dual_channel_config =
(1 << 6) | (1 << 7);
-#define SPD_SIZE 256
#define GPIO_SSUS_37_PAD 57
#define GPIO_SSUS_38_PAD 50
#define GPIO_SSUS_39_PAD 58
diff --git a/src/mainboard/google/rambi/variants/kip/include/variant/variant.h b/src/mainboard/google/rambi/variants/kip/include/variant/variant.h
index 25c3f37..ea3e892 100644
--- a/src/mainboard/google/rambi/variants/kip/include/variant/variant.h
+++ b/src/mainboard/google/rambi/variants/kip/include/variant/variant.h
@@ -20,7 +20,6 @@
static const uint32_t dual_channel_config =
(1 << 0) | (1 << 1) | (1 << 2) | (1 << 3);
-#define SPD_SIZE 256
#define GPIO_SSUS_37_PAD 57
#define GPIO_SSUS_38_PAD 50
#define GPIO_SSUS_39_PAD 58
diff --git a/src/mainboard/google/rambi/variants/ninja/include/variant/variant.h b/src/mainboard/google/rambi/variants/ninja/include/variant/variant.h
index 8a48c11..7b20daf 100644
--- a/src/mainboard/google/rambi/variants/ninja/include/variant/variant.h
+++ b/src/mainboard/google/rambi/variants/ninja/include/variant/variant.h
@@ -20,7 +20,6 @@
static const uint32_t dual_channel_config =
(1 << 0) | (1 << 1) | (1 << 2) | (1 << 3) | (1 << 6);
-#define SPD_SIZE 256
#define GPIO_SSUS_37_PAD 57
#define GPIO_SSUS_38_PAD 50
#define GPIO_SSUS_39_PAD 58
diff --git a/src/mainboard/google/rambi/variants/orco/include/variant/variant.h b/src/mainboard/google/rambi/variants/orco/include/variant/variant.h
index 4d8eebb..16d3971 100644
--- a/src/mainboard/google/rambi/variants/orco/include/variant/variant.h
+++ b/src/mainboard/google/rambi/variants/orco/include/variant/variant.h
@@ -20,7 +20,6 @@
static const uint32_t dual_channel_config =
(1 << 0) | (1 << 1) | (1 << 2) | (1 << 3) | (1 << 6);
-#define SPD_SIZE 256
#define GPIO_SSUS_37_PAD 57
#define GPIO_SSUS_38_PAD 50
#define GPIO_SSUS_39_PAD 58
diff --git a/src/mainboard/google/rambi/variants/quawks/include/variant/variant.h b/src/mainboard/google/rambi/variants/quawks/include/variant/variant.h
index 51051e2..d74551e 100644
--- a/src/mainboard/google/rambi/variants/quawks/include/variant/variant.h
+++ b/src/mainboard/google/rambi/variants/quawks/include/variant/variant.h
@@ -20,7 +20,6 @@
static const uint32_t dual_channel_config =
(1 << 0) | (1 << 1) | (1 << 2) | (1 << 3);
-#define SPD_SIZE 256
#define GPIO_SSUS_37_PAD 57
#define GPIO_SSUS_38_PAD 50
#define GPIO_SSUS_39_PAD 58
diff --git a/src/mainboard/google/rambi/variants/rambi/include/variant/variant.h b/src/mainboard/google/rambi/variants/rambi/include/variant/variant.h
index 46ee249..a9bd04c 100644
--- a/src/mainboard/google/rambi/variants/rambi/include/variant/variant.h
+++ b/src/mainboard/google/rambi/variants/rambi/include/variant/variant.h
@@ -17,7 +17,6 @@
static const uint32_t dual_channel_config =
(1 << 0) | (1 << 1) | (1 << 2) | (1 << 3);
-#define SPD_SIZE 256
#define GPIO_SSUS_37_PAD 57
#define GPIO_SSUS_38_PAD 50
#define GPIO_SSUS_39_PAD 58
diff --git a/src/mainboard/google/rambi/variants/squawks/include/variant/variant.h b/src/mainboard/google/rambi/variants/squawks/include/variant/variant.h
index 51051e2..d74551e 100644
--- a/src/mainboard/google/rambi/variants/squawks/include/variant/variant.h
+++ b/src/mainboard/google/rambi/variants/squawks/include/variant/variant.h
@@ -20,7 +20,6 @@
static const uint32_t dual_channel_config =
(1 << 0) | (1 << 1) | (1 << 2) | (1 << 3);
-#define SPD_SIZE 256
#define GPIO_SSUS_37_PAD 57
#define GPIO_SSUS_38_PAD 50
#define GPIO_SSUS_39_PAD 58
diff --git a/src/mainboard/google/rambi/variants/sumo/include/variant/variant.h b/src/mainboard/google/rambi/variants/sumo/include/variant/variant.h
index 8a48c11..7b20daf 100644
--- a/src/mainboard/google/rambi/variants/sumo/include/variant/variant.h
+++ b/src/mainboard/google/rambi/variants/sumo/include/variant/variant.h
@@ -20,7 +20,6 @@
static const uint32_t dual_channel_config =
(1 << 0) | (1 << 1) | (1 << 2) | (1 << 3) | (1 << 6);
-#define SPD_SIZE 256
#define GPIO_SSUS_37_PAD 57
#define GPIO_SSUS_38_PAD 50
#define GPIO_SSUS_39_PAD 58
diff --git a/src/mainboard/google/rambi/variants/swanky/include/variant/variant.h b/src/mainboard/google/rambi/variants/swanky/include/variant/variant.h
index 97094a9..f5ec6a6 100644
--- a/src/mainboard/google/rambi/variants/swanky/include/variant/variant.h
+++ b/src/mainboard/google/rambi/variants/swanky/include/variant/variant.h
@@ -16,7 +16,6 @@
static const uint32_t dual_channel_config =
(1 << 2) | (1 << 3);
-#define SPD_SIZE 256
#define GPIO_SSUS_37_PAD 57
#define GPIO_SSUS_38_PAD 50
#define GPIO_SSUS_39_PAD 58
diff --git a/src/mainboard/google/rambi/variants/winky/include/variant/variant.h b/src/mainboard/google/rambi/variants/winky/include/variant/variant.h
index f4aa213..2238233 100644
--- a/src/mainboard/google/rambi/variants/winky/include/variant/variant.h
+++ b/src/mainboard/google/rambi/variants/winky/include/variant/variant.h
@@ -18,7 +18,6 @@
static const uint32_t dual_channel_config =
(1 << 0) | (1 << 1) | (1 << 2) | (1 << 3);
-#define SPD_SIZE 256
#define GPIO_SSUS_37_PAD 57
#define GPIO_SSUS_38_PAD 50
#define GPIO_SSUS_39_PAD 58