From 13a500a404083c250e28816a394ee8d2849f4028 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Mon, 4 Jun 2018 08:01:09 +0300 Subject: amd/geode_lx: Fix .c includes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I2cce52561d30e30e1c81752cd2a455e7211006eb Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/26825 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi Reviewed-by: Piotr Król --- src/mainboard/pcengines/alix1c/romstage.c | 17 ++++++----------- src/mainboard/pcengines/alix2d/romstage.c | 10 +++------- 2 files changed, 9 insertions(+), 18 deletions(-) (limited to 'src/mainboard') diff --git a/src/mainboard/pcengines/alix1c/romstage.c b/src/mainboard/pcengines/alix1c/romstage.c index 4c06ada723..8fe2dc09d5 100644 --- a/src/mainboard/pcengines/alix1c/romstage.c +++ b/src/mainboard/pcengines/alix1c/romstage.c @@ -25,14 +25,14 @@ #include #include #include -#include #include - -#define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) - +#include +#include #include #include +#define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) + /* The part is a Hynix hy5du121622ctp-d43. * * HY 5D U 12 16 2 2 C T P D43 @@ -88,11 +88,6 @@ int spd_read_byte(unsigned int device, unsigned int address) return spdbytes[address]; } -#include "northbridge/amd/lx/pll_reset.c" -#include "cpu/amd/geode_lx/cpureginit.c" -#include "cpu/amd/geode_lx/syspreinit.c" -#include "cpu/amd/geode_lx/msrinit.c" - void asmlinkage mainboard_romstage_entry(unsigned long bist) { static const struct mem_controller memctrl[] = { @@ -100,7 +95,7 @@ void asmlinkage mainboard_romstage_entry(unsigned long bist) }; SystemPreInit(); - msr_init(); + lx_msr_init(); cs5536_early_setup(); @@ -114,7 +109,7 @@ void asmlinkage mainboard_romstage_entry(unsigned long bist) /* Halt if there was a built in self test failure */ report_bist_failure(bist); - pll_reset(); + lx_pll_reset(); cpuRegInit(0, DIMM0, DIMM1, DRAM_TERMINATED); diff --git a/src/mainboard/pcengines/alix2d/romstage.c b/src/mainboard/pcengines/alix2d/romstage.c index e653c9f03e..da3913d2a4 100644 --- a/src/mainboard/pcengines/alix2d/romstage.c +++ b/src/mainboard/pcengines/alix2d/romstage.c @@ -27,6 +27,7 @@ #include #include #include +#include #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) @@ -85,11 +86,6 @@ int spd_read_byte(unsigned int device, unsigned int address) return spdbytes[address]; } -#include "northbridge/amd/lx/pll_reset.c" -#include "cpu/amd/geode_lx/cpureginit.c" -#include "cpu/amd/geode_lx/syspreinit.c" -#include "cpu/amd/geode_lx/msrinit.c" - /** Early mainboard specific GPIO setup. */ static void mb_gpio_init(void) { @@ -122,7 +118,7 @@ void asmlinkage mainboard_romstage_entry(unsigned long bist) }; SystemPreInit(); - msr_init(); + lx_msr_init(); cs5536_early_setup(); @@ -136,7 +132,7 @@ void asmlinkage mainboard_romstage_entry(unsigned long bist) /* Halt if there was a built in self test failure */ report_bist_failure(bist); - pll_reset(); + lx_pll_reset(); cpuRegInit(0, DIMM0, DIMM1, DRAM_TERMINATED); -- cgit v1.2.3