summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2015-03-24 13:25:03 -0700
committerYork Sun <yorksun@freescale.com>2015-04-23 16:46:51 -0700
commit32eda7cc945212ba8df569e399b0361b32676ac2 (patch)
treef6732141f3a400acae5645e04dd3eb6a2a4d0fed /board
parent548cf52fd5be1a490807c2f8e5f218c9fbd4053a (diff)
downloadu-boot-imx-32eda7cc945212ba8df569e399b0361b32676ac2.zip
u-boot-imx-32eda7cc945212ba8df569e399b0361b32676ac2.tar.gz
u-boot-imx-32eda7cc945212ba8df569e399b0361b32676ac2.tar.bz2
armv8/ls2085ardb: Enable NAND SPL support
Enable NAND boot support using SPL framework. To boot from NAND, either use DIP switches on board, or "qixis_reset nand" command. Details of forming NAND image can be found in README. Signed-off-by: Scott Wood <scottwood@freescale.com> [York Sun: Remove +S from defconfig after commit 252ed872] Signed-off-by: York Sun <yorksun@freescale.com>
Diffstat (limited to 'board')
-rw-r--r--board/freescale/ls2085ardb/MAINTAINERS1
-rw-r--r--board/freescale/ls2085ardb/ddr.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/board/freescale/ls2085ardb/MAINTAINERS b/board/freescale/ls2085ardb/MAINTAINERS
index 436039f..d5cce40 100644
--- a/board/freescale/ls2085ardb/MAINTAINERS
+++ b/board/freescale/ls2085ardb/MAINTAINERS
@@ -5,3 +5,4 @@ F: board/freescale/ls2085ardb/
F: board/freescale/ls2085a/ls2085ardb.c
F: include/configs/ls2085ardb.h
F: configs/ls2085ardb_defconfig
+F: configs/ls2085ardb_nand_defconfig
diff --git a/board/freescale/ls2085ardb/ddr.c b/board/freescale/ls2085ardb/ddr.c
index 6cd5e8b..8d71ae1 100644
--- a/board/freescale/ls2085ardb/ddr.c
+++ b/board/freescale/ls2085ardb/ddr.c
@@ -147,9 +147,13 @@ phys_size_t initdram(int board_type)
{
phys_size_t dram_size;
+#if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD)
+ return fsl_ddr_sdram_size();
+#else
puts("Initializing DDR....using SPD\n");
dram_size = fsl_ddr_sdram();
+#endif
return dram_size;
}