diff options
| author | Tom Rini <trini@ti.com> | 2014-08-29 11:06:51 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-08-29 11:06:51 -0400 |
| commit | 5a1095a830299aef8dd32495e505e92ab1749e89 (patch) | |
| tree | 9383de2534455119d51200bc87766a330591df27 /arch/arm/imx-common/cpu.c | |
| parent | 6af857c50df4e62ec08e51ad73c96f63f1480386 (diff) | |
| parent | d145878d59c80a44d8c6e6d606b898ab87d205ee (diff) | |
| download | u-boot-imx-5a1095a830299aef8dd32495e505e92ab1749e89.zip u-boot-imx-5a1095a830299aef8dd32495e505e92ab1749e89.tar.gz u-boot-imx-5a1095a830299aef8dd32495e505e92ab1749e89.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'arch/arm/imx-common/cpu.c')
| -rw-r--r-- | arch/arm/imx-common/cpu.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/imx-common/cpu.c b/arch/arm/imx-common/cpu.c index 5a09107..ed826a0 100644 --- a/arch/arm/imx-common/cpu.c +++ b/arch/arm/imx-common/cpu.c @@ -93,6 +93,11 @@ unsigned imx_ddr_size(void) bits += bank_lookup[ESD_MMDC_MISC_GET_BANK(misc)]; bits += ESD_MMDC_CTL_GET_WIDTH(ctl); bits += ESD_MMDC_CTL_GET_CS1(ctl); + + /* The MX6 can do only 3840 MiB of DRAM */ + if (bits == 32) + return 0xf0000000; + return 1 << bits; } #endif @@ -112,6 +117,8 @@ const char *get_imx_type(u32 imxtype) return "6SOLO"; /* Solo version of the mx6 */ case MXC_CPU_MX6SL: return "6SL"; /* Solo-Lite version of the mx6 */ + case MXC_CPU_MX6SX: + return "6SX"; /* SoloX version of the mx6 */ case MXC_CPU_MX51: return "51"; case MXC_CPU_MX53: |