Skip to contentSkip to conversation

Add new Elpida memory configuration for ads5121

PATCH New Martha Marx 3 participants 5 messages Feb 20, 2009 – May 28, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Add new Elpida memory configuration for ads5121

Rev 3 and earlier stay with Micron memory settings. Rev 4 boards manufactured before Nov-08 #1180 also will use Micron settings. More recent boards use Elpida settings.

---
 board/ads5121/ads5121.c   |  114 +++++++++++++++++++++++++++++++++-----------
 include/configs/ads5121.h |   41 ++++++++++------
 2 files changed, 110 insertions(+), 45 deletions(-)
board/ads5121/ads5121.c +85 -29
index 6c40e94..1983492 100644
@@ -124,9 +124,15 @@ phys_size_t initdram (int board_type)
  * fixed sdram init -- the board doesn't use memory modules that have serial presence
  * detect or similar mechanism for discovery of the DRAM settings
  */
+
 long int fixed_sdram (void)
 {
+	u32 use_micron = 0;
 	volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
+	ushort brd_rev = *(vu_short *) (CONFIG_SYS_CPLD_BASE + 0x00);
+	char *mac, *end, macaddr[6];
+	u32 brddate, macchk;
+
 	u32 msize = CONFIG_SYS_DDR_SIZE * 1024 * 1024;
 	u32 msize_log2 = __ilog2 (msize);
 	u32 i;
@@ -174,41 +180,91 @@ long int fixed_sdram (void)
 	im->mddrc.lut_table4_alternate_upper = CONFIG_SYS_MDDRCGRP_LUT4_AU;
 	im->mddrc.lut_table4_alternate_lower = CONFIG_SYS_MDDRCGRP_LUT4_AL;
 
+	if (brd_rev >= 0x0400 && (mac = getenv("ethaddr"))) {
+		for (i=0; i<6; i++) {
+		 	macaddr[i] = mac ? 
+				simple_strtoul (mac, &end, 16) : 0;
+			if (mac)
+				mac = (*end) ? end+1 : end;
+		}
+		brddate = (macaddr[3] << 16) + (macaddr[4] << 8) + macaddr[5];
+		macchk = (macaddr[0] << 16) + (macaddr[1] << 8) + macaddr[2];
+		debug("brddate = %d\n\t",brddate);
+	/* Boards made before Nov-08 #1180 use Micron memory; 001e59 is the STx vendor # */
+		if (macchk == 0x001e59 && brddate <= 8111180) 
+			use_micron = 1;
+	} else if (brd_rev < 0x400) {
+		use_micron = 1;
+	}
+
+	debug("Using %s Memory settings\n\t", use_micron ? "Micron" : "Elpida");
+
 	/* Initialize MDDRC */
-	im->mddrc.ddr_sys_config = CONFIG_SYS_MDDRC_SYS_CFG;
-	im->mddrc.ddr_time_config0 = CONFIG_SYS_MDDRC_TIME_CFG0;
-	im->mddrc.ddr_time_config1 = CONFIG_SYS_MDDRC_TIME_CFG1;
-	im->mddrc.ddr_time_config2 = CONFIG_SYS_MDDRC_TIME_CFG2;
+	if (use_micron) {
+		im->mddrc.ddr_sys_config = CONFIG_SYS_MDDRC_SYS_CFG_MICRON;
+		im->mddrc.ddr_time_config0 = CONFIG_SYS_MDDRC_TIME_CFG0;
+		im->mddrc.ddr_time_config1 = CONFIG_SYS_MDDRC_TIME_CFG1_MICRON;
+		im->mddrc.ddr_time_config2 = CONFIG_SYS_MDDRC_TIME_CFG2_MICRON;
+	} else {
+		im->mddrc.ddr_sys_config = CONFIG_SYS_MDDRC_SYS_CFG_ELPIDA;
+		im->mddrc.ddr_time_config0 = CONFIG_SYS_MDDRC_TIME_CFG0;
+		im->mddrc.ddr_time_config1 = CONFIG_SYS_MDDRC_TIME_CFG1_ELPIDA;
+		im->mddrc.ddr_time_config2 = CONFIG_SYS_MDDRC_TIME_CFG2_ELPIDA;
+	}
 
 	/* Initialize DDR */
 	for (i = 0; i < 10; i++)
-		im->mddrc.ddr_command = CONFIG_SYS_MICRON_NOP;
-
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_PCHG_ALL;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_NOP;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_RFSH;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_NOP;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_RFSH;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_NOP;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_INIT_DEV_OP;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_NOP;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_EM2;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_NOP;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_PCHG_ALL;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_EM2;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_EM3;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_EN_DLL;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_INIT_DEV_OP;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_PCHG_ALL;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_RFSH;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_INIT_DEV_OP;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_OCD_DEFAULT;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_PCHG_ALL;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_NOP;
-
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_NOP;
+
+	im->mddrc.ddr_command = CONFIG_SYS_DDR_PCHG_ALL;
+	im->mddrc.ddr_command = CONFIG_SYS_DDR_NOP;
+	im->mddrc.ddr_command = CONFIG_SYS_DDR_RFSH;
+	im->mddrc.ddr_command = CONFIG_SYS_DDR_NOP;
+	im->mddrc.ddr_command = CONFIG_SYS_DDR_RFSH;
+	im->mddrc.ddr_command = CONFIG_SYS_DDR_NOP;
+
+	if (use_micron) {
+	/* Micron init sequence */
+		im->mddrc.ddr_command = CONFIG_SYS_MICRON_INIT_DEV_OP;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_NOP;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_EM2;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_NOP;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_PCHG_ALL;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_EM2;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_EM3;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_EN_DLL;
+		im->mddrc.ddr_command = CONFIG_SYS_MICRON_INIT_DEV_OP;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_PCHG_ALL;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_RFSH;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_RFSH;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_RFSH;
+		im->mddrc.ddr_command = CONFIG_SYS_MICRON_INIT_DEV_OP;
+		udelay(200);
+	} else {
+	/* Elpida init sequence - works for Micron too but runs slower */
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_EM2;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_EM3;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_EN_DLL;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_RES_DLL;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_PCHG_ALL;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_RFSH;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_RFSH;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_RFSH;
+		im->mddrc.ddr_command = CONFIG_SYS_ELPIDA_INIT_DEV_OP;
+		udelay(200);
+	}
+	im->mddrc.ddr_command = CONFIG_SYS_DDR_OCD_DEFAULT;
+	im->mddrc.ddr_command = CONFIG_SYS_DDR_OCD_EXIT;
+	im->mddrc.ddr_command = CONFIG_SYS_DDR_NOP;
+	for (i = 0; i < 10; i++)
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_NOP;
 	/* Start MDDRC */
 	im->mddrc.ddr_time_config0 = CONFIG_SYS_MDDRC_TIME_CFG0_RUN;
-	im->mddrc.ddr_sys_config = CONFIG_SYS_MDDRC_SYS_CFG_RUN;
+
+	if (use_micron)
+		im->mddrc.ddr_sys_config = CONFIG_SYS_MDDRC_SYS_CFG_MICRON_RUN;
+	else
+		im->mddrc.ddr_sys_config = CONFIG_SYS_MDDRC_SYS_CFG_ELPIDA_RUN;
 
 	return msize;
 }
include/configs/ads5121.h +25 -16

54 lines not on this page · raw message

Signature · 1 line
1.5.2.4
#1 lore raw

PATCH 1/1 Rename CONFIG_SYS_MDDRC memory constants for ADS5121

Drops the CONFIG_SYS_

---
 board/ads5121/ads5121.c   |  138 ++++++++++++++++++++++----------------------
 include/configs/ads5121.h |  104 +++++++++++++++++-----------------
 2 files changed, 121 insertions(+), 121 deletions(-)
board/ads5121/ads5121.c +69 -69
index 1983492..306f184 100644
@@ -153,32 +153,32 @@ long int fixed_sdram (void)
 	__asm__ __volatile__ ("isync");
 
 	/* Enable DDR */
-	im->mddrc.ddr_sys_config = CONFIG_SYS_MDDRC_SYS_CFG_EN;
+	im->mddrc.ddr_sys_config = MDDRC_SYS_CFG_EN;
 
 	/* Initialize DDR Priority Manager */
-	im->mddrc.prioman_config1 = CONFIG_SYS_MDDRCGRP_PM_CFG1;
-	im->mddrc.prioman_config2 = CONFIG_SYS_MDDRCGRP_PM_CFG2;
-	im->mddrc.hiprio_config = CONFIG_SYS_MDDRCGRP_HIPRIO_CFG;
-	im->mddrc.lut_table0_main_upper = CONFIG_SYS_MDDRCGRP_LUT0_MU;
-	im->mddrc.lut_table0_main_lower = CONFIG_SYS_MDDRCGRP_LUT0_ML;
-	im->mddrc.lut_table1_main_upper = CONFIG_SYS_MDDRCGRP_LUT1_MU;
-	im->mddrc.lut_table1_main_lower = CONFIG_SYS_MDDRCGRP_LUT1_ML;
-	im->mddrc.lut_table2_main_upper = CONFIG_SYS_MDDRCGRP_LUT2_MU;
-	im->mddrc.lut_table2_main_lower = CONFIG_SYS_MDDRCGRP_LUT2_ML;
-	im->mddrc.lut_table3_main_upper = CONFIG_SYS_MDDRCGRP_LUT3_MU;
-	im->mddrc.lut_table3_main_lower = CONFIG_SYS_MDDRCGRP_LUT3_ML;
-	im->mddrc.lut_table4_main_upper = CONFIG_SYS_MDDRCGRP_LUT4_MU;
-	im->mddrc.lut_table4_main_lower = CONFIG_SYS_MDDRCGRP_LUT4_ML;
-	im->mddrc.lut_table0_alternate_upper = CONFIG_SYS_MDDRCGRP_LUT0_AU;
-	im->mddrc.lut_table0_alternate_lower = CONFIG_SYS_MDDRCGRP_LUT0_AL;
-	im->mddrc.lut_table1_alternate_upper = CONFIG_SYS_MDDRCGRP_LUT1_AU;
-	im->mddrc.lut_table1_alternate_lower = CONFIG_SYS_MDDRCGRP_LUT1_AL;
-	im->mddrc.lut_table2_alternate_upper = CONFIG_SYS_MDDRCGRP_LUT2_AU;
-	im->mddrc.lut_table2_alternate_lower = CONFIG_SYS_MDDRCGRP_LUT2_AL;
-	im->mddrc.lut_table3_alternate_upper = CONFIG_SYS_MDDRCGRP_LUT3_AU;
-	im->mddrc.lut_table3_alternate_lower = CONFIG_SYS_MDDRCGRP_LUT3_AL;
-	im->mddrc.lut_table4_alternate_upper = CONFIG_SYS_MDDRCGRP_LUT4_AU;
-	im->mddrc.lut_table4_alternate_lower = CONFIG_SYS_MDDRCGRP_LUT4_AL;
+	im->mddrc.prioman_config1 = MDDRCGRP_PM_CFG1;
+	im->mddrc.prioman_config2 = MDDRCGRP_PM_CFG2;
+	im->mddrc.hiprio_config = MDDRCGRP_HIPRIO_CFG;
+	im->mddrc.lut_table0_main_upper = MDDRCGRP_LUT0_MU;
+	im->mddrc.lut_table0_main_lower = MDDRCGRP_LUT0_ML;
+	im->mddrc.lut_table1_main_upper = MDDRCGRP_LUT1_MU;
+	im->mddrc.lut_table1_main_lower = MDDRCGRP_LUT1_ML;
+	im->mddrc.lut_table2_main_upper = MDDRCGRP_LUT2_MU;
+	im->mddrc.lut_table2_main_lower = MDDRCGRP_LUT2_ML;
+	im->mddrc.lut_table3_main_upper = MDDRCGRP_LUT3_MU;
+	im->mddrc.lut_table3_main_lower = MDDRCGRP_LUT3_ML;
+	im->mddrc.lut_table4_main_upper = MDDRCGRP_LUT4_MU;
+	im->mddrc.lut_table4_main_lower = MDDRCGRP_LUT4_ML;
+	im->mddrc.lut_table0_alternate_upper = MDDRCGRP_LUT0_AU;
+	im->mddrc.lut_table0_alternate_lower = MDDRCGRP_LUT0_AL;
+	im->mddrc.lut_table1_alternate_upper = MDDRCGRP_LUT1_AU;
+	im->mddrc.lut_table1_alternate_lower = MDDRCGRP_LUT1_AL;
+	im->mddrc.lut_table2_alternate_upper = MDDRCGRP_LUT2_AU;
+	im->mddrc.lut_table2_alternate_lower = MDDRCGRP_LUT2_AL;
+	im->mddrc.lut_table3_alternate_upper = MDDRCGRP_LUT3_AU;
+	im->mddrc.lut_table3_alternate_lower = MDDRCGRP_LUT3_AL;
+	im->mddrc.lut_table4_alternate_upper = MDDRCGRP_LUT4_AU;
+	im->mddrc.lut_table4_alternate_lower = MDDRCGRP_LUT4_AL;
 
 	if (brd_rev >= 0x0400 && (mac = getenv("ethaddr"))) {
 		for (i=0; i<6; i++) {
@@ -201,70 +201,70 @@ long int fixed_sdram (void)
 
 	/* Initialize MDDRC */
 	if (use_micron) {
-		im->mddrc.ddr_sys_config = CONFIG_SYS_MDDRC_SYS_CFG_MICRON;
-		im->mddrc.ddr_time_config0 = CONFIG_SYS_MDDRC_TIME_CFG0;
-		im->mddrc.ddr_time_config1 = CONFIG_SYS_MDDRC_TIME_CFG1_MICRON;
-		im->mddrc.ddr_time_config2 = CONFIG_SYS_MDDRC_TIME_CFG2_MICRON;
+		im->mddrc.ddr_sys_config = MDDRC_SYS_CFG_MICRON;
+		im->mddrc.ddr_time_config0 = MDDRC_TIME_CFG0;
+		im->mddrc.ddr_time_config1 = MDDRC_TIME_CFG1_MICRON;
+		im->mddrc.ddr_time_config2 = MDDRC_TIME_CFG2_MICRON;
 	} else {
-		im->mddrc.ddr_sys_config = CONFIG_SYS_MDDRC_SYS_CFG_ELPIDA;
-		im->mddrc.ddr_time_config0 = CONFIG_SYS_MDDRC_TIME_CFG0;
-		im->mddrc.ddr_time_config1 = CONFIG_SYS_MDDRC_TIME_CFG1_ELPIDA;
-		im->mddrc.ddr_time_config2 = CONFIG_SYS_MDDRC_TIME_CFG2_ELPIDA;
+		im->mddrc.ddr_sys_config = MDDRC_SYS_CFG_ELPIDA;
+		im->mddrc.ddr_time_config0 = MDDRC_TIME_CFG0;
+		im->mddrc.ddr_time_config1 = MDDRC_TIME_CFG1_ELPIDA;
+		im->mddrc.ddr_time_config2 = MDDRC_TIME_CFG2_ELPIDA;
 	}
 
 	/* Initialize DDR */
 	for (i = 0; i < 10; i++)
-		im->mddrc.ddr_command = CONFIG_SYS_DDR_NOP;
+		im->mddrc.ddr_command = DDR_NOP;
 
-	im->mddrc.ddr_command = CONFIG_SYS_DDR_PCHG_ALL;
-	im->mddrc.ddr_command = CONFIG_SYS_DDR_NOP;
-	im->mddrc.ddr_command = CONFIG_SYS_DDR_RFSH;
-	im->mddrc.ddr_command = CONFIG_SYS_DDR_NOP;
-	im->mddrc.ddr_command = CONFIG_SYS_DDR_RFSH;
-	im->mddrc.ddr_command = CONFIG_SYS_DDR_NOP;
+	im->mddrc.ddr_command = DDR_PCHG_ALL;
+	im->mddrc.ddr_command = DDR_NOP;
+	im->mddrc.ddr_command = DDR_RFSH;
+	im->mddrc.ddr_command = DDR_NOP;
+	im->mddrc.ddr_command = DDR_RFSH;
+	im->mddrc.ddr_command = DDR_NOP;
 
 	if (use_micron) {
 	/* Micron init sequence */
-		im->mddrc.ddr_command = CONFIG_SYS_MICRON_INIT_DEV_OP;
-		im->mddrc.ddr_command = CONFIG_SYS_DDR_NOP;
-		im->mddrc.ddr_command = CONFIG_SYS_DDR_EM2;
-		im->mddrc.ddr_command = CONFIG_SYS_DDR_NOP;
-		im->mddrc.ddr_command = CONFIG_SYS_DDR_PCHG_ALL;
-		im->mddrc.ddr_command = CONFIG_SYS_DDR_EM2;
-		im->mddrc.ddr_command = CONFIG_SYS_DDR_EM3;
-		im->mddrc.ddr_command = CONFIG_SYS_DDR_EN_DLL;
-		im->mddrc.ddr_command = CONFIG_SYS_MICRON_INIT_DEV_OP;
-		im->mddrc.ddr_command = CONFIG_SYS_DDR_PCHG_ALL;
-		im->mddrc.ddr_command = CONFIG_SYS_DDR_RFSH;
-		im->mddrc.ddr_command = CONFIG_SYS_DDR_RFSH;
-		im->mddrc.ddr_command = CONFIG_SYS_DDR_RFSH;
-		im->mddrc.ddr_command = CONFIG_SYS_MICRON_INIT_DEV_OP;
+		im->mddrc.ddr_command = MICRON_INIT_DEV_OP;
+		im->mddrc.ddr_command = DDR_NOP;
+		im->mddrc.ddr_command = DDR_EM2;
+		im->mddrc.ddr_command = DDR_NOP;
+		im->mddrc.ddr_command = DDR_PCHG_ALL;
+		im->mddrc.ddr_command = DDR_EM2;
+		im->mddrc.ddr_command = DDR_EM3;
+		im->mddrc.ddr_command = DDR_EN_DLL;
+		im->mddrc.ddr_command = MICRON_INIT_DEV_OP;
+		im->mddrc.ddr_command = DDR_PCHG_ALL;
+		im->mddrc.ddr_command = DDR_RFSH;
+		im->mddrc.ddr_command = DDR_RFSH;
+		im->mddrc.ddr_command = DDR_RFSH;
+		im->mddrc.ddr_command = MICRON_INIT_DEV_OP;
 		udelay(200);
 	} else {
 	/* Elpida init sequence - works for Micron too but runs slower */
-		im->mddrc.ddr_command = CONFIG_SYS_DDR_EM2;
-		im->mddrc.ddr_command = CONFIG_SYS_DDR_EM3;
-		im->mddrc.ddr_command = CONFIG_SYS_DDR_EN_DLL;
-		im->mddrc.ddr_command = CONFIG_SYS_DDR_RES_DLL;
-		im->mddrc.ddr_command = CONFIG_SYS_DDR_PCHG_ALL;
-		im->mddrc.ddr_command = CONFIG_SYS_DDR_RFSH;
-		im->mddrc.ddr_command = CONFIG_SYS_DDR_RFSH;
-		im->mddrc.ddr_command = CONFIG_SYS_DDR_RFSH;
-		im->mddrc.ddr_command = CONFIG_SYS_ELPIDA_INIT_DEV_OP;
+		im->mddrc.ddr_command = DDR_EM2;
+		im->mddrc.ddr_command = DDR_EM3;
+		im->mddrc.ddr_command = DDR_EN_DLL;
+		im->mddrc.ddr_command = DDR_RES_DLL;
+		im->mddrc.ddr_command = DDR_PCHG_ALL;
+		im->mddrc.ddr_command = DDR_RFSH;
+		im->mddrc.ddr_command = DDR_RFSH;
+		im->mddrc.ddr_command = DDR_RFSH;
+		im->mddrc.ddr_command = ELPIDA_INIT_DEV_OP;
 		udelay(200);
 	}
-	im->mddrc.ddr_command = CONFIG_SYS_DDR_OCD_DEFAULT;
-	im->mddrc.ddr_command = CONFIG_SYS_DDR_OCD_EXIT;
-	im->mddrc.ddr_command = CONFIG_SYS_DDR_NOP;
+	im->mddrc.ddr_command = DDR_OCD_DEFAULT;
+	im->mddrc.ddr_command = DDR_OCD_EXIT;
+	im->mddrc.ddr_command = DDR_NOP;
 	for (i = 0; i < 10; i++)
-		im->mddrc.ddr_command = CONFIG_SYS_DDR_NOP;
+		im->mddrc.ddr_command = DDR_NOP;
 	/* Start MDDRC */
-	im->mddrc.ddr_time_config0 = CONFIG_SYS_MDDRC_TIME_CFG0_RUN;
+	im->mddrc.ddr_time_config0 = MDDRC_TIME_CFG0_RUN;
 
 	if (use_micron)
-		im->mddrc.ddr_sys_config = CONFIG_SYS_MDDRC_SYS_CFG_MICRON_RUN;
+		im->mddrc.ddr_sys_config = MDDRC_SYS_CFG_MICRON_RUN;
 	else
-		im->mddrc.ddr_sys_config = CONFIG_SYS_MDDRC_SYS_CFG_ELPIDA_RUN;
+		im->mddrc.ddr_sys_config = MDDRC_SYS_CFG_ELPIDA_RUN;
 
 	return msize;
 }
include/configs/ads5121.h +52 -52

115 lines not on this page · raw message

Signature · 1 line
1.5.2.4
#2 lore raw

PATCH 1/1 Rename CONFIG_SYS_MDDRC memory constants for ADS5121

Dear Martha Marx,

Quoted 7 lines · In message <[email protected]> you wrote:

Drops the CONFIG_SYS_

---
 board/ads5121/ads5121.c   |  138 ++++++++++++++++++++++----------------------
 include/configs/ads5121.h |  104 +++++++++++++++++-----------------
 2 files changed, 121 insertions(+), 121 deletions(-)

Please submit this patch first, before adding Elpida support. Patche swill be smaller and muchbetter to read that way.

Please base this patch on master branch. I will make sure to rebase the "next" branch before then applying the Eplida patch (which should go into the "next" branch so we can use eth_getenv_enetaddr().

Thanks.

Best regards,

Wolfgang Denk

Signature · 9 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The project was large enough and management communication poor enough
to prompt many members of the team to see themselves  as  contestants
making  brownie  points,  rather  than as builders making programming
products. Each suboptimized  his  piece  to  meet  his  targets;  few
stopped to think about the total effect on the customer.
                              - Fred Brooks, "The Mythical Man Month"
#3 lore raw

PATCH 1/1 Rename CONFIG_SYS_MDDRC memory constants for ADS5121

In reply to Martha Marx

Dear Martha Marx!

I have tested your patches and they worked well -
they even solved a DRAM init problem at power on
(u-boot hangs at power on when the board is warmed up - I wonder if my board is defective or is this a problem of the supplied u-boot?).

However - it would be great to have the ELPIDA Support in U-Boot mainline - Mr. Denk said he needs the requested changes to add it to mainline (see
http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/54983/focus=
55035).

How are your plans according to that - should I wait for an update or is the board frozen to this last patch ?

Best regards,
Arno Fischer

#4 lore raw

PATCH 1/1 Add new Elpida memory configuration for ads5121

In reply to Martha Marx

Dear Martha Marx,

Quoted 9 lines · In message <[email protected]> you wrote:

Rev 3 and earlier stay with Micron memory settings. Rev 4 boards manufactured before Nov-08 #1180 also will use Micron settings. More recent boards use Elpida settings.

---
 board/ads5121/ads5121.c   |  114 +++++++++++++++++++++++++++++++++-----------
 include/configs/ads5121.h |   41 ++++++++++------
 2 files changed, 110 insertions(+), 45 deletions(-)

Can you please swap the order of your patches, i. e. first perform the global CONFIG_SYS_ rename, and then apply the Elpida support patch?

Quoted 21 lines
board/ads5121/ads5121.c +6 -0
index 6c40e94..1983492 100644
@@ -124,9 +124,15 @@ phys_size_t initdram (int board_type)
  * fixed sdram init -- the board doesn't use memory modules that have serial presence
  * detect or similar mechanism for discovery of the DRAM settings
  */
+
 long int fixed_sdram (void)
 {
+	u32 use_micron = 0;
 	volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
+	ushort brd_rev = *(vu_short *) (CONFIG_SYS_CPLD_BASE + 0x00);
+	char *mac, *end, macaddr[6];
+	u32 brddate, macchk;
+
 	u32 msize = CONFIG_SYS_DDR_SIZE * 1024 * 1024;
 	u32 msize_log2 = __ilog2 (msize);
 	u32 i;

board/ads5121/ads5121.c long int fixed_sdram (void) · line 189

Quoted 10 lines
board/ads5121/ads5121.c +7 -0
@@ -174,41 +180,91 @@ long int fixed_sdram (void)
 	im->mddrc.lut_table4_alternate_upper = CONFIG_SYS_MDDRCGRP_LUT4_AU;
 	im->mddrc.lut_table4_alternate_lower = CONFIG_SYS_MDDRCGRP_LUT4_AL;
 
+	if (brd_rev >= 0x0400 && (mac = getenv("ethaddr"))) {
+		for (i=0; i<6; i++) {
+		 	macaddr[i] = mac ? 
+				simple_strtoul (mac, &end, 16) : 0;
+			if (mac)
+				mac = (*end) ? end+1 : end;
+		}

Please rebase your patch(es) against the "next" branch, so you can use eth_getenv_enetaddr() instead of manually paring the MAC address.

board/ads5121/ads5121.c long int fixed_sdram (void) · line 193

Quoted 4 lines
board/ads5121/ads5121.c +4 -0
+		brddate = (macaddr[3] << 16) + (macaddr[4] << 8) + macaddr[5];
+		macchk = (macaddr[0] << 16) + (macaddr[1] << 8) + macaddr[2];
+		debug("brddate = %d\n\t",brddate);
+	/* Boards made before Nov-08 #1180 use Micron memory; 001e59 is the STx vendor # */

Wrong indentation; line too long.

Quoted 52 lines
board/ads5121/ads5121.c +20 -28
+		if (macchk == 0x001e59 && brddate <= 8111180) 
+			use_micron = 1;
+	} else if (brd_rev < 0x400) {
+		use_micron = 1;
+	}
+
+	debug("Using %s Memory settings\n\t", use_micron ? "Micron" : "Elpida");
+
 	/* Initialize MDDRC */
-	im->mddrc.ddr_sys_config = CONFIG_SYS_MDDRC_SYS_CFG;
-	im->mddrc.ddr_time_config0 = CONFIG_SYS_MDDRC_TIME_CFG0;
-	im->mddrc.ddr_time_config1 = CONFIG_SYS_MDDRC_TIME_CFG1;
-	im->mddrc.ddr_time_config2 = CONFIG_SYS_MDDRC_TIME_CFG2;
+	if (use_micron) {
+		im->mddrc.ddr_sys_config = CONFIG_SYS_MDDRC_SYS_CFG_MICRON;
+		im->mddrc.ddr_time_config0 = CONFIG_SYS_MDDRC_TIME_CFG0;
+		im->mddrc.ddr_time_config1 = CONFIG_SYS_MDDRC_TIME_CFG1_MICRON;
+		im->mddrc.ddr_time_config2 = CONFIG_SYS_MDDRC_TIME_CFG2_MICRON;
+	} else {
+		im->mddrc.ddr_sys_config = CONFIG_SYS_MDDRC_SYS_CFG_ELPIDA;
+		im->mddrc.ddr_time_config0 = CONFIG_SYS_MDDRC_TIME_CFG0;
+		im->mddrc.ddr_time_config1 = CONFIG_SYS_MDDRC_TIME_CFG1_ELPIDA;
+		im->mddrc.ddr_time_config2 = CONFIG_SYS_MDDRC_TIME_CFG2_ELPIDA;
+	}
 
 	/* Initialize DDR */
 	for (i = 0; i < 10; i++)
-		im->mddrc.ddr_command = CONFIG_SYS_MICRON_NOP;
-
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_PCHG_ALL;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_NOP;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_RFSH;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_NOP;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_RFSH;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_NOP;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_INIT_DEV_OP;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_NOP;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_EM2;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_NOP;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_PCHG_ALL;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_EM2;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_EM3;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_EN_DLL;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_INIT_DEV_OP;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_PCHG_ALL;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_RFSH;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_INIT_DEV_OP;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_OCD_DEFAULT;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_PCHG_ALL;
-	im->mddrc.ddr_command = CONFIG_SYS_MICRON_NOP;
-
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_NOP;

board/ads5121/ads5121.c long int fixed_sdram (void) · line 227

Quoted 10 lines
board/ads5121/ads5121.c +10 -0
+
+	im->mddrc.ddr_command = CONFIG_SYS_DDR_PCHG_ALL;
+	im->mddrc.ddr_command = CONFIG_SYS_DDR_NOP;
+	im->mddrc.ddr_command = CONFIG_SYS_DDR_RFSH;
+	im->mddrc.ddr_command = CONFIG_SYS_DDR_NOP;
+	im->mddrc.ddr_command = CONFIG_SYS_DDR_RFSH;
+	im->mddrc.ddr_command = CONFIG_SYS_DDR_NOP;
+
+	if (use_micron) {
+	/* Micron init sequence */

Wrong indentation.

Quoted 7 lines
board/ads5121/ads5121.c +7 -0
+		im->mddrc.ddr_command = CONFIG_SYS_MICRON_INIT_DEV_OP;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_NOP;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_EM2;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_NOP;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_PCHG_ALL;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_EM2;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_EM3;

board/ads5121/ads5121.c long int fixed_sdram (void) · line 244

Quoted 10 lines
board/ads5121/ads5121.c +10 -0
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_EN_DLL;
+		im->mddrc.ddr_command = CONFIG_SYS_MICRON_INIT_DEV_OP;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_PCHG_ALL;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_RFSH;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_RFSH;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_RFSH;
+		im->mddrc.ddr_command = CONFIG_SYS_MICRON_INIT_DEV_OP;
+		udelay(200);
+	} else {
+	/* Elpida init sequence - works for Micron too but runs slower */

Wrong indentation.

board/ads5121/ads5121.c long int fixed_sdram (void) · line 255

Quoted 11 lines
board/ads5121/ads5121.c +11 -0
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_EM2;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_EM3;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_EN_DLL;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_RES_DLL;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_PCHG_ALL;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_RFSH;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_RFSH;
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_RFSH;
+		im->mddrc.ddr_command = CONFIG_SYS_ELPIDA_INIT_DEV_OP;
+		udelay(200);
+	}

Empty line, please.

board/ads5121/ads5121.c long int fixed_sdram (void) · line 258

Quoted 3 lines
board/ads5121/ads5121.c +3 -0
+	im->mddrc.ddr_command = CONFIG_SYS_DDR_OCD_DEFAULT;
+	im->mddrc.ddr_command = CONFIG_SYS_DDR_OCD_EXIT;
+	im->mddrc.ddr_command = CONFIG_SYS_DDR_NOP;

Empty line, please.

board/ads5121/ads5121.c long int fixed_sdram (void) · line 260

Quoted 2 lines
board/ads5121/ads5121.c +2 -0
+	for (i = 0; i < 10; i++)
+		im->mddrc.ddr_command = CONFIG_SYS_DDR_NOP;

Empty line, please.

Thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Philosophy:  A route of many roads leading from nowhere to nothing.
- Ambrose Bierce