diff options
| author | Tom Rini <trini@konsulko.com> | 2016-06-04 12:12:26 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-06-04 12:12:26 -0400 |
| commit | cc749523ae1adec3856f2b7fe77a6d856da4652a (patch) | |
| tree | d386320f6f69ead4a461619dd8348347ae7cc7dd /board/freescale/t4qds | |
| parent | 8aa57a95a2efc8174c5482f9b3abc4920b479ff2 (diff) | |
| parent | 23d4e5ba49b878e01321be2af4e94f73389f4958 (diff) | |
| download | u-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/t4qds')
| -rw-r--r-- | board/freescale/t4qds/Makefile | 6 | ||||
| -rw-r--r-- | board/freescale/t4qds/ddr.c | 7 | ||||
| -rw-r--r-- | board/freescale/t4qds/spl.c | 1 |
3 files changed, 7 insertions, 7 deletions
diff --git a/board/freescale/t4qds/Makefile b/board/freescale/t4qds/Makefile index bd2c1f1..731ccb0 100644 --- a/board/freescale/t4qds/Makefile +++ b/board/freescale/t4qds/Makefile @@ -5,12 +5,12 @@ # ifdef CONFIG_SPL_BUILD -obj-y += spl.o +obj-y += spl.o else -obj-$(CONFIG_T4240QDS) += t4240qds.o -obj-$(CONFIG_T4240QDS)+= eth.o +obj-$(CONFIG_T4240QDS) += t4240qds.o eth.o obj-$(CONFIG_PCI) += pci.o endif + obj-y += ddr.o obj-y += law.o obj-y += tlb.o diff --git a/board/freescale/t4qds/ddr.c b/board/freescale/t4qds/ddr.c index 62d58c5..d533924 100644 --- a/board/freescale/t4qds/ddr.c +++ b/board/freescale/t4qds/ddr.c @@ -117,13 +117,12 @@ phys_size_t initdram(int board_type) #if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_RAMBOOT_PBL) 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; + return dram_size; } diff --git a/board/freescale/t4qds/spl.c b/board/freescale/t4qds/spl.c index d52059a..6ca0f03 100644 --- a/board/freescale/t4qds/spl.c +++ b/board/freescale/t4qds/spl.c @@ -116,6 +116,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, |