diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-10-08 21:20:49 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-10-08 21:20:49 +0200 |
| commit | 4b19b7448e63bab8af17abbb30acff00d8f0dc99 (patch) | |
| tree | 6ba89c10ebffb00cee92656da9a5aad8396390c0 /board/freescale/mx6qarm2/mx6qarm2.c | |
| parent | c19a8bc5711ec63e905ef91f045a1489f0aa3cb0 (diff) | |
| parent | 5e3a388cddce1685ccd9bc1b58ddb89a191ed88f (diff) | |
| download | u-boot-imx-4b19b7448e63bab8af17abbb30acff00d8f0dc99.zip u-boot-imx-4b19b7448e63bab8af17abbb30acff00d8f0dc99.tar.gz u-boot-imx-4b19b7448e63bab8af17abbb30acff00d8f0dc99.tar.bz2 | |
Merge remote-tracking branch 'u-boot-imx/master'
The single file conflict below is actually trivial.
Conflicts:
board/boundary/nitrogen6x/nitrogen6x.c
Diffstat (limited to 'board/freescale/mx6qarm2/mx6qarm2.c')
| -rw-r--r-- | board/freescale/mx6qarm2/mx6qarm2.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/board/freescale/mx6qarm2/mx6qarm2.c b/board/freescale/mx6qarm2/mx6qarm2.c index 6c51f3a..667dca5 100644 --- a/board/freescale/mx6qarm2/mx6qarm2.c +++ b/board/freescale/mx6qarm2/mx6qarm2.c @@ -32,7 +32,12 @@ DECLARE_GLOBAL_DATA_PTR; int dram_init(void) { - gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE); +#if defined(CONFIG_MX6DL) && !defined(CONFIG_MX6DL_LPDDR2) && \ + defined(CONFIG_DDR_32BIT) + gd->ram_size = ((phys_size_t)CONFIG_DDR_MB * 1024 * 1024) / 2; +#else + gd->ram_size = (phys_size_t)CONFIG_DDR_MB * 1024 * 1024; +#endif return 0; } @@ -224,7 +229,11 @@ int board_init(void) int checkboard(void) { +#ifdef CONFIG_MX6DL + puts("Board: MX6DL-Armadillo2\n"); +#else puts("Board: MX6Q-Armadillo2\n"); +#endif return 0; } |