nb/intel/x4x: Place raminit definitions in raminit.h

There's no need to have implementation details in a public header.

Tested with BUILD_TIMELESS=1, Asus P5QL PRO remains identical.

Change-Id: I04d8c610d3e52adecfe96cc435f0523bedf3060a
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45424
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>

8 files changed, 259 insertions, 245 deletions

diff --git a/src/northbridge/intel/x4x/dq_dqs.c b/src/northbridge/intel/x4x/dq_dqs.c
index 1535452c1f..4362bd6307 100644
--- a/src/northbridge/intel/x4x/dq_dqs.c
+++ b/src/northbridge/intel/x4x/dq_dqs.c
@@ -5,6 +5,7 @@
 #include <delay.h>
 #include <string.h>
 #include <types.h>
+#include "raminit.h"
 #include "x4x.h"
 
 static void print_dll_setting(const struct dll_setting *dll_setting,
diff --git a/src/northbridge/intel/x4x/raminit.c b/src/northbridge/intel/x4x/raminit.c
index a1be5aa449..00cc6096a3 100644
--- a/src/northbridge/intel/x4x/raminit.c
+++ b/src/northbridge/intel/x4x/raminit.c
@@ -14,6 +14,7 @@
 #include <timestamp.h>
 #include <types.h>
 
+#include "raminit.h"
 #include "x4x.h"
 
 #define MRC_CACHE_VERSION 0
diff --git a/src/northbridge/intel/x4x/raminit.h b/src/northbridge/intel/x4x/raminit.h
new file mode 100644
index 0000000000..ca58b1f5c0
--- /dev/null
+++ b/src/northbridge/intel/x4x/raminit.h
@@ -0,0 +1,247 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef __X4X_RAMINIT_H__
+#define __X4X_RAMINIT_H__
+
+#include <stdint.h>
+
+#define NOP_CMD		0x2
+#define PRECHARGE_CMD	0x4
+#define MRS_CMD		0x6
+#define EMRS_CMD	0x8
+#define EMRS1_CMD	(EMRS_CMD | 0x10)
+#define EMRS2_CMD	(EMRS_CMD | 0x20)
+#define EMRS3_CMD	(EMRS_CMD | 0x30)
+#define ZQCAL_CMD	0xa
+#define CBR_CMD		0xc
+#define NORMALOP_CMD	0xe
+
+#define TOTAL_CHANNELS		2
+#define TOTAL_DIMMS		4
+#define TOTAL_BYTELANES		8
+#define DIMMS_PER_CHANNEL	(TOTAL_DIMMS / TOTAL_CHANNELS)
+#define RAW_CARD_UNPOPULATED	0xff
+#define RAW_CARD_POPULATED	0
+
+#define DIMM_IS_POPULATED(dimms, idx) (dimms[idx].card_type != RAW_CARD_UNPOPULATED)
+#define IF_DIMM_POPULATED(dimms, idx) if (dimms[idx].card_type != RAW_CARD_UNPOPULATED)
+#define ONLY_DIMMA_IS_POPULATED(dimms, ch) ( \
+	(DIMM_IS_POPULATED(dimms, (ch == 0) ? 0 : 2) && \
+	!DIMM_IS_POPULATED(dimms, (ch == 0) ? 1 : 3)))
+#define ONLY_DIMMB_IS_POPULATED(dimms, ch) ( \
+	(DIMM_IS_POPULATED(dimms, (ch == 0) ? 1 : 3) && \
+	!DIMM_IS_POPULATED(dimms, (ch == 0) ? 0 : 2)))
+#define BOTH_DIMMS_ARE_POPULATED(dimms, ch) ( \
+	(DIMM_IS_POPULATED(dimms, (ch == 0) ? 0 : 2) && \
+	(DIMM_IS_POPULATED(dimms, (ch == 0) ? 1 : 3))))
+#define FOR_EACH_DIMM(idx) \
+	for (idx = 0; idx < TOTAL_DIMMS; ++idx)
+#define FOR_EACH_POPULATED_DIMM(dimms, idx) \
+	FOR_EACH_DIMM(idx) IF_DIMM_POPULATED(dimms, idx)
+#define FOR_EACH_DIMM_IN_CHANNEL(ch, idx) \
+	for (idx = (ch) << 1; idx < ((ch) << 1) + DIMMS_PER_CHANNEL; ++idx)
+#define FOR_EACH_POPULATED_DIMM_IN_CHANNEL(dimms, ch, idx) \
+	FOR_EACH_DIMM_IN_CHANNEL(ch, idx) IF_DIMM_POPULATED(dimms, idx)
+#define CHANNEL_IS_POPULATED(dimms, idx) \
+	((dimms[idx<<1].card_type != RAW_CARD_UNPOPULATED) \
+		|| (dimms[(idx<<1) + 1].card_type != RAW_CARD_UNPOPULATED))
+#define CHANNEL_IS_CARDF(dimms, idx) \
+	((dimms[idx<<1].card_type == 0xf) \
+		|| (dimms[(idx<<1) + 1].card_type == 0xf))
+#define IF_CHANNEL_POPULATED(dimms, idx) \
+	if ((dimms[idx<<1].card_type != RAW_CARD_UNPOPULATED) \
+		|| (dimms[(idx<<1) + 1].card_type != RAW_CARD_UNPOPULATED))
+#define FOR_EACH_CHANNEL(idx) \
+	for (idx = 0; idx < TOTAL_CHANNELS; ++idx)
+#define FOR_EACH_POPULATED_CHANNEL(dimms, idx) \
+	FOR_EACH_CHANNEL(idx) IF_CHANNEL_POPULATED(dimms, idx)
+
+#define RANKS_PER_CHANNEL 4
+#define RANK_IS_POPULATED(dimms, ch, r) \
+	(((dimms[ch<<1].card_type != RAW_CARD_UNPOPULATED) && ((r) < dimms[ch<<1].ranks)) || \
+	((dimms[(ch<<1) + 1].card_type != RAW_CARD_UNPOPULATED) && ((r) >= 2) && ((r) < (dimms[(ch<<1) + 1].ranks + 2))))
+#define IF_RANK_POPULATED(dimms, ch, r) \
+	if (((dimms[ch<<1].card_type != RAW_CARD_UNPOPULATED) \
+	&& ((r) < dimms[ch<<1].ranks)) \
+	|| ((dimms[(ch<<1) + 1].card_type != RAW_CARD_UNPOPULATED) \
+		&& ((r) >= 2) && ((r) < (dimms[(ch<<1) + 1].ranks + 2))))
+#define FOR_EACH_RANK_IN_CHANNEL(r) \
+	for (r = 0; r < RANKS_PER_CHANNEL; ++r)
+#define FOR_EACH_POPULATED_RANK_IN_CHANNEL(dimms, ch, r) \
+	FOR_EACH_RANK_IN_CHANNEL(r) IF_RANK_POPULATED(dimms, ch, r)
+#define FOR_EACH_RANK(ch, r) \
+	FOR_EACH_CHANNEL(ch) FOR_EACH_RANK_IN_CHANNEL(r)
+#define FOR_EACH_POPULATED_RANK(dimms, ch, r) \
+	FOR_EACH_RANK(ch, r) IF_RANK_POPULATED(dimms, ch, r)
+#define FOR_EACH_BYTELANE(l) \
+	for (l = 0; l < TOTAL_BYTELANES; l++)
+#define FOR_EACH_POPULATED_CHANNEL_AND_BYTELANE(dimms, ch, l) \
+	FOR_EACH_POPULATED_CHANNEL (dimms, ch) FOR_EACH_BYTELANE(l)
+
+#define DDR3_MAX_CAS 18
+
+enum fsb_clock {
+	FSB_CLOCK_800MHz  = 0,
+	FSB_CLOCK_1066MHz = 1,
+	FSB_CLOCK_1333MHz = 2,
+};
+
+enum mem_clock {
+	MEM_CLOCK_400MHz  = 0,
+	MEM_CLOCK_533MHz  = 1,
+	MEM_CLOCK_667MHz  = 2,
+	MEM_CLOCK_800MHz  = 3,
+	MEM_CLOCK_1066MHz = 4,
+	MEM_CLOCK_1333MHz = 5,
+};
+
+enum ddr {
+	DDR2 = 2,
+	DDR3 = 3,
+};
+
+enum ddrxspd {
+	DDR2SPD = 0x8,
+	DDR3SPD = 0xb,
+};
+
+enum chip_width { /* as in DDR3 spd */
+	CHIP_WIDTH_x4	= 0,
+	CHIP_WIDTH_x8	= 1,
+	CHIP_WIDTH_x16	= 2,
+	CHIP_WIDTH_x32	= 3,
+};
+
+enum chip_cap { /* as in DDR3 spd */
+	CHIP_CAP_256M	= 0,
+	CHIP_CAP_512M	= 1,
+	CHIP_CAP_1G	= 2,
+	CHIP_CAP_2G	= 3,
+	CHIP_CAP_4G	= 4,
+	CHIP_CAP_8G	= 5,
+	CHIP_CAP_16G	= 6,
+};
+
+struct dll_setting {
+	u8 tap;
+	u8 pi;
+	u8 db_en;
+	u8 db_sel;
+	u8 clk_delay;
+	u8 coarse;
+};
+
+struct rt_dqs_setting {
+	u8 tap;
+	u8 pi;
+};
+
+enum n_banks {
+	N_BANKS_4 = 0,
+	N_BANKS_8 = 1,
+};
+
+struct timings {
+	unsigned int	CAS;
+	unsigned int	tclk;
+	enum fsb_clock	fsb_clk;
+	enum mem_clock	mem_clk;
+	unsigned int	tRAS;
+	unsigned int	tRP;
+	unsigned int	tRCD;
+	unsigned int	tWR;
+	unsigned int	tRFC;
+	unsigned int	tWTR;
+	unsigned int	tRRD;
+	unsigned int	tRTP;
+};
+
+struct dimminfo {
+	unsigned int	card_type; /* 0xff: unpopulated, 0xa - 0xf: raw card type A - F */
+	enum chip_width	width;
+	unsigned int	page_size; /* of whole DIMM in Bytes (4096 or 8192) */
+	enum n_banks	n_banks;
+	unsigned int	ranks;
+	unsigned int	rows;
+	unsigned int	cols;
+	u16		spd_crc;
+	u8		mirrored;
+};
+
+struct rcven_timings {
+	u8 min_common_coarse;
+	u8 coarse_offset[TOTAL_BYTELANES];
+	u8 medium[TOTAL_BYTELANES];
+	u8 tap[TOTAL_BYTELANES];
+	u8 pi[TOTAL_BYTELANES];
+};
+
+/* The setup is up to two DIMMs per channel */
+struct sysinfo {
+	int		boot_path;
+	enum fsb_clock	max_fsb;
+
+	int		dimm_config[2];
+	int		spd_type;
+	int		channel_capacity[2];
+	struct timings	selected_timings;
+	struct dimminfo	dimms[4];
+	u8		spd_map[4];
+	struct rcven_timings rcven_t[TOTAL_CHANNELS];
+	/*
+	 * The rt_dqs delay register for rank 0 seems to be used
+	 * for all other ranks on the channel, so only save that
+	 */
+	struct rt_dqs_setting rt_dqs[TOTAL_CHANNELS][TOTAL_BYTELANES];
+	struct dll_setting dqs_settings[TOTAL_CHANNELS][TOTAL_BYTELANES];
+	struct dll_setting dq_settings[TOTAL_CHANNELS][TOTAL_BYTELANES];
+	u8		nmode;
+	u8		stacked_mode;
+};
+
+enum ddr2_signals {
+	CLKSET0 = 0,
+	CTRL0,
+	CLKSET1,
+	CMD,
+	CTRL1,
+	CTRL2,
+	CTRL3,
+};
+
+void sdram_initialize(int boot_path, const u8 *spd_map);
+void do_raminit(struct sysinfo *, int fast_boot);
+void rcven(struct sysinfo *s);
+u32 fsb_to_mhz(u32 speed);
+u32 ddr_to_mhz(u32 speed);
+u32 test_address(int channel, int rank);
+void dqsset(u8 ch, u8 lane, const struct dll_setting *setting);
+void dqset(u8 ch, u8 lane, const struct dll_setting *setting);
+void rt_set_dqs(u8 channel, u8 lane, u8 rank, struct rt_dqs_setting *dqs_setting);
+int do_write_training(struct sysinfo *s);
+int do_read_training(struct sysinfo *s);
+void search_write_leveling(struct sysinfo *s);
+void send_jedec_cmd(const struct sysinfo *s, u8 r, u8 ch, u8 cmd, u32 val);
+
+extern const struct dll_setting default_ddr2_667_ctrl[7];
+extern const struct dll_setting default_ddr2_800_ctrl[7];
+extern const struct dll_setting default_ddr3_800_ctrl[2][7];
+extern const struct dll_setting default_ddr3_1067_ctrl[2][7];
+extern const struct dll_setting default_ddr3_1333_ctrl[2][7];
+extern const struct dll_setting default_ddr2_667_dqs[TOTAL_BYTELANES];
+extern const struct dll_setting default_ddr2_800_dqs[TOTAL_BYTELANES];
+extern const struct dll_setting default_ddr3_800_dqs[2][TOTAL_BYTELANES];
+extern const struct dll_setting default_ddr3_1067_dqs[2][TOTAL_BYTELANES];
+extern const struct dll_setting default_ddr3_1333_dqs[2][TOTAL_BYTELANES];
+extern const struct dll_setting default_ddr2_667_dq[TOTAL_BYTELANES];
+extern const struct dll_setting default_ddr2_800_dq[TOTAL_BYTELANES];
+extern const struct dll_setting default_ddr3_800_dq[2][TOTAL_BYTELANES];
+extern const struct dll_setting default_ddr3_1067_dq[2][TOTAL_BYTELANES];
+extern const struct dll_setting default_ddr3_1333_dq[2][TOTAL_BYTELANES];
+extern const u8 ddr3_emrs1_rtt_nom_config[16][4];
+extern const u8 post_jedec_tab[3][4][2];
+extern const u32 ddr3_c2_tab[2][3][6][2];
+extern const u8 ddr3_c2_x264[3][6];
+extern const u16 ddr3_c2_x23c[3][6];
+
+#endif /* __X4X_RAMINIT_H__ */
diff --git a/src/northbridge/intel/x4x/raminit_ddr23.c b/src/northbridge/intel/x4x/raminit_ddr23.c
index 617ce11581..43b9b90cfe 100644
--- a/src/northbridge/intel/x4x/raminit_ddr23.c
+++ b/src/northbridge/intel/x4x/raminit_ddr23.c
@@ -13,6 +13,7 @@
 #include <southbridge/intel/i82801jx/i82801jx.h>
 #endif
 #include <string.h>
+#include "raminit.h"
 #include "x4x.h"
 
 #define ME_UMA_SIZEMB 0
diff --git a/src/northbridge/intel/x4x/raminit_tables.c b/src/northbridge/intel/x4x/raminit_tables.c
index e4a80d8441..2ae3c06054 100644
--- a/src/northbridge/intel/x4x/raminit_tables.c
+++ b/src/northbridge/intel/x4x/raminit_tables.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include <stdint.h>
-#include "x4x.h"
+#include "raminit.h"
 
 const struct dll_setting default_ddr2_667_ctrl[7] = {
 	/* tap  pi db  delay coarse*/
diff --git a/src/northbridge/intel/x4x/rcven.c b/src/northbridge/intel/x4x/rcven.c
index 82481abe30..8a86ce9cb5 100644
--- a/src/northbridge/intel/x4x/rcven.c
+++ b/src/northbridge/intel/x4x/rcven.c
@@ -3,6 +3,7 @@
 #include <device/mmio.h>
 #include <console/console.h>
 #include <delay.h>
+#include "raminit.h"
 #include "x4x.h"
 
 #define MAX_COARSE 15
diff --git a/src/northbridge/intel/x4x/romstage.c b/src/northbridge/intel/x4x/romstage.c
index 5a30a8040a..648520c038 100644
--- a/src/northbridge/intel/x4x/romstage.c
+++ b/src/northbridge/intel/x4x/romstage.c
@@ -2,7 +2,6 @@
 
 #include <console/console.h>
 #include <southbridge/intel/common/pmclib.h>
-#include <northbridge/intel/x4x/x4x.h>
 #include <arch/romstage.h>
 
 #if CONFIG(SOUTHBRIDGE_INTEL_I82801JX)
@@ -11,6 +10,9 @@
 #include <southbridge/intel/i82801gx/i82801gx.h>
 #endif
 
+#include "raminit.h"
+#include "x4x.h"
+
 __weak void mb_pre_raminit_setup(int s3_resume)
 {
 }
diff --git a/src/northbridge/intel/x4x/x4x.h b/src/northbridge/intel/x4x/x4x.h
index 25345756e0..ea34fe0b7a 100644
--- a/src/northbridge/intel/x4x/x4x.h
+++ b/src/northbridge/intel/x4x/x4x.h
@@ -6,6 +6,10 @@
 #include <stdint.h>
 #include "memmap.h"
 
+#define BOOT_PATH_NORMAL	0
+#define BOOT_PATH_WARM_RESET	1
+#define BOOT_PATH_RESUME	2
+
 /*
  * D0:F0
  */
@@ -161,215 +165,6 @@
 
 #define EP_PORTARB(x)	(0x100 + 4 * (x))	/* 256bit */
 
-
-
-#define NOP_CMD		0x2
-#define PRECHARGE_CMD	0x4
-#define MRS_CMD		0x6
-#define EMRS_CMD	0x8
-#define EMRS1_CMD	(EMRS_CMD | 0x10)
-#define EMRS2_CMD	(EMRS_CMD | 0x20)
-#define EMRS3_CMD	(EMRS_CMD | 0x30)
-#define ZQCAL_CMD	0xa
-#define CBR_CMD		0xc
-#define NORMALOP_CMD	0xe
-
-#define TOTAL_CHANNELS		2
-#define TOTAL_DIMMS		4
-#define TOTAL_BYTELANES		8
-#define DIMMS_PER_CHANNEL	(TOTAL_DIMMS / TOTAL_CHANNELS)
-#define RAW_CARD_UNPOPULATED	0xff
-#define RAW_CARD_POPULATED	0
-
-#define DIMM_IS_POPULATED(dimms, idx) (dimms[idx].card_type != RAW_CARD_UNPOPULATED)
-#define IF_DIMM_POPULATED(dimms, idx) if (dimms[idx].card_type != RAW_CARD_UNPOPULATED)
-#define ONLY_DIMMA_IS_POPULATED(dimms, ch) ( \
-	(DIMM_IS_POPULATED(dimms, (ch == 0) ? 0 : 2) && \
-	!DIMM_IS_POPULATED(dimms, (ch == 0) ? 1 : 3)))
-#define ONLY_DIMMB_IS_POPULATED(dimms, ch) ( \
-	(DIMM_IS_POPULATED(dimms, (ch == 0) ? 1 : 3) && \
-	!DIMM_IS_POPULATED(dimms, (ch == 0) ? 0 : 2)))
-#define BOTH_DIMMS_ARE_POPULATED(dimms, ch) ( \
-	(DIMM_IS_POPULATED(dimms, (ch == 0) ? 0 : 2) && \
-	(DIMM_IS_POPULATED(dimms, (ch == 0) ? 1 : 3))))
-#define FOR_EACH_DIMM(idx) \
-	for (idx = 0; idx < TOTAL_DIMMS; ++idx)
-#define FOR_EACH_POPULATED_DIMM(dimms, idx) \
-	FOR_EACH_DIMM(idx) IF_DIMM_POPULATED(dimms, idx)
-#define FOR_EACH_DIMM_IN_CHANNEL(ch, idx) \
-	for (idx = (ch) << 1; idx < ((ch) << 1) + DIMMS_PER_CHANNEL; ++idx)
-#define FOR_EACH_POPULATED_DIMM_IN_CHANNEL(dimms, ch, idx) \
-	FOR_EACH_DIMM_IN_CHANNEL(ch, idx) IF_DIMM_POPULATED(dimms, idx)
-#define CHANNEL_IS_POPULATED(dimms, idx) \
-	((dimms[idx<<1].card_type != RAW_CARD_UNPOPULATED) \
-		|| (dimms[(idx<<1) + 1].card_type != RAW_CARD_UNPOPULATED))
-#define CHANNEL_IS_CARDF(dimms, idx) \
-	((dimms[idx<<1].card_type == 0xf) \
-		|| (dimms[(idx<<1) + 1].card_type == 0xf))
-#define IF_CHANNEL_POPULATED(dimms, idx) \
-	if ((dimms[idx<<1].card_type != RAW_CARD_UNPOPULATED) \
-		|| (dimms[(idx<<1) + 1].card_type != RAW_CARD_UNPOPULATED))
-#define FOR_EACH_CHANNEL(idx) \
-	for (idx = 0; idx < TOTAL_CHANNELS; ++idx)
-#define FOR_EACH_POPULATED_CHANNEL(dimms, idx) \
-	FOR_EACH_CHANNEL(idx) IF_CHANNEL_POPULATED(dimms, idx)
-
-#define RANKS_PER_CHANNEL 4
-#define RANK_IS_POPULATED(dimms, ch, r) \
-	(((dimms[ch<<1].card_type != RAW_CARD_UNPOPULATED) && ((r) < dimms[ch<<1].ranks)) || \
-	((dimms[(ch<<1) + 1].card_type != RAW_CARD_UNPOPULATED) && ((r) >= 2) && ((r) < (dimms[(ch<<1) + 1].ranks + 2))))
-#define IF_RANK_POPULATED(dimms, ch, r) \
-	if (((dimms[ch<<1].card_type != RAW_CARD_UNPOPULATED) \
-	&& ((r) < dimms[ch<<1].ranks)) \
-	|| ((dimms[(ch<<1) + 1].card_type != RAW_CARD_UNPOPULATED) \
-		&& ((r) >= 2) && ((r) < (dimms[(ch<<1) + 1].ranks + 2))))
-#define FOR_EACH_RANK_IN_CHANNEL(r) \
-	for (r = 0; r < RANKS_PER_CHANNEL; ++r)
-#define FOR_EACH_POPULATED_RANK_IN_CHANNEL(dimms, ch, r) \
-	FOR_EACH_RANK_IN_CHANNEL(r) IF_RANK_POPULATED(dimms, ch, r)
-#define FOR_EACH_RANK(ch, r) \
-	FOR_EACH_CHANNEL(ch) FOR_EACH_RANK_IN_CHANNEL(r)
-#define FOR_EACH_POPULATED_RANK(dimms, ch, r) \
-	FOR_EACH_RANK(ch, r) IF_RANK_POPULATED(dimms, ch, r)
-#define FOR_EACH_BYTELANE(l) \
-	for (l = 0; l < TOTAL_BYTELANES; l++)
-#define FOR_EACH_POPULATED_CHANNEL_AND_BYTELANE(dimms, ch, l) \
-	FOR_EACH_POPULATED_CHANNEL (dimms, ch) FOR_EACH_BYTELANE(l)
-
-#define DDR3_MAX_CAS 18
-
-enum fsb_clock {
-	FSB_CLOCK_800MHz  = 0,
-	FSB_CLOCK_1066MHz = 1,
-	FSB_CLOCK_1333MHz = 2,
-};
-
-enum mem_clock {
-	MEM_CLOCK_400MHz  = 0,
-	MEM_CLOCK_533MHz  = 1,
-	MEM_CLOCK_667MHz  = 2,
-	MEM_CLOCK_800MHz  = 3,
-	MEM_CLOCK_1066MHz = 4,
-	MEM_CLOCK_1333MHz = 5,
-};
-
-enum ddr {
-	DDR2 = 2,
-	DDR3 = 3,
-};
-
-enum ddrxspd {
-	DDR2SPD = 0x8,
-	DDR3SPD = 0xb,
-};
-
-enum chip_width { /* as in DDR3 spd */
-	CHIP_WIDTH_x4	= 0,
-	CHIP_WIDTH_x8	= 1,
-	CHIP_WIDTH_x16	= 2,
-	CHIP_WIDTH_x32	= 3,
-};
-
-enum chip_cap { /* as in DDR3 spd */
-	CHIP_CAP_256M	= 0,
-	CHIP_CAP_512M	= 1,
-	CHIP_CAP_1G	= 2,
-	CHIP_CAP_2G	= 3,
-	CHIP_CAP_4G	= 4,
-	CHIP_CAP_8G	= 5,
-	CHIP_CAP_16G	= 6,
-};
-
-struct dll_setting {
-	u8 tap;
-	u8 pi;
-	u8 db_en;
-	u8 db_sel;
-	u8 clk_delay;
-	u8 coarse;
-};
-
-struct rt_dqs_setting {
-	u8 tap;
-	u8 pi;
-};
-
-enum n_banks {
-	N_BANKS_4 = 0,
-	N_BANKS_8 = 1,
-};
-
-struct timings {
-	unsigned int	CAS;
-	unsigned int	tclk;
-	enum fsb_clock	fsb_clk;
-	enum mem_clock	mem_clk;
-	unsigned int	tRAS;
-	unsigned int	tRP;
-	unsigned int	tRCD;
-	unsigned int	tWR;
-	unsigned int	tRFC;
-	unsigned int	tWTR;
-	unsigned int	tRRD;
-	unsigned int	tRTP;
-};
-
-struct dimminfo {
-	unsigned int	card_type; /* 0xff: unpopulated, 0xa - 0xf: raw card type A - F */
-	enum chip_width	width;
-	unsigned int	page_size; /* of whole DIMM in Bytes (4096 or 8192) */
-	enum n_banks	n_banks;
-	unsigned int	ranks;
-	unsigned int	rows;
-	unsigned int	cols;
-	u16		spd_crc;
-	u8		mirrored;
-};
-
-struct rcven_timings {
-	u8 min_common_coarse;
-	u8 coarse_offset[TOTAL_BYTELANES];
-	u8 medium[TOTAL_BYTELANES];
-	u8 tap[TOTAL_BYTELANES];
-	u8 pi[TOTAL_BYTELANES];
-};
-
-/* The setup is up to two DIMMs per channel */
-struct sysinfo {
-	int		boot_path;
-	enum fsb_clock	max_fsb;
-
-	int		dimm_config[2];
-	int		spd_type;
-	int		channel_capacity[2];
-	struct timings	selected_timings;
-	struct dimminfo	dimms[4];
-	u8		spd_map[4];
-	struct rcven_timings rcven_t[TOTAL_CHANNELS];
-	/*
-	 * The rt_dqs delay register for rank 0 seems to be used
-	 * for all other ranks on the channel, so only save that
-	 */
-	struct rt_dqs_setting rt_dqs[TOTAL_CHANNELS][TOTAL_BYTELANES];
-	struct dll_setting dqs_settings[TOTAL_CHANNELS][TOTAL_BYTELANES];
-	struct dll_setting dq_settings[TOTAL_CHANNELS][TOTAL_BYTELANES];
-	u8		nmode;
-	u8		stacked_mode;
-};
-#define BOOT_PATH_NORMAL	0
-#define BOOT_PATH_WARM_RESET	1
-#define BOOT_PATH_RESUME	2
-
-enum ddr2_signals {
-	CLKSET0 = 0,
-	CTRL0,
-	CLKSET1,
-	CMD,
-	CTRL1,
-	CTRL2,
-	CTRL3,
-};
-
 void x4x_early_init(void);
 void x4x_late_init(int s3resume);
 void mb_get_spd_map(u8 spd_map[4]);
@@ -378,40 +173,6 @@ u32 decode_igd_memory_size(u32 gms);
 u32 decode_igd_gtt_size(u32 gsm);
 u32 decode_tseg_size(const u32 esmramc);
 int decode_pcie_bar(u32 *const base, u32 *const len);
-void sdram_initialize(int boot_path, const u8 *spd_map);
-void do_raminit(struct sysinfo *, int fast_boot);
-void rcven(struct sysinfo *s);
-u32 fsb_to_mhz(u32 speed);
-u32 ddr_to_mhz(u32 speed);
-u32 test_address(int channel, int rank);
-void dqsset(u8 ch, u8 lane, const struct dll_setting *setting);
-void dqset(u8 ch, u8 lane, const struct dll_setting *setting);
-void rt_set_dqs(u8 channel, u8 lane, u8 rank, struct rt_dqs_setting *dqs_setting);
-int do_write_training(struct sysinfo *s);
-int do_read_training(struct sysinfo *s);
-void search_write_leveling(struct sysinfo *s);
-void send_jedec_cmd(const struct sysinfo *s, u8 r, u8 ch, u8 cmd, u32 val);
-
-extern const struct dll_setting default_ddr2_667_ctrl[7];
-extern const struct dll_setting default_ddr2_800_ctrl[7];
-extern const struct dll_setting default_ddr3_800_ctrl[2][7];
-extern const struct dll_setting default_ddr3_1067_ctrl[2][7];
-extern const struct dll_setting default_ddr3_1333_ctrl[2][7];
-extern const struct dll_setting default_ddr2_667_dqs[TOTAL_BYTELANES];
-extern const struct dll_setting default_ddr2_800_dqs[TOTAL_BYTELANES];
-extern const struct dll_setting default_ddr3_800_dqs[2][TOTAL_BYTELANES];
-extern const struct dll_setting default_ddr3_1067_dqs[2][TOTAL_BYTELANES];
-extern const struct dll_setting default_ddr3_1333_dqs[2][TOTAL_BYTELANES];
-extern const struct dll_setting default_ddr2_667_dq[TOTAL_BYTELANES];
-extern const struct dll_setting default_ddr2_800_dq[TOTAL_BYTELANES];
-extern const struct dll_setting default_ddr3_800_dq[2][TOTAL_BYTELANES];
-extern const struct dll_setting default_ddr3_1067_dq[2][TOTAL_BYTELANES];
-extern const struct dll_setting default_ddr3_1333_dq[2][TOTAL_BYTELANES];
-extern const u8 ddr3_emrs1_rtt_nom_config[16][4];
-extern const u8 post_jedec_tab[3][4][2];
-extern const u32 ddr3_c2_tab[2][3][6][2];
-extern const u8 ddr3_c2_x264[3][6];
-extern const u16 ddr3_c2_x23c[3][6];
 
 #include <device/device.h>
 struct acpi_rsdp;