summaryrefslogtreecommitdiff
path: root/board/freescale/t102xqds
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-06-04 12:12:26 -0400
committerTom Rini <trini@konsulko.com>2016-06-04 12:12:26 -0400
commitcc749523ae1adec3856f2b7fe77a6d856da4652a (patch)
treed386320f6f69ead4a461619dd8348347ae7cc7dd /board/freescale/t102xqds
parent8aa57a95a2efc8174c5482f9b3abc4920b479ff2 (diff)
parent23d4e5ba49b878e01321be2af4e94f73389f4958 (diff)
downloadu-boot-imx-cc749523ae1adec3856f2b7fe77a6d856da4652a.zip
u-boot-imx-cc749523ae1adec3856f2b7fe77a6d856da4652a.tar.gz
u-boot-imx-cc749523ae1adec3856f2b7fe77a6d856da4652a.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'board/freescale/t102xqds')
-rw-r--r--board/freescale/t102xqds/Makefile2
-rw-r--r--board/freescale/t102xqds/ddr.c5
-rw-r--r--board/freescale/t102xqds/spl.c1
3 files changed, 4 insertions, 4 deletions
diff --git a/board/freescale/t102xqds/Makefile b/board/freescale/t102xqds/Makefile
index d94f230..afbc914 100644
--- a/board/freescale/t102xqds/Makefile
+++ b/board/freescale/t102xqds/Makefile
@@ -5,7 +5,7 @@
#
ifdef CONFIG_SPL_BUILD
-obj-y += spl.o
+obj-y += spl.o
else
obj-y += t102xqds.o
obj-y += eth_t102xqds.o
diff --git a/board/freescale/t102xqds/ddr.c b/board/freescale/t102xqds/ddr.c
index 912d6a9..c26f350 100644
--- a/board/freescale/t102xqds/ddr.c
+++ b/board/freescale/t102xqds/ddr.c
@@ -172,14 +172,13 @@ phys_size_t initdram(int board_type)
#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_RAMBOOT_PBL)
puts("Initializing....using SPD\n");
-
dram_size = fsl_ddr_sdram();
- dram_size = setup_ddr_tlbs(dram_size / 0x100000);
- dram_size *= 0x100000;
#else
/* DDR has been initialised by first stage boot loader */
dram_size = fsl_ddr_sdram_size();
#endif
+ dram_size = setup_ddr_tlbs(dram_size / 0x100000);
+ dram_size *= 0x100000;
#if defined(CONFIG_DEEP_SLEEP) && !defined(CONFIG_SPL_BUILD)
fsl_dp_resume();
diff --git a/board/freescale/t102xqds/spl.c b/board/freescale/t102xqds/spl.c
index 073ff2d..d59d343 100644
--- a/board/freescale/t102xqds/spl.c
+++ b/board/freescale/t102xqds/spl.c
@@ -120,6 +120,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
get_clocks();
mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
CONFIG_SPL_RELOC_MALLOC_SIZE);
+ gd->flags |= GD_FLG_FULL_MALLOC_INIT;
#ifdef CONFIG_SPL_NAND_BOOT
nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE,