diff options
| author | Tom Rini <trini@konsulko.com> | 2016-04-25 13:45:32 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-04-25 13:45:32 -0400 |
| commit | 9f69ab86d0592d528a0372f01fa23684291243fa (patch) | |
| tree | 0ad01e07d0097f36840f78b3ac49dbf811ac2f02 /arch/arm/mach-uniphier/dram_init.c | |
| parent | e6a365289974fe030372c0fb0151df7940992d39 (diff) | |
| parent | b75e072c1c53cade2c3944433d852d7d6046661b (diff) | |
| download | u-boot-imx-9f69ab86d0592d528a0372f01fa23684291243fa.zip u-boot-imx-9f69ab86d0592d528a0372f01fa23684291243fa.tar.gz u-boot-imx-9f69ab86d0592d528a0372f01fa23684291243fa.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-uniphier
Diffstat (limited to 'arch/arm/mach-uniphier/dram_init.c')
| -rw-r--r-- | arch/arm/mach-uniphier/dram_init.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/mach-uniphier/dram_init.c b/arch/arm/mach-uniphier/dram_init.c index 815f243..ef0e2e8 100644 --- a/arch/arm/mach-uniphier/dram_init.c +++ b/arch/arm/mach-uniphier/dram_init.c @@ -6,6 +6,7 @@ #include <common.h> #include <libfdt.h> +#include <fdtdec.h> #include <linux/err.h> DECLARE_GLOBAL_DATA_PTR; @@ -40,8 +41,7 @@ int dram_init(void) val += ac; - gd->ram_size = sc == 2 ? fdt64_to_cpu(*(fdt64_t *)val) : - fdt32_to_cpu(*val); + gd->ram_size = fdtdec_get_number(val, sc); debug("DRAM size = %08lx\n", (unsigned long)gd->ram_size); @@ -71,11 +71,9 @@ void dram_init_banksize(void) for (i = 0; i < CONFIG_NR_DRAM_BANKS && len >= cells; i++, len -= cells) { - gd->bd->bi_dram[i].start = ac == 2 ? - fdt64_to_cpu(*(fdt64_t *)val) : fdt32_to_cpu(*val); + gd->bd->bi_dram[i].start = fdtdec_get_number(val, ac); val += ac; - gd->bd->bi_dram[i].size = sc == 2 ? - fdt64_to_cpu(*(fdt64_t *)val) : fdt32_to_cpu(*val); + gd->bd->bi_dram[i].size = fdtdec_get_number(val, sc); val += sc; debug("DRAM bank %d: start = %08lx, size = %08lx\n", |