Merge branch 'CR_6604_1G_DDR_SYNC_samin.guo' into 'jh7110-master'

CR6604：dram: jh7110:  sync from devkits/vf2

See merge request sdk/u-boot!59

1 files changed, 10 insertions, 40 deletions

diff --git a/arch/riscv/cpu/jh7110/dram.c b/arch/riscv/cpu/jh7110/dram.c
index e141f87d41..a17f2ec679 100644
--- a/arch/riscv/cpu/jh7110/dram.c
+++ b/arch/riscv/cpu/jh7110/dram.c
@@ -2,63 +2,33 @@
 /*
  * Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com>
  */
+
 #include <common.h>
 #include <fdtdec.h>
 #include <init.h>
 #include <linux/sizes.h>
 
-#ifdef CONFIG_ID_EEPROM
-#include <asm/arch/eeprom.h>
-#define STARFIVE_JH7110_EEPROM_DDRINFO_OFFSET	91
-#endif
-
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifdef CONFIG_ID_EEPROM
-static bool check_eeprom_dram_info(phys_size_t size)
-{
-	switch (size) {
-	case 0x40000000:
-	case 0x80000000:
-	case 0x100000000:
-	case 0x200000000:
-	case 0x400000000:
-		return true;
-	default:
-		return false;
-	}
-}
-
-static void resize_ddr_from_eeprom(void)
+__weak int board_ddr_size(void)
 {
-	u32 offset = STARFIVE_JH7110_EEPROM_DDRINFO_OFFSET;
-	phys_size_t size;
-	u32 len = 1;
-	u8 data = 0;
-	int ret;
-
-	/* read memory size info */
-	ret = get_data_from_eeprom(offset, len, &data);
-	if (ret == len) {
-		size = ((phys_size_t)hextoul(&data, NULL)) << 30;
-		if (check_eeprom_dram_info(size))
-			gd->ram_size = size;
-	}
-
+	return 0;
 }
-#endif /* CONFIG_ID_EEPROM */
 
 int dram_init(void)
 {
 	int ret;
+	phys_size_t size;
 
 	ret = fdtdec_setup_mem_size_base();
 	if (ret)
-	return ret;
+		return ret;
+
+	/* resize ddr size */
+	size = board_ddr_size();
+	if (size > 0)
+		gd->ram_size = size << 30;
 
-#ifdef CONFIG_ID_EEPROM
-	resize_ddr_from_eeprom();
-#endif
 	return 0;
 }