armv7: Move Exynos from 'cpu' to 'soc'.

The Exynos family and most ARM products are SoC, not just CPU.

We used to put ARM code in src/cpu to avoid polluting the code base for what was
essentially an experiment at the time. Now that it's past the experimental phase
and we're going to see more SoCs (including intel/baytrail) in coreboot.

Change-Id: I5ea1f822664244edf5f77087bc8018d7c535f81c
Reviewed-on: https://chromium-review.googlesource.com/170891
Tested-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Ronald Minnich <rminnich@chromium.org>
Commit-Queue: Hung-Te Lin <hungte@chromium.org>
(cherry picked from commit c8bb8fe0b20be37465f93c738d80e7e43033670a)
Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com>
Reviewed-on: http://review.coreboot.org/6739
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>

116 files changed, 65 insertions, 63 deletions

diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig
index 6fced37880..b0f7a140ab 100644
--- a/src/cpu/Kconfig
+++ b/src/cpu/Kconfig
@@ -4,7 +4,6 @@
 
 source src/cpu/allwinner/Kconfig
 source src/cpu/armltd/Kconfig
-source src/cpu/samsung/Kconfig
 source src/cpu/ti/Kconfig
 
 source src/cpu/amd/Kconfig
diff --git a/src/cpu/Makefile.inc b/src/cpu/Makefile.inc
index d27e4a003f..60864ef5dd 100644
--- a/src/cpu/Makefile.inc
+++ b/src/cpu/Makefile.inc
@@ -6,7 +6,6 @@ subdirs-y += amd
 subdirs-y += dmp
 subdirs-y += armltd
 subdirs-y += intel
-subdirs-y += samsung
 subdirs-y += ti
 subdirs-y += via
 subdirs-y += x86
diff --git a/src/cpu/samsung/Kconfig b/src/cpu/samsung/Kconfig
deleted file mode 100644
index ae37403e5d..0000000000
--- a/src/cpu/samsung/Kconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-source src/cpu/samsung/exynos5250/Kconfig
-source src/cpu/samsung/exynos5420/Kconfig
diff --git a/src/mainboard/google/pit/chromeos.c b/src/mainboard/google/pit/chromeos.c
index 2933a352bd..7b0807c71a 100644
--- a/src/mainboard/google/pit/chromeos.c
+++ b/src/mainboard/google/pit/chromeos.c
@@ -24,8 +24,8 @@
 #include <string.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 #include <bootmode.h>
-#include <cpu/samsung/exynos5420/cpu.h>
-#include <cpu/samsung/exynos5420/gpio.h>
+#include <soc/samsung/exynos5420/cpu.h>
+#include <soc/samsung/exynos5420/gpio.h>
 
 void fill_lb_gpios(struct lb_gpios *gpios)
 {
diff --git a/src/mainboard/google/pit/devicetree.cb b/src/mainboard/google/pit/devicetree.cb
index 687b75076f..568daf86ef 100644
--- a/src/mainboard/google/pit/devicetree.cb
+++ b/src/mainboard/google/pit/devicetree.cb
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-chip cpu/samsung/exynos5420
+chip soc/samsung/exynos5420
 	device cpu_cluster 0 on end
 	register "xres" = "1366"
 	register "yres" = "768"
diff --git a/src/mainboard/google/pit/mainboard.c b/src/mainboard/google/pit/mainboard.c
index 5812a8445b..c0650d8542 100644
--- a/src/mainboard/google/pit/mainboard.c
+++ b/src/mainboard/google/pit/mainboard.c
@@ -28,15 +28,15 @@
 #include <boot/coreboot_tables.h>
 #include <arch/cache.h>
 #include <arch/exception.h>
-#include <cpu/samsung/exynos5420/tmu.h>
-#include <cpu/samsung/exynos5420/clk.h>
-#include <cpu/samsung/exynos5420/cpu.h>
-#include <cpu/samsung/exynos5420/gpio.h>
-#include <cpu/samsung/exynos5420/power.h>
-#include <cpu/samsung/exynos5420/i2c.h>
-#include <cpu/samsung/exynos5420/dp.h>
-#include <cpu/samsung/exynos5420/fimd.h>
-#include <cpu/samsung/exynos5420/usb.h>
+#include <soc/samsung/exynos5420/tmu.h>
+#include <soc/samsung/exynos5420/clk.h>
+#include <soc/samsung/exynos5420/cpu.h>
+#include <soc/samsung/exynos5420/gpio.h>
+#include <soc/samsung/exynos5420/power.h>
+#include <soc/samsung/exynos5420/i2c.h>
+#include <soc/samsung/exynos5420/dp.h>
+#include <soc/samsung/exynos5420/fimd.h>
+#include <soc/samsung/exynos5420/usb.h>
 #include <drivers/parade/ps8625/ps8625.h>
 #include <ec/google/chromeec/ec.h>
 #include <stdlib.h>
diff --git a/src/mainboard/google/pit/memory.c b/src/mainboard/google/pit/memory.c
index 7d8ddcbda6..8a9f454886 100644
--- a/src/mainboard/google/pit/memory.c
+++ b/src/mainboard/google/pit/memory.c
@@ -22,10 +22,10 @@
 #include <stdlib.h>
 #include <console/console.h>
 
-#include <cpu/samsung/exynos5420/gpio.h>
-#include <cpu/samsung/exynos5420/dmc.h>
-#include <cpu/samsung/exynos5420/setup.h>
-#include <cpu/samsung/exynos5420/clk.h>
+#include <soc/samsung/exynos5420/gpio.h>
+#include <soc/samsung/exynos5420/dmc.h>
+#include <soc/samsung/exynos5420/setup.h>
+#include <soc/samsung/exynos5420/clk.h>
 
 const struct mem_timings mem_timings = {
 		.mem_manuf = MEM_MANUF_SAMSUNG,
diff --git a/src/mainboard/google/pit/romstage.c b/src/mainboard/google/pit/romstage.c
index 7e096a79aa..1393ba8a8a 100644
--- a/src/mainboard/google/pit/romstage.c
+++ b/src/mainboard/google/pit/romstage.c
@@ -25,16 +25,16 @@
 #include <cbmem.h>
 
 #include <arch/cache.h>
-#include <cpu/samsung/exynos5420/i2c.h>
-#include <cpu/samsung/exynos5420/clk.h>
-#include <cpu/samsung/exynos5420/cpu.h>
-#include <cpu/samsung/exynos5420/dmc.h>
-#include <cpu/samsung/exynos5420/gpio.h>
-#include <cpu/samsung/exynos5420/setup.h>
-#include <cpu/samsung/exynos5420/periph.h>
-#include <cpu/samsung/exynos5420/power.h>
-#include <cpu/samsung/exynos5420/trustzone.h>
-#include <cpu/samsung/exynos5420/wakeup.h>
+#include <soc/samsung/exynos5420/i2c.h>
+#include <soc/samsung/exynos5420/clk.h>
+#include <soc/samsung/exynos5420/cpu.h>
+#include <soc/samsung/exynos5420/dmc.h>
+#include <soc/samsung/exynos5420/gpio.h>
+#include <soc/samsung/exynos5420/setup.h>
+#include <soc/samsung/exynos5420/periph.h>
+#include <soc/samsung/exynos5420/power.h>
+#include <soc/samsung/exynos5420/trustzone.h>
+#include <soc/samsung/exynos5420/wakeup.h>
 #include <console/console.h>
 #include <arch/stages.h>
 
diff --git a/src/mainboard/google/pit/wakeup.c b/src/mainboard/google/pit/wakeup.c
index a2f5f42307..130282cb64 100644
--- a/src/mainboard/google/pit/wakeup.c
+++ b/src/mainboard/google/pit/wakeup.c
@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <cpu/samsung/exynos5420/gpio.h>
-#include <cpu/samsung/exynos5420/wakeup.h>
+#include <soc/samsung/exynos5420/gpio.h>
+#include <soc/samsung/exynos5420/wakeup.h>
 
 int wakeup_need_reset(void)
 {
diff --git a/src/mainboard/google/snow/chromeos.c b/src/mainboard/google/snow/chromeos.c
index 5310a4dbef..f7443becc7 100644
--- a/src/mainboard/google/snow/chromeos.c
+++ b/src/mainboard/google/snow/chromeos.c
@@ -24,8 +24,8 @@
 #include <string.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 #include <bootmode.h>
-#include <cpu/samsung/exynos5250/cpu.h>
-#include <cpu/samsung/exynos5250/gpio.h>
+#include <soc/samsung/exynos5250/cpu.h>
+#include <soc/samsung/exynos5250/gpio.h>
 
 void fill_lb_gpios(struct lb_gpios *gpios)
 {
diff --git a/src/mainboard/google/snow/devicetree.cb b/src/mainboard/google/snow/devicetree.cb
index e6ce49dcca..2552e070e0 100644
--- a/src/mainboard/google/snow/devicetree.cb
+++ b/src/mainboard/google/snow/devicetree.cb
@@ -17,7 +17,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-chip cpu/samsung/exynos5250
+chip soc/samsung/exynos5250
 	device cpu_cluster 0 on end
 	register "xres" = "1366"
 	register "yres" = "768"
diff --git a/src/mainboard/google/snow/mainboard.c b/src/mainboard/google/snow/mainboard.c
index 5137d10c66..99a4e30a79 100644
--- a/src/mainboard/google/snow/mainboard.c
+++ b/src/mainboard/google/snow/mainboard.c
@@ -28,14 +28,14 @@
 #include <boot/coreboot_tables.h>
 #include <arch/cache.h>
 #include <arch/exception.h>
-#include <cpu/samsung/exynos5250/tmu.h>
-#include <cpu/samsung/exynos5250/clk.h>
-#include <cpu/samsung/exynos5250/gpio.h>
-#include <cpu/samsung/exynos5250/power.h>
-#include <cpu/samsung/exynos5250/i2c.h>
-#include <cpu/samsung/exynos5250/dp-core.h>
-#include <cpu/samsung/exynos5250/dp.h>
-#include <cpu/samsung/exynos5250/usb.h>
+#include <soc/samsung/exynos5250/tmu.h>
+#include <soc/samsung/exynos5250/clk.h>
+#include <soc/samsung/exynos5250/gpio.h>
+#include <soc/samsung/exynos5250/power.h>
+#include <soc/samsung/exynos5250/i2c.h>
+#include <soc/samsung/exynos5250/dp-core.h>
+#include <soc/samsung/exynos5250/dp.h>
+#include <soc/samsung/exynos5250/usb.h>
 
 #include "exynos5250.h"
 
diff --git a/src/mainboard/google/snow/memory.c b/src/mainboard/google/snow/memory.c
index 977dbbc79d..1cb87d4107 100644
--- a/src/mainboard/google/snow/memory.c
+++ b/src/mainboard/google/snow/memory.c
@@ -22,10 +22,10 @@
 #include <stdlib.h>
 #include <console/console.h>
 
-#include <cpu/samsung/exynos5250/gpio.h>
-#include <cpu/samsung/exynos5250/setup.h>
-#include <cpu/samsung/exynos5250/dmc.h>
-#include <cpu/samsung/exynos5250/clk.h>
+#include <soc/samsung/exynos5250/gpio.h>
+#include <soc/samsung/exynos5250/setup.h>
+#include <soc/samsung/exynos5250/dmc.h>
+#include <soc/samsung/exynos5250/clk.h>
 
 const struct mem_timings mem_timings[] = {
 	{
diff --git a/src/mainboard/google/snow/romstage.c b/src/mainboard/google/snow/romstage.c
index 1c49d35e9f..ac469ba41b 100644
--- a/src/mainboard/google/snow/romstage.c
+++ b/src/mainboard/google/snow/romstage.c
@@ -24,16 +24,16 @@
 #include <cbmem.h>
 
 #include <arch/cache.h>
-#include <cpu/samsung/exynos5250/i2c.h>
-#include <cpu/samsung/exynos5250/clk.h>
-#include <cpu/samsung/exynos5250/cpu.h>
-#include <cpu/samsung/exynos5250/dmc.h>
-#include <cpu/samsung/exynos5250/gpio.h>
-#include <cpu/samsung/exynos5250/setup.h>
-#include <cpu/samsung/exynos5250/periph.h>
-#include <cpu/samsung/exynos5250/power.h>
-#include <cpu/samsung/exynos5250/trustzone.h>
-#include <cpu/samsung/exynos5250/wakeup.h>
+#include <soc/samsung/exynos5250/i2c.h>
+#include <soc/samsung/exynos5250/clk.h>
+#include <soc/samsung/exynos5250/cpu.h>
+#include <soc/samsung/exynos5250/dmc.h>
+#include <soc/samsung/exynos5250/gpio.h>
+#include <soc/samsung/exynos5250/setup.h>
+#include <soc/samsung/exynos5250/periph.h>
+#include <soc/samsung/exynos5250/power.h>
+#include <soc/samsung/exynos5250/trustzone.h>
+#include <soc/samsung/exynos5250/wakeup.h>
 #include <console/console.h>
 #include <arch/stages.h>
 
diff --git a/src/mainboard/google/snow/wakeup.c b/src/mainboard/google/snow/wakeup.c
index e3cd2ba630..8b7fc4b9d2 100644
--- a/src/mainboard/google/snow/wakeup.c
+++ b/src/mainboard/google/snow/wakeup.c
@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <cpu/samsung/exynos5250/gpio.h>
-#include <cpu/samsung/exynos5250/wakeup.h>
+#include <soc/samsung/exynos5250/gpio.h>
+#include <soc/samsung/exynos5250/wakeup.h>
 
 int wakeup_need_reset(void)
 {
diff --git a/src/soc/Kconfig b/src/soc/Kconfig
index 152e206374..5903a57bcb 100644
--- a/src/soc/Kconfig
+++ b/src/soc/Kconfig
@@ -1,2 +1,3 @@
 source src/soc/intel/Kconfig
 source src/soc/nvidia/Kconfig
+source src/soc/samsung/Kconfig
\ No newline at end of file
diff --git a/src/soc/Makefile.inc b/src/soc/Makefile.inc
index d419309105..b36d5be853 100644
--- a/src/soc/Makefile.inc
+++ b/src/soc/Makefile.inc
@@ -3,3 +3,4 @@
 ################################################################################
 subdirs-y += intel
 subdirs-y += nvidia
+subdirs-y += samsung
diff --git a/src/soc/samsung/Kconfig b/src/soc/samsung/Kconfig
new file mode 100644
index 0000000000..9241d27bbf
--- /dev/null
+++ b/src/soc/samsung/Kconfig
@@ -0,0 +1,2 @@
+source src/soc/samsung/exynos5250/Kconfig
+source src/soc/samsung/exynos5420/Kconfig
diff --git a/src/cpu/samsung/Makefile.inc b/src/soc/samsung/Makefile.inc
index 496b5f7be3..496b5f7be3 100644
--- a/src/cpu/samsung/Makefile.inc
+++ b/src/soc/samsung/Makefile.inc
diff --git a/src/cpu/samsung/exynos5250/Kconfig b/src/soc/samsung/exynos5250/Kconfig
index 2b4ad3995b..2b4ad3995b 100644
--- a/src/cpu/samsung/exynos5250/Kconfig
+++ b/src/soc/samsung/exynos5250/Kconfig
diff --git a/src/cpu/samsung/exynos5250/Makefile.inc b/src/soc/samsung/exynos5250/Makefile.inc
index 1660dbd5f2..a15bc9c6a3 100644
--- a/src/cpu/samsung/exynos5250/Makefile.inc
+++ b/src/soc/samsung/exynos5250/Makefile.inc
@@ -57,5 +57,6 @@ ramstage-y += cbmem.c
 $(obj)/coreboot.rom: exynos5250_add_bl1
 exynos5250_add_bl1: $(obj)/coreboot.pre
 	printf "    DD         Adding Samsung Exynos5250 BL1\n"
+	# TODO(hungte) Change this 'cpu' to soc when build scripts are changed.
 	dd if=3rdparty/cpu/samsung/exynos5250/bl1.bin \
 		of=$(obj)/coreboot.pre conv=notrunc >/dev/null 2>&1
diff --git a/src/cpu/samsung/exynos5250/alternate_cbfs.c b/src/soc/samsung/exynos5250/alternate_cbfs.c
index 10b33f0c2b..10b33f0c2b 100644
--- a/src/cpu/samsung/exynos5250/alternate_cbfs.c
+++ b/src/soc/samsung/exynos5250/alternate_cbfs.c
diff --git a/src/cpu/samsung/exynos5250/alternate_cbfs.h b/src/soc/samsung/exynos5250/alternate_cbfs.h
index 72a30acc84..72a30acc84 100644
--- a/src/cpu/samsung/exynos5250/alternate_cbfs.h
+++ b/src/soc/samsung/exynos5250/alternate_cbfs.h
diff --git a/src/cpu/samsung/exynos5250/bootblock.c b/src/soc/samsung/exynos5250/bootblock.c
index f524399e91..f524399e91 100644
--- a/src/cpu/samsung/exynos5250/bootblock.c
+++ b/src/soc/samsung/exynos5250/bootblock.c
diff --git a/src/cpu/samsung/exynos5250/cbmem.c b/src/soc/samsung/exynos5250/cbmem.c
index 465032013b..465032013b 100644
--- a/src/cpu/samsung/exynos5250/cbmem.c
+++ b/src/soc/samsung/exynos5250/cbmem.c
diff --git a/src/cpu/samsung/exynos5250/chip.h b/src/soc/samsung/exynos5250/chip.h
index c2e7fb500d..242bd21c70 100644
--- a/src/cpu/samsung/exynos5250/chip.h
+++ b/src/soc/samsung/exynos5250/chip.h
@@ -22,7 +22,7 @@
 
 #include "gpio.h"
 
-struct cpu_samsung_exynos5250_config {
+struct soc_samsung_exynos5250_config {
 	/* special magic numbers! */
 	int clkval_f;
 	int upper_margin;
diff --git a/src/cpu/samsung/exynos5250/clk.h b/src/soc/samsung/exynos5250/clk.h
index f09ac41643..f09ac41643 100644
--- a/src/cpu/samsung/exynos5250/clk.h
+++ b/src/soc/samsung/exynos5250/clk.h
diff --git a/src/cpu/samsung/exynos5250/clock.c b/src/soc/samsung/exynos5250/clock.c
index 8a731be2a3..8a731be2a3 100644
--- a/src/cpu/samsung/exynos5250/clock.c
+++ b/src/soc/samsung/exynos5250/clock.c
diff --git a/src/cpu/samsung/exynos5250/clock_init.c b/src/soc/samsung/exynos5250/clock_init.c
index c8cf3babfb..c8cf3babfb 100644
--- a/src/cpu/samsung/exynos5250/clock_init.c
+++ b/src/soc/samsung/exynos5250/clock_init.c
diff --git a/src/cpu/samsung/exynos5250/cpu.c b/src/soc/samsung/exynos5250/cpu.c
index fd1bf2d149..6b3ee8bc0b 100644
--- a/src/cpu/samsung/exynos5250/cpu.c
+++ b/src/soc/samsung/exynos5250/cpu.c
@@ -63,7 +63,7 @@ static void exynos_displayport_init(device_t dev, u32 lcdbase,
 		unsigned long fb_size)
 {
 	int ret;
-	struct cpu_samsung_exynos5250_config *conf = dev->chip_info;
+	struct soc_samsung_exynos5250_config *conf = dev->chip_info;
 	/* put these on the stack. If, at some point, we want to move
 	 * this code to a pre-ram stage, it will be much easier.
 	 */
diff --git a/src/cpu/samsung/exynos5250/cpu.h b/src/soc/samsung/exynos5250/cpu.h
index 10f9ef4d21..10f9ef4d21 100644
--- a/src/cpu/samsung/exynos5250/cpu.h
+++ b/src/soc/samsung/exynos5250/cpu.h
diff --git a/src/cpu/samsung/exynos5250/dmc.h b/src/soc/samsung/exynos5250/dmc.h
index 6388316c5e..6388316c5e 100644
--- a/src/cpu/samsung/exynos5250/dmc.h
+++ b/src/soc/samsung/exynos5250/dmc.h
diff --git a/src/cpu/samsung/exynos5250/dmc_common.c b/src/soc/samsung/exynos5250/dmc_common.c
index 624097b12b..624097b12b 100644
--- a/src/cpu/samsung/exynos5250/dmc_common.c
+++ b/src/soc/samsung/exynos5250/dmc_common.c
diff --git a/src/cpu/samsung/exynos5250/dmc_init_ddr3.c b/src/soc/samsung/exynos5250/dmc_init_ddr3.c
index 89a7b613e7..89a7b613e7 100644
--- a/src/cpu/samsung/exynos5250/dmc_init_ddr3.c
+++ b/src/soc/samsung/exynos5250/dmc_init_ddr3.c
diff --git a/src/cpu/samsung/exynos5250/dp-core.h b/src/soc/samsung/exynos5250/dp-core.h
index ab7e7e4b32..ab7e7e4b32 100644
--- a/src/cpu/samsung/exynos5250/dp-core.h
+++ b/src/soc/samsung/exynos5250/dp-core.h
diff --git a/src/cpu/samsung/exynos5250/dp-reg.c b/src/soc/samsung/exynos5250/dp-reg.c
index 1cc70887ce..1cc70887ce 100644
--- a/src/cpu/samsung/exynos5250/dp-reg.c
+++ b/src/soc/samsung/exynos5250/dp-reg.c
diff --git a/src/cpu/samsung/exynos5250/dp.h b/src/soc/samsung/exynos5250/dp.h
index b1533c74f7..b1533c74f7 100644
--- a/src/cpu/samsung/exynos5250/dp.h
+++ b/src/soc/samsung/exynos5250/dp.h
diff --git a/src/cpu/samsung/exynos5250/dsim.h b/src/soc/samsung/exynos5250/dsim.h
index b9245d31e6..b9245d31e6 100644
--- a/src/cpu/samsung/exynos5250/dsim.h
+++ b/src/soc/samsung/exynos5250/dsim.h
diff --git a/src/cpu/samsung/exynos5250/fb.c b/src/soc/samsung/exynos5250/fb.c
index 080be49250..080be49250 100644
--- a/src/cpu/samsung/exynos5250/fb.c
+++ b/src/soc/samsung/exynos5250/fb.c
diff --git a/src/cpu/samsung/exynos5250/fimd.h b/src/soc/samsung/exynos5250/fimd.h
index 178fb73d08..178fb73d08 100644
--- a/src/cpu/samsung/exynos5250/fimd.h
+++ b/src/soc/samsung/exynos5250/fimd.h
diff --git a/src/cpu/samsung/exynos5250/gpio.c b/src/soc/samsung/exynos5250/gpio.c
index 2a93328a70..2a93328a70 100644
--- a/src/cpu/samsung/exynos5250/gpio.c
+++ b/src/soc/samsung/exynos5250/gpio.c
diff --git a/src/cpu/samsung/exynos5250/gpio.h b/src/soc/samsung/exynos5250/gpio.h
index a8f22f7df0..a8f22f7df0 100644
--- a/src/cpu/samsung/exynos5250/gpio.h
+++ b/src/soc/samsung/exynos5250/gpio.h
diff --git a/src/cpu/samsung/exynos5250/i2c.c b/src/soc/samsung/exynos5250/i2c.c
index e83ab57014..e83ab57014 100644
--- a/src/cpu/samsung/exynos5250/i2c.c
+++ b/src/soc/samsung/exynos5250/i2c.c
diff --git a/src/cpu/samsung/exynos5250/i2c.h b/src/soc/samsung/exynos5250/i2c.h
index a1d8bc1dcd..a1d8bc1dcd 100644
--- a/src/cpu/samsung/exynos5250/i2c.h
+++ b/src/soc/samsung/exynos5250/i2c.h
diff --git a/src/cpu/samsung/exynos5250/i2s-regs.h b/src/soc/samsung/exynos5250/i2s-regs.h
index fabd914180..fabd914180 100644
--- a/src/cpu/samsung/exynos5250/i2s-regs.h
+++ b/src/soc/samsung/exynos5250/i2s-regs.h
diff --git a/src/cpu/samsung/exynos5250/mct.c b/src/soc/samsung/exynos5250/mct.c
index bbb90e49bb..bbb90e49bb 100644
--- a/src/cpu/samsung/exynos5250/mct.c
+++ b/src/soc/samsung/exynos5250/mct.c
diff --git a/src/cpu/samsung/exynos5250/monotonic_timer.c b/src/soc/samsung/exynos5250/monotonic_timer.c
index 89ac416eb1..89ac416eb1 100644
--- a/src/cpu/samsung/exynos5250/monotonic_timer.c
+++ b/src/soc/samsung/exynos5250/monotonic_timer.c
diff --git a/src/cpu/samsung/exynos5250/periph.h b/src/soc/samsung/exynos5250/periph.h
index 7d8bf623f6..7d8bf623f6 100644
--- a/src/cpu/samsung/exynos5250/periph.h
+++ b/src/soc/samsung/exynos5250/periph.h
diff --git a/src/cpu/samsung/exynos5250/pinmux.c b/src/soc/samsung/exynos5250/pinmux.c
index dc9590f20f..dc9590f20f 100644
--- a/src/cpu/samsung/exynos5250/pinmux.c
+++ b/src/soc/samsung/exynos5250/pinmux.c
diff --git a/src/cpu/samsung/exynos5250/pinmux.h b/src/soc/samsung/exynos5250/pinmux.h
index 227a2807e3..227a2807e3 100644
--- a/src/cpu/samsung/exynos5250/pinmux.h
+++ b/src/soc/samsung/exynos5250/pinmux.h
diff --git a/src/cpu/samsung/exynos5250/power.c b/src/soc/samsung/exynos5250/power.c
index c9d620a958..c9d620a958 100644
--- a/src/cpu/samsung/exynos5250/power.c
+++ b/src/soc/samsung/exynos5250/power.c
diff --git a/src/cpu/samsung/exynos5250/power.h b/src/soc/samsung/exynos5250/power.h
index 5ea73c7ef8..5ea73c7ef8 100644
--- a/src/cpu/samsung/exynos5250/power.h
+++ b/src/soc/samsung/exynos5250/power.h
diff --git a/src/cpu/samsung/exynos5250/setup.h b/src/soc/samsung/exynos5250/setup.h
index c65747b775..c65747b775 100644
--- a/src/cpu/samsung/exynos5250/setup.h
+++ b/src/soc/samsung/exynos5250/setup.h
diff --git a/src/cpu/samsung/exynos5250/spi.c b/src/soc/samsung/exynos5250/spi.c
index 33ec6984db..33ec6984db 100644
--- a/src/cpu/samsung/exynos5250/spi.c
+++ b/src/soc/samsung/exynos5250/spi.c
diff --git a/src/cpu/samsung/exynos5250/spi.h b/src/soc/samsung/exynos5250/spi.h
index 7ca311444c..7ca311444c 100644
--- a/src/cpu/samsung/exynos5250/spi.h
+++ b/src/soc/samsung/exynos5250/spi.h
diff --git a/src/cpu/samsung/exynos5250/sysreg.h b/src/soc/samsung/exynos5250/sysreg.h
index 1362177a33..1362177a33 100644
--- a/src/cpu/samsung/exynos5250/sysreg.h
+++ b/src/soc/samsung/exynos5250/sysreg.h
diff --git a/src/cpu/samsung/exynos5250/timer.c b/src/soc/samsung/exynos5250/timer.c
index 5d402bc4bc..5d402bc4bc 100644
--- a/src/cpu/samsung/exynos5250/timer.c
+++ b/src/soc/samsung/exynos5250/timer.c
diff --git a/src/cpu/samsung/exynos5250/tmu.c b/src/soc/samsung/exynos5250/tmu.c
index 1b5e9c2b64..1b5e9c2b64 100644
--- a/src/cpu/samsung/exynos5250/tmu.c
+++ b/src/soc/samsung/exynos5250/tmu.c
diff --git a/src/cpu/samsung/exynos5250/tmu.h b/src/soc/samsung/exynos5250/tmu.h
index bda4bd7dd8..bda4bd7dd8 100644
--- a/src/cpu/samsung/exynos5250/tmu.h
+++ b/src/soc/samsung/exynos5250/tmu.h
diff --git a/src/cpu/samsung/exynos5250/trustzone.c b/src/soc/samsung/exynos5250/trustzone.c
index d67eb33228..d67eb33228 100644
--- a/src/cpu/samsung/exynos5250/trustzone.c
+++ b/src/soc/samsung/exynos5250/trustzone.c
diff --git a/src/cpu/samsung/exynos5250/trustzone.h b/src/soc/samsung/exynos5250/trustzone.h
index 7b4af9b1f1..7b4af9b1f1 100644
--- a/src/cpu/samsung/exynos5250/trustzone.h
+++ b/src/soc/samsung/exynos5250/trustzone.h
diff --git a/src/cpu/samsung/exynos5250/uart.c b/src/soc/samsung/exynos5250/uart.c
index cc97291807..cc97291807 100644
--- a/src/cpu/samsung/exynos5250/uart.c
+++ b/src/soc/samsung/exynos5250/uart.c
diff --git a/src/cpu/samsung/exynos5250/uart.h b/src/soc/samsung/exynos5250/uart.h
index d324a2f93d..d324a2f93d 100644
--- a/src/cpu/samsung/exynos5250/uart.h
+++ b/src/soc/samsung/exynos5250/uart.h
diff --git a/src/cpu/samsung/exynos5250/usb.c b/src/soc/samsung/exynos5250/usb.c
index 76da1dd56e..76da1dd56e 100644
--- a/src/cpu/samsung/exynos5250/usb.c
+++ b/src/soc/samsung/exynos5250/usb.c
diff --git a/src/cpu/samsung/exynos5250/usb.h b/src/soc/samsung/exynos5250/usb.h
index ad617da96c..ad617da96c 100644
--- a/src/cpu/samsung/exynos5250/usb.h
+++ b/src/soc/samsung/exynos5250/usb.h
diff --git a/src/cpu/samsung/exynos5250/wakeup.c b/src/soc/samsung/exynos5250/wakeup.c
index b7161cf935..b7161cf935 100644
--- a/src/cpu/samsung/exynos5250/wakeup.c
+++ b/src/soc/samsung/exynos5250/wakeup.c
diff --git a/src/cpu/samsung/exynos5250/wakeup.h b/src/soc/samsung/exynos5250/wakeup.h
index 690c6a3262..690c6a3262 100644
--- a/src/cpu/samsung/exynos5250/wakeup.h
+++ b/src/soc/samsung/exynos5250/wakeup.h
diff --git a/src/cpu/samsung/exynos5420/Kconfig b/src/soc/samsung/exynos5420/Kconfig
index a0d6c9882c..a0d6c9882c 100644
--- a/src/cpu/samsung/exynos5420/Kconfig
+++ b/src/soc/samsung/exynos5420/Kconfig
diff --git a/src/cpu/samsung/exynos5420/Makefile.inc b/src/soc/samsung/exynos5420/Makefile.inc
index fd9d3797d6..ef77b1b728 100644
--- a/src/cpu/samsung/exynos5420/Makefile.inc
+++ b/src/soc/samsung/exynos5420/Makefile.inc
@@ -57,5 +57,6 @@ ramstage-y += cbmem.c
 $(obj)/coreboot.rom: exynos5420_add_bl1
 exynos5420_add_bl1: $(obj)/coreboot.pre
 	printf "    DD         Adding Samsung Exynos5420 BL1\n"
+	# TODO(hungte) Change this 'cpu' to soc when build scripts are changed.
 	dd if=3rdparty/cpu/samsung/exynos5420/bl1.bin \
 		of=$(obj)/coreboot.pre conv=notrunc >/dev/null 2>&1
diff --git a/src/cpu/samsung/exynos5420/alternate_cbfs.c b/src/soc/samsung/exynos5420/alternate_cbfs.c
index d19098b948..d19098b948 100644
--- a/src/cpu/samsung/exynos5420/alternate_cbfs.c
+++ b/src/soc/samsung/exynos5420/alternate_cbfs.c
diff --git a/src/cpu/samsung/exynos5420/alternate_cbfs.h b/src/soc/samsung/exynos5420/alternate_cbfs.h
index af7751d4ee..af7751d4ee 100644
--- a/src/cpu/samsung/exynos5420/alternate_cbfs.h
+++ b/src/soc/samsung/exynos5420/alternate_cbfs.h
diff --git a/src/cpu/samsung/exynos5420/bootblock.c b/src/soc/samsung/exynos5420/bootblock.c
index 5d2d2b73ca..5d2d2b73ca 100644
--- a/src/cpu/samsung/exynos5420/bootblock.c
+++ b/src/soc/samsung/exynos5420/bootblock.c
diff --git a/src/cpu/samsung/exynos5420/cbmem.c b/src/soc/samsung/exynos5420/cbmem.c
index 465032013b..465032013b 100644
--- a/src/cpu/samsung/exynos5420/cbmem.c
+++ b/src/soc/samsung/exynos5420/cbmem.c
diff --git a/src/cpu/samsung/exynos5420/chip.h b/src/soc/samsung/exynos5420/chip.h
index 220a315380..65bcacb1fd 100644
--- a/src/cpu/samsung/exynos5420/chip.h
+++ b/src/soc/samsung/exynos5420/chip.h
@@ -22,7 +22,7 @@
 
 #include "gpio.h"
 
-struct cpu_samsung_exynos5420_config {
+struct soc_samsung_exynos5420_config {
 	/* special magic numbers! */
 	int clkval_f;
 	int upper_margin;
diff --git a/src/cpu/samsung/exynos5420/clk.h b/src/soc/samsung/exynos5420/clk.h
index 83d4ad6320..83d4ad6320 100644
--- a/src/cpu/samsung/exynos5420/clk.h
+++ b/src/soc/samsung/exynos5420/clk.h
diff --git a/src/cpu/samsung/exynos5420/clock.c b/src/soc/samsung/exynos5420/clock.c
index 7043310a43..7043310a43 100644
--- a/src/cpu/samsung/exynos5420/clock.c
+++ b/src/soc/samsung/exynos5420/clock.c
diff --git a/src/cpu/samsung/exynos5420/clock_init.c b/src/soc/samsung/exynos5420/clock_init.c
index cfac01e307..cfac01e307 100644
--- a/src/cpu/samsung/exynos5420/clock_init.c
+++ b/src/soc/samsung/exynos5420/clock_init.c
diff --git a/src/cpu/samsung/exynos5420/cpu.c b/src/soc/samsung/exynos5420/cpu.c
index bfb8421910..3f915f0460 100644
--- a/src/cpu/samsung/exynos5420/cpu.c
+++ b/src/soc/samsung/exynos5420/cpu.c
@@ -76,7 +76,7 @@ static void set_cpu_id(void)
 static void exynos_displayport_init(device_t dev, u32 lcdbase,
 		unsigned long fb_size)
 {
-	struct cpu_samsung_exynos5420_config *conf = dev->chip_info;
+	struct soc_samsung_exynos5420_config *conf = dev->chip_info;
 	/* put these on the stack. If, at some point, we want to move
 	 * this code to a pre-ram stage, it will be much easier.
 	 */
diff --git a/src/cpu/samsung/exynos5420/cpu.h b/src/soc/samsung/exynos5420/cpu.h
index 5b5c731bf0..5b5c731bf0 100644
--- a/src/cpu/samsung/exynos5420/cpu.h
+++ b/src/soc/samsung/exynos5420/cpu.h
diff --git a/src/cpu/samsung/exynos5420/dmc.h b/src/soc/samsung/exynos5420/dmc.h
index fa7482ae89..fa7482ae89 100644
--- a/src/cpu/samsung/exynos5420/dmc.h
+++ b/src/soc/samsung/exynos5420/dmc.h
diff --git a/src/cpu/samsung/exynos5420/dmc_common.c b/src/soc/samsung/exynos5420/dmc_common.c
index 433312eb3e..433312eb3e 100644
--- a/src/cpu/samsung/exynos5420/dmc_common.c
+++ b/src/soc/samsung/exynos5420/dmc_common.c
diff --git a/src/cpu/samsung/exynos5420/dmc_init_ddr3.c b/src/soc/samsung/exynos5420/dmc_init_ddr3.c
index 4acf7d13f3..4acf7d13f3 100644
--- a/src/cpu/samsung/exynos5420/dmc_init_ddr3.c
+++ b/src/soc/samsung/exynos5420/dmc_init_ddr3.c
diff --git a/src/cpu/samsung/exynos5420/dp.c b/src/soc/samsung/exynos5420/dp.c
index b147035b64..b147035b64 100644
--- a/src/cpu/samsung/exynos5420/dp.c
+++ b/src/soc/samsung/exynos5420/dp.c
diff --git a/src/cpu/samsung/exynos5420/dp.h b/src/soc/samsung/exynos5420/dp.h
index 9131b0853c..9131b0853c 100644
--- a/src/cpu/samsung/exynos5420/dp.h
+++ b/src/soc/samsung/exynos5420/dp.h
diff --git a/src/cpu/samsung/exynos5420/dp_lowlevel.c b/src/soc/samsung/exynos5420/dp_lowlevel.c
index 2b2418ec21..2b2418ec21 100644
--- a/src/cpu/samsung/exynos5420/dp_lowlevel.c
+++ b/src/soc/samsung/exynos5420/dp_lowlevel.c
diff --git a/src/cpu/samsung/exynos5420/dsim.h b/src/soc/samsung/exynos5420/dsim.h
index 25015a26ad..25015a26ad 100644
--- a/src/cpu/samsung/exynos5420/dsim.h
+++ b/src/soc/samsung/exynos5420/dsim.h
diff --git a/src/cpu/samsung/exynos5420/fimd.c b/src/soc/samsung/exynos5420/fimd.c
index 1e51712e53..1e51712e53 100644
--- a/src/cpu/samsung/exynos5420/fimd.c
+++ b/src/soc/samsung/exynos5420/fimd.c
diff --git a/src/cpu/samsung/exynos5420/fimd.h b/src/soc/samsung/exynos5420/fimd.h
index ce8773fd17..ce8773fd17 100644
--- a/src/cpu/samsung/exynos5420/fimd.h
+++ b/src/soc/samsung/exynos5420/fimd.h
diff --git a/src/cpu/samsung/exynos5420/gpio.c b/src/soc/samsung/exynos5420/gpio.c
index 2b65eda04e..2b65eda04e 100644
--- a/src/cpu/samsung/exynos5420/gpio.c
+++ b/src/soc/samsung/exynos5420/gpio.c
diff --git a/src/cpu/samsung/exynos5420/gpio.h b/src/soc/samsung/exynos5420/gpio.h
index 4cf8e57249..4cf8e57249 100644
--- a/src/cpu/samsung/exynos5420/gpio.h
+++ b/src/soc/samsung/exynos5420/gpio.h
diff --git a/src/cpu/samsung/exynos5420/i2c.c b/src/soc/samsung/exynos5420/i2c.c
index 226862802a..226862802a 100644
--- a/src/cpu/samsung/exynos5420/i2c.c
+++ b/src/soc/samsung/exynos5420/i2c.c
diff --git a/src/cpu/samsung/exynos5420/i2c.h b/src/soc/samsung/exynos5420/i2c.h
index e8fe8201db..e8fe8201db 100644
--- a/src/cpu/samsung/exynos5420/i2c.h
+++ b/src/soc/samsung/exynos5420/i2c.h
diff --git a/src/cpu/samsung/exynos5420/i2s-regs.h b/src/soc/samsung/exynos5420/i2s-regs.h
index 28d2685c63..28d2685c63 100644
--- a/src/cpu/samsung/exynos5420/i2s-regs.h
+++ b/src/soc/samsung/exynos5420/i2s-regs.h
diff --git a/src/cpu/samsung/exynos5420/mct.c b/src/soc/samsung/exynos5420/mct.c
index bbb90e49bb..bbb90e49bb 100644
--- a/src/cpu/samsung/exynos5420/mct.c
+++ b/src/soc/samsung/exynos5420/mct.c
diff --git a/src/cpu/samsung/exynos5420/monotonic_timer.c b/src/soc/samsung/exynos5420/monotonic_timer.c
index 89ac416eb1..89ac416eb1 100644
--- a/src/cpu/samsung/exynos5420/monotonic_timer.c
+++ b/src/soc/samsung/exynos5420/monotonic_timer.c
diff --git a/src/cpu/samsung/exynos5420/periph.h b/src/soc/samsung/exynos5420/periph.h
index 94f150e6dd..94f150e6dd 100644
--- a/src/cpu/samsung/exynos5420/periph.h
+++ b/src/soc/samsung/exynos5420/periph.h
diff --git a/src/cpu/samsung/exynos5420/pinmux.c b/src/soc/samsung/exynos5420/pinmux.c
index 43a4332503..43a4332503 100644
--- a/src/cpu/samsung/exynos5420/pinmux.c
+++ b/src/soc/samsung/exynos5420/pinmux.c
diff --git a/src/cpu/samsung/exynos5420/pinmux.h b/src/soc/samsung/exynos5420/pinmux.h
index fc09fc95fb..fc09fc95fb 100644
--- a/src/cpu/samsung/exynos5420/pinmux.h
+++ b/src/soc/samsung/exynos5420/pinmux.h
diff --git a/src/cpu/samsung/exynos5420/power.c b/src/soc/samsung/exynos5420/power.c
index ecaf208c9c..ecaf208c9c 100644
--- a/src/cpu/samsung/exynos5420/power.c
+++ b/src/soc/samsung/exynos5420/power.c
diff --git a/src/cpu/samsung/exynos5420/power.h b/src/soc/samsung/exynos5420/power.h
index fd1eac5768..fd1eac5768 100644
--- a/src/cpu/samsung/exynos5420/power.h
+++ b/src/soc/samsung/exynos5420/power.h
diff --git a/src/cpu/samsung/exynos5420/setup.h b/src/soc/samsung/exynos5420/setup.h
index 63e40a8f0f..63e40a8f0f 100644
--- a/src/cpu/samsung/exynos5420/setup.h
+++ b/src/soc/samsung/exynos5420/setup.h
diff --git a/src/cpu/samsung/exynos5420/smp.c b/src/soc/samsung/exynos5420/smp.c
index 6fc2fb01ea..6fc2fb01ea 100644
--- a/src/cpu/samsung/exynos5420/smp.c
+++ b/src/soc/samsung/exynos5420/smp.c
diff --git a/src/cpu/samsung/exynos5420/spi.c b/src/soc/samsung/exynos5420/spi.c
index c6c08e925c..c6c08e925c 100644
--- a/src/cpu/samsung/exynos5420/spi.c
+++ b/src/soc/samsung/exynos5420/spi.c
diff --git a/src/cpu/samsung/exynos5420/spi.h b/src/soc/samsung/exynos5420/spi.h
index 94b4fdaace..94b4fdaace 100644
--- a/src/cpu/samsung/exynos5420/spi.h
+++ b/src/soc/samsung/exynos5420/spi.h
diff --git a/src/cpu/samsung/exynos5420/sysreg.h b/src/soc/samsung/exynos5420/sysreg.h
index fa25def318..fa25def318 100644
--- a/src/cpu/samsung/exynos5420/sysreg.h
+++ b/src/soc/samsung/exynos5420/sysreg.h
diff --git a/src/cpu/samsung/exynos5420/timer.c b/src/soc/samsung/exynos5420/timer.c
index ae13342c92..ae13342c92 100644
--- a/src/cpu/samsung/exynos5420/timer.c
+++ b/src/soc/samsung/exynos5420/timer.c
diff --git a/src/cpu/samsung/exynos5420/tmu.c b/src/soc/samsung/exynos5420/tmu.c
index 1b04b6cb42..1b04b6cb42 100644
--- a/src/cpu/samsung/exynos5420/tmu.c
+++ b/src/soc/samsung/exynos5420/tmu.c
diff --git a/src/cpu/samsung/exynos5420/tmu.h b/src/soc/samsung/exynos5420/tmu.h
index cf81b9ad33..cf81b9ad33 100644
--- a/src/cpu/samsung/exynos5420/tmu.h
+++ b/src/soc/samsung/exynos5420/tmu.h
diff --git a/src/cpu/samsung/exynos5420/trustzone.c b/src/soc/samsung/exynos5420/trustzone.c
index 7b1489a1a6..7b1489a1a6 100644
--- a/src/cpu/samsung/exynos5420/trustzone.c
+++ b/src/soc/samsung/exynos5420/trustzone.c
diff --git a/src/cpu/samsung/exynos5420/trustzone.h b/src/soc/samsung/exynos5420/trustzone.h
index 69e683aeba..69e683aeba 100644
--- a/src/cpu/samsung/exynos5420/trustzone.h
+++ b/src/soc/samsung/exynos5420/trustzone.h
diff --git a/src/cpu/samsung/exynos5420/uart.c b/src/soc/samsung/exynos5420/uart.c
index be96d5b86c..be96d5b86c 100644
--- a/src/cpu/samsung/exynos5420/uart.c
+++ b/src/soc/samsung/exynos5420/uart.c
diff --git a/src/cpu/samsung/exynos5420/uart.h b/src/soc/samsung/exynos5420/uart.h
index 72a5789b6d..72a5789b6d 100644
--- a/src/cpu/samsung/exynos5420/uart.h
+++ b/src/soc/samsung/exynos5420/uart.h
diff --git a/src/cpu/samsung/exynos5420/usb.c b/src/soc/samsung/exynos5420/usb.c
index 84a6f4ca4c..84a6f4ca4c 100644
--- a/src/cpu/samsung/exynos5420/usb.c
+++ b/src/soc/samsung/exynos5420/usb.c
diff --git a/src/cpu/samsung/exynos5420/usb.h b/src/soc/samsung/exynos5420/usb.h
index b3c2a33fd6..b3c2a33fd6 100644
--- a/src/cpu/samsung/exynos5420/usb.h
+++ b/src/soc/samsung/exynos5420/usb.h
diff --git a/src/cpu/samsung/exynos5420/wakeup.c b/src/soc/samsung/exynos5420/wakeup.c
index 753afd9591..753afd9591 100644
--- a/src/cpu/samsung/exynos5420/wakeup.c
+++ b/src/soc/samsung/exynos5420/wakeup.c
diff --git a/src/cpu/samsung/exynos5420/wakeup.h b/src/soc/samsung/exynos5420/wakeup.h
index 27ce8e2f2d..27ce8e2f2d 100644
--- a/src/cpu/samsung/exynos5420/wakeup.h
+++ b/src/soc/samsung/exynos5420/wakeup.h