commented out initdram in ddr.c, reverted d_init change

jad13041 · Jan 13, 2020 · 274e3b9 · 274e3b9
1 parent cdfe6a2
commit 274e3b9
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/arch/powerpc/cpu/mpc85xx/traps.c b/arch/powerpc/cpu/mpc85xx/traps.c
@@ -88,7 +88,7 @@ static void print_backtrace(unsigned long *sp)
 void show_regs(struct pt_regs *regs)
 {
 	int i;
-
+	printf("confirm I'm in mpc85xx\n");
 	printf("NIP: %08lX XER: %08lX LR: %08lX REGS: %p TRAP: %04lx DAR: %08lX\n",
 	       regs->nip, regs->xer, regs->link, regs, regs->trap, regs->dar);
 	printf("MSR: %08lx EE: %01x PR: %01x FP: %01x ME: %01x IR/DR: %01x%01x\n",

diff --git a/board/freescale/t104xrdb/ddr.c b/board/freescale/t104xrdb/ddr.c
@@ -126,12 +126,12 @@ phys_size_t initdram(int board_type)
 
 #if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_RAMBOOT_PBL)
 	puts("Initializing....using SPD\n");
-	dram_size = fsl_ddr_sdram();
+	//dram_size = fsl_ddr_sdram();
 #else
-	dram_size =  fsl_ddr_sdram_size();
+	//dram_size =  fsl_ddr_sdram_size();
 #endif
-	dram_size = setup_ddr_tlbs(dram_size / 0x100000);
-	dram_size *= 0x100000;
+	//dram_size = setup_ddr_tlbs(dram_size / 0x100000);
+	//dram_size *= 0x100000;
 
 #if defined(CONFIG_DEEP_SLEEP) && !defined(CONFIG_SPL_BUILD)
 	fsl_dp_resume();

diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c
@@ -910,7 +910,7 @@ static void set_ddr_sdram_cfg_2(const unsigned int ctrl_num,
 
 #if defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER)
 	/* Use the DDR controller to auto initialize memory. */
-	d_init = 0;//popts->ecc_init_using_memctl;
+	d_init = popts->ecc_init_using_memctl;
 	ddr->ddr_data_init = CONFIG_MEM_INIT_VALUE;
 	debug("DDR: ddr_data_init = 0x%08x\n", ddr->ddr_data_init);
 #else

diff --git a/drivers/ddr/fsl/util.c b/drivers/ddr/fsl/util.c
@@ -295,7 +295,7 @@ void print_ddr_info(unsigned int start_ctrl)
 		}
 	}
 #endif
-
+	puts("\nIn util.c\n")
 	if ((sdram_cfg >> 8) & 0x7f) {
 		puts("\n");
 		puts("       DDR Chip-Select Interleaving Mode: ");

diff --git a/drivers/dma/fsl_dma.c b/drivers/dma/fsl_dma.c
@@ -140,7 +140,7 @@ void dma_meminit(uint val, uint size)
 {
 	uint *p = 0;
 	uint i = 0;
-	puts("im in dma_meminit\n");
+	printf("im in dma_meminit\n");
 	for (*p = 0; p < (uint *)(8 * 1024); p++) {
 		if (((uint)p & 0x1f) == 0)
 			ppcDcbz((ulong)p);

diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
@@ -247,7 +247,7 @@
 #define CONFIG_DDR_ECC
 #ifdef CONFIG_DDR_ECC
 #define CONFIG_ECC_INIT_VIA_DDRCONTROLLER
-#define CONFIG_MEM_INIT_VALUE		0xdeadbeef
+#define CONFIG_MEM_INIT_VALUE		0xdeaddead //just making sure this is where its set
 #endif
 
 #define CONFIG_ENABLE_36BIT_PHYS