summaryrefslogtreecommitdiff
path: root/common/tools
diff options
context:
space:
mode:
authorTom Yang2012-12-17 19:48:39 +0530
committerTom Yang2012-12-21 16:14:45 +0530
commitfaf7932f7eed04c8552f15bfb7a4dedef694b3f1 (patch)
tree6a8c87cfb4bef8a5562746a887a01304af02593b /common/tools
parent4099f067f8f8b3652a237b8548fe9800c3b8a5c2 (diff)
common/tools/genNVRAM: support miu config on 4 layouts boards, closes #3623
support Hynix-H5PS5162GFR-S6C and Nanya-NT5U32M16DG-AC
Diffstat (limited to 'common/tools')
-rw-r--r--common/tools/genNVRAM/genNVRAM.c3
-rw-r--r--common/tools/genNVRAM/miu_cfg.h75
-rw-r--r--common/tools/genNVRAM/nvram_mcr500-ddr2_200_01.conf2
-rw-r--r--common/tools/genNVRAM/nvram_mcr500-ddr2_300_01.conf2
-rw-r--r--common/tools/genNVRAM/nvram_mcr500-ddr2_500_01.conf2
-rw-r--r--common/tools/genNVRAM/nvram_mcr510-ddr2_200_01.conf2
-rw-r--r--common/tools/genNVRAM/nvram_mcr510-ddr2_300_01.conf2
-rw-r--r--common/tools/genNVRAM/nvram_mcr510-ddr2_500_01.conf2
8 files changed, 82 insertions, 8 deletions
diff --git a/common/tools/genNVRAM/genNVRAM.c b/common/tools/genNVRAM/genNVRAM.c
index 8381188f93..89682f664d 100644
--- a/common/tools/genNVRAM/genNVRAM.c
+++ b/common/tools/genNVRAM/genNVRAM.c
@@ -276,7 +276,8 @@ static const struct miu_config_table_t miu_config_table[] =
{ "h5ps1g63jfr-s6c", 128 * 1024 *1024, miu_config_ddr2_16_4x_cl6_800 },
{ "nt5tu64m16gg-ac", 128 * 1024 *1024, miu_config_ddr2_16_4x_cl6_800 },
{ "h5du5162etr-fac", 64 * 1024 * 1024, miu_config_ddr1_h5du5162etr_fac_500},
- { "h5ps5162gfr-s6c", 64 * 1024 *1024, miu_config_ddr2_16_2x_cl6_800 },
+ { "h5ps5162gfr-s6c_2l", 64 * 1024 *1024, miu_config_ddr2_16_2x_cl6_800_2L },
+ { "h5ps5162gfr-s6c_4l", 64 * 1024 *1024, miu_config_ddr2_16_2x_cl6_800_4L },
NULL
};
diff --git a/common/tools/genNVRAM/miu_cfg.h b/common/tools/genNVRAM/miu_cfg.h
index 1808be76e9..c78c7a731b 100644
--- a/common/tools/genNVRAM/miu_cfg.h
+++ b/common/tools/genNVRAM/miu_cfg.h
@@ -251,7 +251,11 @@ uint32_t miu_config_ddr1_h5du5162etr_fac_500[] =
(uint32_t)-1
};
-uint32_t miu_config_ddr2_16_2x_cl6_800[] =
+/*
+ * DDR2 512Mb Miu config on 2Lay board,
+ * Support Hynix - H5PS5162GFR-S6C
+ */
+uint32_t miu_config_ddr2_16_2x_cl6_800_2L[] =
{
0x0000003c, 0x0c01, 0xFFFF,
0x0000003c, 0x0c00, 0xFFFF,
@@ -316,4 +320,73 @@ uint32_t miu_config_ddr2_16_2x_cl6_800[] =
(uint32_t)-1
};
+/*
+ * DDR2 512Mb Miu config on 4Lay board,
+ * Support: Hynix - H5PS5162GFR-S6C
+ * Support: Nanya - NT5TU32M16DG-AC
+ */
+uint32_t miu_config_ddr2_16_2x_cl6_800_4L[] =
+{
+ 0x0000003c, 0x0c01, 0xFFFF,
+ 0x0000003c, 0x0c00, 0xFFFF,
+ 0x0000008c, 0xFFFE, 0xFFFF,
+ 0x00000090, 0xFFFF, 0xFFFF,
+ 0x00000094, 0xFFFF, 0xFFFF,
+ 0x00000098, 0xFFFF, 0xFFFF,
+ 0x0000008c, 0xFFFE, 0xFFFF,
+ 0x00010060, 0x0690, 0xFFFF,
+ 0x00010064, 0x0029, 0xFFFF,
+ 0x00010068, 0x0100, 0xFFFF,
+ 0x0001006c, 0x4001, 0xFFFF,
+ 0x00010040, 0x0020, 0xFFFF,
+ 0x00010010, 0x70ff, 0xFFFF,
+ NVRAM_WAIT_CODE_OP, 500, 0,
+ 0x00000004, 0x0292, 0xFFFF,
+ 0x00000008, 0x000c, 0xFFFF,
+ 0x0000000c, 0x3420, 0xFFFF,
+ 0x00000010, 0x1666, 0xFFFF,
+ 0x00000014, 0x1c56, 0xFFFF,
+ 0x00000018, 0x6485, 0xFFFF,
+ 0x0000001c, 0x204f, 0xFFFF,
+ 0x00000020, 0x0a62, 0xFFFF,
+ 0x00000024, 0x4004, 0xFFFF,
+ 0x00000028, 0x8000, 0xFFFF,
+ 0x0000002c, 0xc000, 0xFFFF,
+ 0x00010000, 0x0010, 0xFFFF,
+ 0x00010070, 0x0044, 0xFFFF,
+ 0x00010074, 0x5050, 0xFFFF,
+ 0x00010004, 0x0000, 0xFFFF,
+ 0x00010008, 0x0000, 0xFFFF,
+ 0x00010078, 0x0200, 0xFFFF,
+ 0x0001007c, 0x0022, 0xFFFF,
+ 0x0001001c, 0x00a7, 0xFFFF,
+ 0x000100dc, 0x0056, 0xFFFF,
+ 0x000100d0, 0x004f, 0xFFFF,
+ 0x000100d4, 0x004f, 0xFFFF,
+ 0x000100c0, 0x000c, 0xFFFF,
+ 0x000100c0, 0x0008, 0xFFFF,
+ 0x000100c4, 0x007f, 0xFFFF,
+ 0x000100c8, 0xf200, 0xFFFF,
+ 0x000100c0, 0x2378, 0xFFFF,
+ 0x000100a8, 0x0000, 0xFFFF,
+ 0x000100b8, 0x5555, 0xFFFF,
+ 0x000100bc, 0x5555, 0xFFFF,
+ 0x000100e8, 0x7777, 0xFFFF,
+ 0x0000003c, 0x0c01, 0xFFFF,
+ 0x0000003c, 0x0c00, 0xFFFF,
+ 0x000100fc, 0x0000, 0xFFFF,
+ 0x00010000, 0x0000, 0xFFFF,
+ 0x00010004, 0xaaaa, 0xFFFF,
+ NVRAM_WAIT_CODE_OP, 1, 0,
+ 0x00000000, 0x0000, 0xFFFF,
+ 0x00000000, 0x0008, 0xFFFF,
+ 0x00000000, 0x000c, 0xFFFF,
+ NVRAM_WAIT_CODE_OP, 200, 0,
+ 0x00000000, 0x000e, 0xFFFF,
+ NVRAM_WAIT_CODE_OP, 500, 0,
+ 0x00000000, 0x001f, 0xFFFF,
+ NVRAM_MIU_WAIT_INIT_DONE_CODE_OP, 0, 0,
+ 0x0000008c, 0x0000, 0xFFFF,
+ (uint32_t)-1
+};
#endif /* __MIU_CFG_H */
diff --git a/common/tools/genNVRAM/nvram_mcr500-ddr2_200_01.conf b/common/tools/genNVRAM/nvram_mcr500-ddr2_200_01.conf
index 7894d43d96..c8a28e664e 100644
--- a/common/tools/genNVRAM/nvram_mcr500-ddr2_200_01.conf
+++ b/common/tools/genNVRAM/nvram_mcr500-ddr2_200_01.conf
@@ -1,7 +1,7 @@
pkgcfg=0x0000170f
iomux_config = mcr500-ddr2_2
gpiodir=0x00000084
-miu_config = h5ps5162gfr-s6c
+miu_config = h5ps5162gfr-s6c_4l
forg=0x00000007
img0off=0x00140000
imgmaxsize=0x360000
diff --git a/common/tools/genNVRAM/nvram_mcr500-ddr2_300_01.conf b/common/tools/genNVRAM/nvram_mcr500-ddr2_300_01.conf
index 37640a1167..303a2d7067 100644
--- a/common/tools/genNVRAM/nvram_mcr500-ddr2_300_01.conf
+++ b/common/tools/genNVRAM/nvram_mcr500-ddr2_300_01.conf
@@ -1,7 +1,7 @@
pkgcfg=0x0000270f
iomux_config = mcr500-ddr2_1
gpiodir=0x00000084
-miu_config = h5ps5162gfr-s6c
+miu_config = h5ps5162gfr-s6c_4l
forg=0x00000007
img0off=0x00140000
imgmaxsize=0x360000
diff --git a/common/tools/genNVRAM/nvram_mcr500-ddr2_500_01.conf b/common/tools/genNVRAM/nvram_mcr500-ddr2_500_01.conf
index 007d5198fb..47324de13a 100644
--- a/common/tools/genNVRAM/nvram_mcr500-ddr2_500_01.conf
+++ b/common/tools/genNVRAM/nvram_mcr500-ddr2_500_01.conf
@@ -1,7 +1,7 @@
pkgcfg=0x0000370f
iomux_config = mcr500-ddr2_1
gpiodir=0x00000084
-miu_config = h5ps5162gfr-s6c
+miu_config = h5ps5162gfr-s6c_4l
forg=0x00000007
img0off=0x00140000
imgmaxsize=0x360000
diff --git a/common/tools/genNVRAM/nvram_mcr510-ddr2_200_01.conf b/common/tools/genNVRAM/nvram_mcr510-ddr2_200_01.conf
index 3fd6027331..810bb177e8 100644
--- a/common/tools/genNVRAM/nvram_mcr510-ddr2_200_01.conf
+++ b/common/tools/genNVRAM/nvram_mcr510-ddr2_200_01.conf
@@ -1,7 +1,7 @@
pkgcfg=0x0000150f
iomux_config=mcr510-ddr2_2
gpiodir=0x00000084
-miu_config=h5ps5162gfr-s6c
+miu_config=h5ps5162gfr-s6c_2l
forg=0x00000006
img0off=0x000b0000
imgmaxsize=0x1b0000
diff --git a/common/tools/genNVRAM/nvram_mcr510-ddr2_300_01.conf b/common/tools/genNVRAM/nvram_mcr510-ddr2_300_01.conf
index 6a1ceaad6f..91d48e851c 100644
--- a/common/tools/genNVRAM/nvram_mcr510-ddr2_300_01.conf
+++ b/common/tools/genNVRAM/nvram_mcr510-ddr2_300_01.conf
@@ -1,7 +1,7 @@
pkgcfg=0x0000250f
iomux_config = mcr510-ddr2
gpiodir=0x00000084
-miu_config = h5ps5162gfr-s6c
+miu_config = h5ps5162gfr-s6c_2l
forg=0x00000006
img0off=0x000b0000
imgmaxsize=0x350000
diff --git a/common/tools/genNVRAM/nvram_mcr510-ddr2_500_01.conf b/common/tools/genNVRAM/nvram_mcr510-ddr2_500_01.conf
index 7c15941dbe..f05eca71f4 100644
--- a/common/tools/genNVRAM/nvram_mcr510-ddr2_500_01.conf
+++ b/common/tools/genNVRAM/nvram_mcr510-ddr2_500_01.conf
@@ -1,7 +1,7 @@
pkgcfg=0x0000350f
iomux_config = mcr510-ddr2
gpiodir=0x00000084
-miu_config = h5ps5162gfr-s6c
+miu_config = h5ps5162gfr-s6c_2l
forg=0x00000006
img0off=0x000b0000
imgmaxsize=0x350000