6 files changed, 7 insertions, 12 deletions
diff --git a/src/cpu/samsung/exynos5-common/clk.h b/src/cpu/samsung/exynos5-common/clk.h
index 0178f88ff2..eb3b25336d 100644
--- a/src/cpu/samsung/exynos5-common/clk.h
+++ b/src/cpu/samsung/exynos5-common/clk.h
@@ -52,7 +52,7 @@ struct clk_bit_info {
 	s8 prediv_bit;
 };
 
-/* FIXME(dhendrix) conflicts with stp-common/clk.h */
+/* FIXME(dhendrix) conflicts with s5p-common/clk.h */
 #if 0
 unsigned long get_pll_clk(int pllreg);
 unsigned long get_arm_clk(void);
diff --git a/src/cpu/samsung/exynos5250/Makefile.inc b/src/cpu/samsung/exynos5250/Makefile.inc
index 1c6d7169a0..e2033ffcad 100644
--- a/src/cpu/samsung/exynos5250/Makefile.inc
+++ b/src/cpu/samsung/exynos5250/Makefile.inc
@@ -9,6 +9,7 @@
 bootblock-y += clock_init.c
 bootblock-y += clock.c
 bootblock-y += pinmux.c
+bootblock-y += power.c
 bootblock-y += soc.c
 bootblock-y += uart.c
 
diff --git a/src/cpu/samsung/exynos5250/clock_init.h b/src/cpu/samsung/exynos5250/clock_init.h
index 3757e7d761..bb7f7e9677 100644
--- a/src/cpu/samsung/exynos5250/clock_init.h
+++ b/src/cpu/samsung/exynos5250/clock_init.h
@@ -24,6 +24,7 @@
 
 #ifndef __EXYNOS_CLOCK_INIT_H
 #define __EXYNOS_CLOCK_INIT_H
+#include "dmc.h"
 
 /* These are the ratio's for configuring ARM clock */
 struct arm_clk_ratios {
diff --git a/src/cpu/samsung/exynos5250/power.c b/src/cpu/samsung/exynos5250/power.c
index 60003c4aad..d0650fb144 100644
--- a/src/cpu/samsung/exynos5250/power.c
+++ b/src/cpu/samsung/exynos5250/power.c
@@ -25,6 +25,7 @@
 #include <common.h>
 #include <arch/hlt.h>
 #include <arch/io.h>
+#include <arch/hlt.h>
 #include <console/console.h>
 #include <cpu/samsung/exynos5250/cpu.h>
 #include <cpu/samsung/exynos5250/power.h>
diff --git a/src/cpu/samsung/exynos5250/uart.c b/src/cpu/samsung/exynos5250/uart.c
index f3ee0815f0..3126d7a6e8 100644
--- a/src/cpu/samsung/exynos5250/uart.c
+++ b/src/cpu/samsung/exynos5250/uart.c
@@ -211,4 +211,7 @@ void uart_tx_byte(unsigned char data)
 {
 	exynos5_uart_tx_byte(data);
 }
+
+void uart_tx_flush(void) {
+}
 #endif
diff --git a/src/cpu/samsung/s5p-common/s3c24x0_i2c.c b/src/cpu/samsung/s5p-common/s3c24x0_i2c.c
index 2940b09a54..3e94ea7b49 100644
--- a/src/cpu/samsung/s5p-common/s3c24x0_i2c.c
+++ b/src/cpu/samsung/s5p-common/s3c24x0_i2c.c
@@ -221,22 +221,11 @@ void board_i2c_init(const void *blob)
 /*
  * MULTI BUS I2C support
  */
-/*
- * FIXME(dhendrix): not sure why this had to be guarded, but the code
- * should probably go into an exynos5-specific .c file if it really is
- * not generic.
- */
-//#ifdef CONFIG_EXYNOS5
 static void i2c_bus_init(struct s3c24x0_i2c_bus *i2c, unsigned int bus)
 {
 	exynos_pinmux_config(i2c->id, 0);
-
 	i2c_ch_init(i2c->regs, CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
 }
-//#else
-//#error "should not be here"
-//static void i2c_bus_init(struct s3c24x0_i2c_bus *i2c, unsigned int bus) {}
-//#endif
 
 #ifdef CONFIG_I2C_MULTI_BUS
 int i2c_set_bus_num(unsigned int bus)