diff options
| author | Tom Rini <trini@konsulko.com> | 2016-06-04 16:12:26 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-06-04 16:12:26 (GMT) |
| commit | cc749523ae1adec3856f2b7fe77a6d856da4652a (patch) | |
| tree | d386320f6f69ead4a461619dd8348347ae7cc7dd /board/freescale/t102xrdb | |
| parent | 8aa57a95a2efc8174c5482f9b3abc4920b479ff2 (diff) | |
| parent | 23d4e5ba49b878e01321be2af4e94f73389f4958 (diff) | |
| download | u-boot-cc749523ae1adec3856f2b7fe77a6d856da4652a.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'board/freescale/t102xrdb')
| -rw-r--r-- | board/freescale/t102xrdb/Makefile | 2 | ||||
| -rw-r--r-- | board/freescale/t102xrdb/ddr.c | 4 | ||||
| -rw-r--r-- | board/freescale/t102xrdb/spl.c | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/board/freescale/t102xrdb/Makefile b/board/freescale/t102xrdb/Makefile index 0520066..6452865 100644 --- a/board/freescale/t102xrdb/Makefile +++ b/board/freescale/t102xrdb/Makefile @@ -5,7 +5,7 @@ # ifdef CONFIG_SPL_BUILD -obj-y += spl.o +obj-y += spl.o else obj-y += t102xrdb.o obj-$(CONFIG_T1024RDB) += cpld.o diff --git a/board/freescale/t102xrdb/ddr.c b/board/freescale/t102xrdb/ddr.c index 60ab9ff..edfbdbf 100644 --- a/board/freescale/t102xrdb/ddr.c +++ b/board/freescale/t102xrdb/ddr.c @@ -234,12 +234,12 @@ phys_size_t initdram(int board_type) puts("Initializing....using SPD\n"); #endif 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/t102xrdb/spl.c b/board/freescale/t102xrdb/spl.c index da97c44..bd3cbbf 100644 --- a/board/freescale/t102xrdb/spl.c +++ b/board/freescale/t102xrdb/spl.c @@ -107,6 +107,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, |