[PATCH v2 3/5] board: nuvuton: arbel: fix incorrect ram size

[Jim Liu]

fix incorrect ram size of 4GB dram with ECC enabled

Signed-off-by: Jim Liu <jjl...@nuvoton.com>
---
 board/nuvoton/arbel_evb/arbel_evb.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/board/nuvoton/arbel_evb/arbel_evb.c 
b/board/nuvoton/arbel_evb/arbel_evb.c
index e52e0a59ab..acaafad549 100644
--- a/board/nuvoton/arbel_evb/arbel_evb.c
+++ b/board/nuvoton/arbel_evb/arbel_evb.c
@@ -16,7 +16,7 @@
 #define DRAM_1GB_SIZE          0x40000000ULL
 #define DRAM_2GB_ECC_SIZE      0x70000000ULL
 #define DRAM_2GB_SIZE          0x80000000ULL
-#define DRAM_4GB_ECC_SIZE      0xE00000000ULL
+#define DRAM_4GB_ECC_SIZE      0xE0000000ULL
 #define DRAM_4GB_SIZE          0x100000000ULL
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -29,7 +29,6 @@ int board_init(void)
 int dram_init(void)
 {
        struct npcm_gcr *gcr = (struct npcm_gcr *)NPCM_GCR_BA;
-       uint64_t delta = 0ULL;
 
        /*
         * get dram active size value from bootblock.
@@ -62,26 +61,28 @@ int dram_init(void)
                gd->bd->bi_dram[1].size = 0;
                break;
        case DRAM_4GB_ECC_SIZE:
-               gd->bd->bi_dram[0].size = DRAM_2GB_ECC_SIZE;
+               gd->bd->bi_dram[0].size = DRAM_2GB_SIZE;
                gd->bd->bi_dram[1].start = DRAM_4GB_SIZE;
-               gd->bd->bi_dram[1].size = DRAM_2GB_SIZE;
-               delta = DRAM_4GB_SIZE - DRAM_2GB_ECC_SIZE;
+               gd->bd->bi_dram[1].size = DRAM_2GB_SIZE -
+                       (DRAM_4GB_SIZE - DRAM_4GB_ECC_SIZE);
+               /* use bank0 only */
+               gd->ram_size = DRAM_2GB_SIZE;
                break;
        case DRAM_4GB_SIZE:
                gd->bd->bi_dram[0].size = DRAM_2GB_SIZE;
                gd->bd->bi_dram[1].start = DRAM_4GB_SIZE;
                gd->bd->bi_dram[1].size = DRAM_2GB_SIZE;
-               delta = DRAM_4GB_SIZE - DRAM_2GB_SIZE;
+               /* use bank0 only */
+               gd->ram_size = DRAM_2GB_SIZE;
                break;
        default:
                gd->bd->bi_dram[0].size = DRAM_1GB_SIZE;
                gd->bd->bi_dram[1].start = 0;
                gd->bd->bi_dram[1].size = 0;
+               gd->ram_size = DRAM_1GB_SIZE;
                break;
        }
 
-       gd->ram_size -= delta;
-
        return 0;
 }
 
-- 
2.34.1