From: Vagrant Cascadian <vagrant@debian.org>
Date: Mon, 2 Apr 2018 01:20:06 +0000 (+0100)
Subject: i4x4-ram
X-Git-Tag: archive/raspbian/2020.07+dfsg-2+rpi1^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2~8
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=eb18611c1b4441ce0c5095ce73daedcd620f107d;p=u-boot.git

i4x4-ram


Gbp-Pq: Topic mx6cuboxi
Gbp-Pq: Name i4x4-ram.patch
---

diff --git a/board/solidrun/mx6cuboxi/Kconfig b/board/solidrun/mx6cuboxi/Kconfig
index 741c1754f..fc68eedce 100644
--- a/board/solidrun/mx6cuboxi/Kconfig
+++ b/board/solidrun/mx6cuboxi/Kconfig
@@ -9,4 +9,8 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "mx6cuboxi"
 
+config I4X4_RAM
+	bool "4GB ram support for cubox i4x4 (will break cubox i4)"
+	default n
+
 endif
diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c
index ee9e4f7c0..f4800f9ea 100644
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
@@ -600,6 +600,19 @@ static struct mx6_ddr3_cfg mem_ddr_4g = {
 	.trasmin = 3500,
 };
 
+static struct mx6_ddr3_cfg mem_ddr_8g = {
+	.mem_speed = 1600,
+	.density = 4,
+	.width = 16,
+	.banks = 8,
+	.rowaddr = 16,
+	.coladdr = 10,
+	.pagesz = 2,
+	.trcd = 1375,
+	.trcmin = 4875,
+	.trasmin = 3500,
+};
+
 static void ccgr_init(void)
 {
 	struct mxc_ccm_reg *ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
@@ -643,7 +656,11 @@ static void spl_dram_init(int width)
 	if (is_cpu_type(MXC_CPU_MX6D))
 		mx6_dram_cfg(&sysinfo, &mx6q_1g_mmcd_calib, &mem_ddr_2g);
 	else if (is_cpu_type(MXC_CPU_MX6Q))
-		mx6_dram_cfg(&sysinfo, &mx6q_2g_mmcd_calib, &mem_ddr_4g);
+		#ifdef CONFIG_I4X4_RAM
+			mx6_dram_cfg(&sysinfo, &mx6q_2g_mmcd_calib, &mem_ddr_8g);
+		#else
+			mx6_dram_cfg(&sysinfo, &mx6q_2g_mmcd_calib, &mem_ddr_4g);
+		#endif
 	else if (is_cpu_type(MXC_CPU_MX6DL))
 		mx6_dram_cfg(&sysinfo, &mx6dl_1g_mmcd_calib, &mem_ddr_2g);
 	else if (is_cpu_type(MXC_CPU_MX6SOLO))