diff options
| -rw-r--r-- | src/cpu/samsung/exynos5250/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/cpu/samsung/exynos5250/clock_init.c | 2 | ||||
| -rw-r--r-- | src/cpu/samsung/exynos5250/dmc_common.c | 21 | ||||
| -rw-r--r-- | src/cpu/samsung/exynos5250/setup.h | 4 |
4 files changed, 5 insertions, 26 deletions
diff --git a/src/cpu/samsung/exynos5250/Makefile.inc b/src/cpu/samsung/exynos5250/Makefile.inc index 1b915a3266..6eee50328f 100644 --- a/src/cpu/samsung/exynos5250/Makefile.inc +++ b/src/cpu/samsung/exynos5250/Makefile.inc @@ -11,6 +11,8 @@ romstage-y += pinmux.c romstage-y += power.c romstage-y += soc.c romstage-y += uart.c +romstage-y += dmc_common.c +romstage-y += dmc_init_ddr3.c #ramstage-y += clock.c #ramstage-y += clock_init.c @@ -30,8 +32,6 @@ ramstage-y += uart.c #ramstage-$(CONFIG_EXYNOS_ACE_SHA) += ace_sha.c #ramstage-$(CONFIG_SATA_AHCI) += sata.c ramstage-$(CONFIG_SPL_BUILD) += lowlevel_init_c.c -ramstage-$(CONFIG_SPL_BUILD) += dmc_common.c -ramstage-$(CONFIG_SPL_BUILD) += dmc_init_ddr3.c exynos5250_add_bl1: $(obj)/coreboot.pre printf " DD Adding Samsung Exynos5250 BL1\n" diff --git a/src/cpu/samsung/exynos5250/clock_init.c b/src/cpu/samsung/exynos5250/clock_init.c index ea91bb4355..565abe1efb 100644 --- a/src/cpu/samsung/exynos5250/clock_init.c +++ b/src/cpu/samsung/exynos5250/clock_init.c @@ -744,7 +744,7 @@ struct mem_timings *clock_get_mem_timings(void) return NULL; } -void system_clock_init() +void system_clock_init(void) { struct exynos5_clock *clk = (struct exynos5_clock *)EXYNOS5_CLOCK_BASE; struct exynos5_mct_regs *mct_regs = diff --git a/src/cpu/samsung/exynos5250/dmc_common.c b/src/cpu/samsung/exynos5250/dmc_common.c index 35a13acc58..f91cbb357f 100644 --- a/src/cpu/samsung/exynos5250/dmc_common.c +++ b/src/cpu/samsung/exynos5250/dmc_common.c @@ -26,6 +26,8 @@ #include <common.h> #include <console/console.h> #include <cpu/samsung/exynos5250/setup.h> +#include <cpu/samsung/exynos5250/dmc.h> +#include <cpu/samsung/exynos5250/clock_init.h> #include <cpu/samsung/exynos5-common/spl.h> #include <system.h> @@ -179,22 +181,3 @@ void dmc_config_memory(struct mem_timings *mem, struct exynos5_dmc *dmc) writel(DMC_MEMBASECONFIG1_VAL, &dmc->membaseconfig1); } -void mem_ctrl_init() -{ - struct spl_machine_param *param = spl_get_machine_params(); - struct mem_timings *mem; - int ret; - - mem = clock_get_mem_timings(); - - /* If there are any other memory variant, add their init call below */ - if (param->mem_type == DDR_MODE_DDR3) { - ret = ddr3_mem_ctrl_init(mem, param->mem_iv_size); - if (ret) { - printk(BIOS_ERR, "Memory controller init failed, err: %u", ret); - BUG(); - } - } else { - die("Unknown memory type"); - } -} diff --git a/src/cpu/samsung/exynos5250/setup.h b/src/cpu/samsung/exynos5250/setup.h index bb438c5fd6..4f7f58cbeb 100644 --- a/src/cpu/samsung/exynos5250/setup.h +++ b/src/cpu/samsung/exynos5250/setup.h @@ -706,10 +706,6 @@ void mem_ctrl_init(void); */ int ddr3_mem_ctrl_init(struct mem_timings *mem, unsigned long mem_iv_size); -/* FIXME(dhendrix): why is this here? commenting it out and we'll use - clock_init.h instead */ -//void system_clock_init(void); - void tzpc_init(void); /* * Configure ZQ I/O interface |