From a27b5a3be10d02d783fc7a7b83ae98e8f8c5941a Mon Sep 17 00:00:00 2001
From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Tue, 18 Dec 2018 11:25:21 +0100
Subject: [PATCH] update Ultrascale DDRPHY

---
 litex/boards/targets/kcu105.py  |  6 +++---
 litex/soc/software/bios/sdram.c | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/litex/boards/targets/kcu105.py b/litex/boards/targets/kcu105.py
index a9e78a06..2025c497 100755
--- a/litex/boards/targets/kcu105.py
+++ b/litex/boards/targets/kcu105.py
@@ -12,7 +12,7 @@ from litex.soc.integration.soc_sdram import *
 from litex.soc.integration.builder import *
 
 from litedram.modules import EDY4016A
-from litedram.phy import kusddrphy
+from litedram.phy import usddrphy
 
 
 class _CRG(Module):
@@ -101,8 +101,8 @@ class BaseSoC(SoCSDRAM):
         self.submodules.crg = _CRG(platform)
 
         # sdram
-        self.submodules.ddrphy = kusddrphy.KUSDDRPHY(platform.request("ddram"), memtype="DDR4", sys_clk_freq=sys_clk_freq)
-        self.add_constant("KUSDDRPHY", None)
+        self.submodules.ddrphy = usddrphy.USDDRPHY(platform.request("ddram"), memtype="DDR4", sys_clk_freq=sys_clk_freq)
+        self.add_constant("USDDRPHY", None)
         sdram_module = EDY4016A(sys_clk_freq, "1:4")
         self.register_sdram(self.ddrphy,
                             sdram_module.geom_settings,
diff --git a/litex/soc/software/bios/sdram.c b/litex/soc/software/bios/sdram.c
index 57189bc4..383cc3ef 100644
--- a/litex/soc/software/bios/sdram.c
+++ b/litex/soc/software/bios/sdram.c
@@ -208,7 +208,7 @@ void sdrwr(char *startaddr)
 
 #ifdef CSR_DDRPHY_BASE
 
-#ifdef KUSDDRPHY
+#ifdef USDDRPHY
 #define ERR_DDRPHY_DELAY 512
 #else
 #define ERR_DDRPHY_DELAY 32
@@ -267,7 +267,7 @@ int write_level(void)
 		ddrphy_dly_sel_write(1 << i);
 		ddrphy_wdly_dq_rst_write(1);
 		ddrphy_wdly_dqs_rst_write(1);
-#ifdef KUSDDRPHY /* need to init manually on Ultrascale */
+#ifdef USDDRPHY /* need to init manually on Ultrascale */
 		for(j=0; j<ddrphy_half_sys8x_taps_read(); j++)
 			ddrphy_wdly_dqs_inc_write(1);
 #endif
@@ -276,7 +276,7 @@ int write_level(void)
 			int zero_count = 0;
 			int one_count = 0;
 			int show = 1;
-#ifdef KUSDDRPHY
+#ifdef USDDRPHY
 			show = (j%16 == 0);
 #endif
 			for (k=0; k<128; k++) {
@@ -320,7 +320,7 @@ int write_level(void)
 		/* configure delays */
 		ddrphy_wdly_dq_rst_write(1);
 		ddrphy_wdly_dqs_rst_write(1);
-#ifdef KUSDDRPHY /* need to init manually on Ultrascale */
+#ifdef USDDRPHY /* need to init manually on Ultrascale */
 		for(j=0; j<ddrphy_half_sys8x_taps_read(); j++)
 			ddrphy_wdly_dqs_inc_write(1);
 #endif
@@ -390,7 +390,7 @@ static int read_level_scan(int module, int bitslip)
 	for(j=0; j<ERR_DDRPHY_DELAY;j++) {
 		int working;
 		int show = 1;
-#ifdef KUSDDRPHY
+#ifdef USDDRPHY
 		show = (j%16 == 0);
 #endif
 		command_prd(DFII_COMMAND_CAS|DFII_COMMAND_CS|DFII_COMMAND_RDDATA);
@@ -478,7 +478,7 @@ static void read_level(int module)
 	delay_min = delay;
 
 	/* Get a bit further into the working zone */
-#ifdef KUSDDRPHY
+#ifdef USDDRPHY
 	for(j=0;j<16;j++) {
 		delay += 1;
 		ddrphy_rdly_dq_inc_write(1);
-- 
2.30.2