diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2015-02-27 02:27:04 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2015-03-01 00:03:13 +0900 |
| commit | 6cc2120646a3230bcf4b57cb3cb937f4a1cfe150 (patch) | |
| tree | da73383c242ddacceaf270584d2a1ba62260d37c /arch/arm/mach-uniphier/ph1-pro4 | |
| parent | afed8c1b6a28bc201dd3633f914572bbf693e620 (diff) | |
| download | talos-obmc-uboot-6cc2120646a3230bcf4b57cb3cb937f4a1cfe150.tar.gz talos-obmc-uboot-6cc2120646a3230bcf4b57cb3cb937f4a1cfe150.zip | |
ARM: UniPhier: consolidate MEMCONF setting code
This code is duplicated in ph1-ld4/sg_init.c and ph1-pro4/sg_init.c.
Merge the same code into a new file, memconf.c.
The helper functions no longer have to be placed in the header file.
Also, move them into memconf.c.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Diffstat (limited to 'arch/arm/mach-uniphier/ph1-pro4')
| -rw-r--r-- | arch/arm/mach-uniphier/ph1-pro4/sg_init.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/arm/mach-uniphier/ph1-pro4/sg_init.c b/arch/arm/mach-uniphier/ph1-pro4/sg_init.c index c25afa8e06..8677666323 100644 --- a/arch/arm/mach-uniphier/ph1-pro4/sg_init.c +++ b/arch/arm/mach-uniphier/ph1-pro4/sg_init.c @@ -1,11 +1,10 @@ /* - * Copyright (C) 2011-2014 Panasonic Corporation + * Copyright (C) 2011-2015 Panasonic Corporation * Author: Masahiro Yamada <yamada.m@jp.panasonic.com> * * SPDX-License-Identifier: GPL-2.0+ */ -#include <common.h> #include <asm/io.h> #include <mach/sg-regs.h> @@ -13,14 +12,6 @@ void sg_init(void) { u32 tmp; - /* Set DDR size */ - tmp = sg_memconf_val_ch0(CONFIG_SDRAM0_SIZE, CONFIG_DDR_NUM_CH0); - tmp |= sg_memconf_val_ch1(CONFIG_SDRAM1_SIZE, CONFIG_DDR_NUM_CH1); -#if CONFIG_SDRAM0_BASE + CONFIG_SDRAM0_SIZE < CONFIG_SDRAM1_BASE - tmp |= SG_MEMCONF_SPARSEMEM; -#endif - writel(tmp, SG_MEMCONF); - /* Input ports must be enabled before deasserting reset of cores */ tmp = readl(SG_IECTRL); tmp |= 1 << 6; |
