From 22d0ca0ceb802675cdcab1472b8477066f729373 Mon Sep 17 00:00:00 2001 From: Hung-Te Lin Date: Fri, 27 Sep 2013 12:45:45 +0800 Subject: [PATCH] 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 Reviewed-by: Aaron Durbin Reviewed-by: Ronald Minnich Commit-Queue: Hung-Te Lin (cherry picked from commit c8bb8fe0b20be37465f93c738d80e7e43033670a) Signed-off-by: Isaac Christensen Reviewed-on: http://review.coreboot.org/6739 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich --- src/cpu/Kconfig | 1 - src/cpu/Makefile.inc | 1 - src/cpu/samsung/Kconfig | 2 -- src/mainboard/google/pit/chromeos.c | 4 ++-- src/mainboard/google/pit/devicetree.cb | 2 +- src/mainboard/google/pit/mainboard.c | 18 ++++++++--------- src/mainboard/google/pit/memory.c | 8 ++++---- src/mainboard/google/pit/romstage.c | 20 +++++++++---------- src/mainboard/google/pit/wakeup.c | 4 ++-- src/mainboard/google/snow/chromeos.c | 4 ++-- src/mainboard/google/snow/devicetree.cb | 2 +- src/mainboard/google/snow/mainboard.c | 16 +++++++-------- src/mainboard/google/snow/memory.c | 8 ++++---- src/mainboard/google/snow/romstage.c | 20 +++++++++---------- src/mainboard/google/snow/wakeup.c | 4 ++-- src/soc/Kconfig | 1 + src/soc/Makefile.inc | 1 + src/soc/samsung/Kconfig | 2 ++ src/{cpu => soc}/samsung/Makefile.inc | 0 src/{cpu => soc}/samsung/exynos5250/Kconfig | 0 .../samsung/exynos5250/Makefile.inc | 1 + .../samsung/exynos5250/alternate_cbfs.c | 0 .../samsung/exynos5250/alternate_cbfs.h | 0 .../samsung/exynos5250/bootblock.c | 0 src/{cpu => soc}/samsung/exynos5250/cbmem.c | 0 src/{cpu => soc}/samsung/exynos5250/chip.h | 2 +- src/{cpu => soc}/samsung/exynos5250/clk.h | 0 src/{cpu => soc}/samsung/exynos5250/clock.c | 0 .../samsung/exynos5250/clock_init.c | 0 src/{cpu => soc}/samsung/exynos5250/cpu.c | 2 +- src/{cpu => soc}/samsung/exynos5250/cpu.h | 0 src/{cpu => soc}/samsung/exynos5250/dmc.h | 0 .../samsung/exynos5250/dmc_common.c | 0 .../samsung/exynos5250/dmc_init_ddr3.c | 0 src/{cpu => soc}/samsung/exynos5250/dp-core.h | 0 src/{cpu => soc}/samsung/exynos5250/dp-reg.c | 0 src/{cpu => soc}/samsung/exynos5250/dp.h | 0 src/{cpu => soc}/samsung/exynos5250/dsim.h | 0 src/{cpu => soc}/samsung/exynos5250/fb.c | 0 src/{cpu => soc}/samsung/exynos5250/fimd.h | 0 src/{cpu => soc}/samsung/exynos5250/gpio.c | 0 src/{cpu => soc}/samsung/exynos5250/gpio.h | 0 src/{cpu => soc}/samsung/exynos5250/i2c.c | 0 src/{cpu => soc}/samsung/exynos5250/i2c.h | 0 .../samsung/exynos5250/i2s-regs.h | 0 src/{cpu => soc}/samsung/exynos5250/mct.c | 0 .../samsung/exynos5250/monotonic_timer.c | 0 src/{cpu => soc}/samsung/exynos5250/periph.h | 0 src/{cpu => soc}/samsung/exynos5250/pinmux.c | 0 src/{cpu => soc}/samsung/exynos5250/pinmux.h | 0 src/{cpu => soc}/samsung/exynos5250/power.c | 0 src/{cpu => soc}/samsung/exynos5250/power.h | 0 src/{cpu => soc}/samsung/exynos5250/setup.h | 0 src/{cpu => soc}/samsung/exynos5250/spi.c | 0 src/{cpu => soc}/samsung/exynos5250/spi.h | 0 src/{cpu => soc}/samsung/exynos5250/sysreg.h | 0 src/{cpu => soc}/samsung/exynos5250/timer.c | 0 src/{cpu => soc}/samsung/exynos5250/tmu.c | 0 src/{cpu => soc}/samsung/exynos5250/tmu.h | 0 .../samsung/exynos5250/trustzone.c | 0 .../samsung/exynos5250/trustzone.h | 0 src/{cpu => soc}/samsung/exynos5250/uart.c | 0 src/{cpu => soc}/samsung/exynos5250/uart.h | 0 src/{cpu => soc}/samsung/exynos5250/usb.c | 0 src/{cpu => soc}/samsung/exynos5250/usb.h | 0 src/{cpu => soc}/samsung/exynos5250/wakeup.c | 0 src/{cpu => soc}/samsung/exynos5250/wakeup.h | 0 src/{cpu => soc}/samsung/exynos5420/Kconfig | 0 .../samsung/exynos5420/Makefile.inc | 1 + .../samsung/exynos5420/alternate_cbfs.c | 0 .../samsung/exynos5420/alternate_cbfs.h | 0 .../samsung/exynos5420/bootblock.c | 0 src/{cpu => soc}/samsung/exynos5420/cbmem.c | 0 src/{cpu => soc}/samsung/exynos5420/chip.h | 2 +- src/{cpu => soc}/samsung/exynos5420/clk.h | 0 src/{cpu => soc}/samsung/exynos5420/clock.c | 0 .../samsung/exynos5420/clock_init.c | 0 src/{cpu => soc}/samsung/exynos5420/cpu.c | 2 +- src/{cpu => soc}/samsung/exynos5420/cpu.h | 0 src/{cpu => soc}/samsung/exynos5420/dmc.h | 0 .../samsung/exynos5420/dmc_common.c | 0 .../samsung/exynos5420/dmc_init_ddr3.c | 0 src/{cpu => soc}/samsung/exynos5420/dp.c | 0 src/{cpu => soc}/samsung/exynos5420/dp.h | 0 .../samsung/exynos5420/dp_lowlevel.c | 0 src/{cpu => soc}/samsung/exynos5420/dsim.h | 0 src/{cpu => soc}/samsung/exynos5420/fimd.c | 0 src/{cpu => soc}/samsung/exynos5420/fimd.h | 0 src/{cpu => soc}/samsung/exynos5420/gpio.c | 0 src/{cpu => soc}/samsung/exynos5420/gpio.h | 0 src/{cpu => soc}/samsung/exynos5420/i2c.c | 0 src/{cpu => soc}/samsung/exynos5420/i2c.h | 0 .../samsung/exynos5420/i2s-regs.h | 0 src/{cpu => soc}/samsung/exynos5420/mct.c | 0 .../samsung/exynos5420/monotonic_timer.c | 0 src/{cpu => soc}/samsung/exynos5420/periph.h | 0 src/{cpu => soc}/samsung/exynos5420/pinmux.c | 0 src/{cpu => soc}/samsung/exynos5420/pinmux.h | 0 src/{cpu => soc}/samsung/exynos5420/power.c | 0 src/{cpu => soc}/samsung/exynos5420/power.h | 0 src/{cpu => soc}/samsung/exynos5420/setup.h | 0 src/{cpu => soc}/samsung/exynos5420/smp.c | 0 src/{cpu => soc}/samsung/exynos5420/spi.c | 0 src/{cpu => soc}/samsung/exynos5420/spi.h | 0 src/{cpu => soc}/samsung/exynos5420/sysreg.h | 0 src/{cpu => soc}/samsung/exynos5420/timer.c | 0 src/{cpu => soc}/samsung/exynos5420/tmu.c | 0 src/{cpu => soc}/samsung/exynos5420/tmu.h | 0 .../samsung/exynos5420/trustzone.c | 0 .../samsung/exynos5420/trustzone.h | 0 src/{cpu => soc}/samsung/exynos5420/uart.c | 0 src/{cpu => soc}/samsung/exynos5420/uart.h | 0 src/{cpu => soc}/samsung/exynos5420/usb.c | 0 src/{cpu => soc}/samsung/exynos5420/usb.h | 0 src/{cpu => soc}/samsung/exynos5420/wakeup.c | 0 src/{cpu => soc}/samsung/exynos5420/wakeup.h | 0 116 files changed, 65 insertions(+), 63 deletions(-) delete mode 100644 src/cpu/samsung/Kconfig create mode 100644 src/soc/samsung/Kconfig rename src/{cpu => soc}/samsung/Makefile.inc (100%) rename src/{cpu => soc}/samsung/exynos5250/Kconfig (100%) rename src/{cpu => soc}/samsung/exynos5250/Makefile.inc (96%) rename src/{cpu => soc}/samsung/exynos5250/alternate_cbfs.c (100%) rename src/{cpu => soc}/samsung/exynos5250/alternate_cbfs.h (100%) rename src/{cpu => soc}/samsung/exynos5250/bootblock.c (100%) rename src/{cpu => soc}/samsung/exynos5250/cbmem.c (100%) rename src/{cpu => soc}/samsung/exynos5250/chip.h (96%) rename src/{cpu => soc}/samsung/exynos5250/clk.h (100%) rename src/{cpu => soc}/samsung/exynos5250/clock.c (100%) rename src/{cpu => soc}/samsung/exynos5250/clock_init.c (100%) rename src/{cpu => soc}/samsung/exynos5250/cpu.c (98%) rename src/{cpu => soc}/samsung/exynos5250/cpu.h (100%) rename src/{cpu => soc}/samsung/exynos5250/dmc.h (100%) rename src/{cpu => soc}/samsung/exynos5250/dmc_common.c (100%) rename src/{cpu => soc}/samsung/exynos5250/dmc_init_ddr3.c (100%) rename src/{cpu => soc}/samsung/exynos5250/dp-core.h (100%) rename src/{cpu => soc}/samsung/exynos5250/dp-reg.c (100%) rename src/{cpu => soc}/samsung/exynos5250/dp.h (100%) rename src/{cpu => soc}/samsung/exynos5250/dsim.h (100%) rename src/{cpu => soc}/samsung/exynos5250/fb.c (100%) rename src/{cpu => soc}/samsung/exynos5250/fimd.h (100%) rename src/{cpu => soc}/samsung/exynos5250/gpio.c (100%) rename src/{cpu => soc}/samsung/exynos5250/gpio.h (100%) rename src/{cpu => soc}/samsung/exynos5250/i2c.c (100%) rename src/{cpu => soc}/samsung/exynos5250/i2c.h (100%) rename src/{cpu => soc}/samsung/exynos5250/i2s-regs.h (100%) rename src/{cpu => soc}/samsung/exynos5250/mct.c (100%) rename src/{cpu => soc}/samsung/exynos5250/monotonic_timer.c (100%) rename src/{cpu => soc}/samsung/exynos5250/periph.h (100%) rename src/{cpu => soc}/samsung/exynos5250/pinmux.c (100%) rename src/{cpu => soc}/samsung/exynos5250/pinmux.h (100%) rename src/{cpu => soc}/samsung/exynos5250/power.c (100%) rename src/{cpu => soc}/samsung/exynos5250/power.h (100%) rename src/{cpu => soc}/samsung/exynos5250/setup.h (100%) rename src/{cpu => soc}/samsung/exynos5250/spi.c (100%) rename src/{cpu => soc}/samsung/exynos5250/spi.h (100%) rename src/{cpu => soc}/samsung/exynos5250/sysreg.h (100%) rename src/{cpu => soc}/samsung/exynos5250/timer.c (100%) rename src/{cpu => soc}/samsung/exynos5250/tmu.c (100%) rename src/{cpu => soc}/samsung/exynos5250/tmu.h (100%) rename src/{cpu => soc}/samsung/exynos5250/trustzone.c (100%) rename src/{cpu => soc}/samsung/exynos5250/trustzone.h (100%) rename src/{cpu => soc}/samsung/exynos5250/uart.c (100%) rename src/{cpu => soc}/samsung/exynos5250/uart.h (100%) rename src/{cpu => soc}/samsung/exynos5250/usb.c (100%) rename src/{cpu => soc}/samsung/exynos5250/usb.h (100%) rename src/{cpu => soc}/samsung/exynos5250/wakeup.c (100%) rename src/{cpu => soc}/samsung/exynos5250/wakeup.h (100%) rename src/{cpu => soc}/samsung/exynos5420/Kconfig (100%) rename src/{cpu => soc}/samsung/exynos5420/Makefile.inc (96%) rename src/{cpu => soc}/samsung/exynos5420/alternate_cbfs.c (100%) rename src/{cpu => soc}/samsung/exynos5420/alternate_cbfs.h (100%) rename src/{cpu => soc}/samsung/exynos5420/bootblock.c (100%) rename src/{cpu => soc}/samsung/exynos5420/cbmem.c (100%) rename src/{cpu => soc}/samsung/exynos5420/chip.h (96%) rename src/{cpu => soc}/samsung/exynos5420/clk.h (100%) rename src/{cpu => soc}/samsung/exynos5420/clock.c (100%) rename src/{cpu => soc}/samsung/exynos5420/clock_init.c (100%) rename src/{cpu => soc}/samsung/exynos5420/cpu.c (98%) rename src/{cpu => soc}/samsung/exynos5420/cpu.h (100%) rename src/{cpu => soc}/samsung/exynos5420/dmc.h (100%) rename src/{cpu => soc}/samsung/exynos5420/dmc_common.c (100%) rename src/{cpu => soc}/samsung/exynos5420/dmc_init_ddr3.c (100%) rename src/{cpu => soc}/samsung/exynos5420/dp.c (100%) rename src/{cpu => soc}/samsung/exynos5420/dp.h (100%) rename src/{cpu => soc}/samsung/exynos5420/dp_lowlevel.c (100%) rename src/{cpu => soc}/samsung/exynos5420/dsim.h (100%) rename src/{cpu => soc}/samsung/exynos5420/fimd.c (100%) rename src/{cpu => soc}/samsung/exynos5420/fimd.h (100%) rename src/{cpu => soc}/samsung/exynos5420/gpio.c (100%) rename src/{cpu => soc}/samsung/exynos5420/gpio.h (100%) rename src/{cpu => soc}/samsung/exynos5420/i2c.c (100%) rename src/{cpu => soc}/samsung/exynos5420/i2c.h (100%) rename src/{cpu => soc}/samsung/exynos5420/i2s-regs.h (100%) rename src/{cpu => soc}/samsung/exynos5420/mct.c (100%) rename src/{cpu => soc}/samsung/exynos5420/monotonic_timer.c (100%) rename src/{cpu => soc}/samsung/exynos5420/periph.h (100%) rename src/{cpu => soc}/samsung/exynos5420/pinmux.c (100%) rename src/{cpu => soc}/samsung/exynos5420/pinmux.h (100%) rename src/{cpu => soc}/samsung/exynos5420/power.c (100%) rename src/{cpu => soc}/samsung/exynos5420/power.h (100%) rename src/{cpu => soc}/samsung/exynos5420/setup.h (100%) rename src/{cpu => soc}/samsung/exynos5420/smp.c (100%) rename src/{cpu => soc}/samsung/exynos5420/spi.c (100%) rename src/{cpu => soc}/samsung/exynos5420/spi.h (100%) rename src/{cpu => soc}/samsung/exynos5420/sysreg.h (100%) rename src/{cpu => soc}/samsung/exynos5420/timer.c (100%) rename src/{cpu => soc}/samsung/exynos5420/tmu.c (100%) rename src/{cpu => soc}/samsung/exynos5420/tmu.h (100%) rename src/{cpu => soc}/samsung/exynos5420/trustzone.c (100%) rename src/{cpu => soc}/samsung/exynos5420/trustzone.h (100%) rename src/{cpu => soc}/samsung/exynos5420/uart.c (100%) rename src/{cpu => soc}/samsung/exynos5420/uart.h (100%) rename src/{cpu => soc}/samsung/exynos5420/usb.c (100%) rename src/{cpu => soc}/samsung/exynos5420/usb.h (100%) rename src/{cpu => soc}/samsung/exynos5420/wakeup.c (100%) rename src/{cpu => soc}/samsung/exynos5420/wakeup.h (100%) 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 #include #include -#include -#include +#include +#include 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 #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include 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 #include -#include -#include -#include -#include +#include +#include +#include +#include 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 #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include 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 -#include +#include +#include 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 #include #include -#include -#include +#include +#include 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 #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #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 #include -#include -#include -#include -#include +#include +#include +#include +#include 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 #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include 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 -#include +#include +#include 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 similarity index 100% rename from src/cpu/samsung/Makefile.inc rename to src/soc/samsung/Makefile.inc diff --git a/src/cpu/samsung/exynos5250/Kconfig b/src/soc/samsung/exynos5250/Kconfig similarity index 100% rename from src/cpu/samsung/exynos5250/Kconfig rename to src/soc/samsung/exynos5250/Kconfig diff --git a/src/cpu/samsung/exynos5250/Makefile.inc b/src/soc/samsung/exynos5250/Makefile.inc similarity index 96% rename from src/cpu/samsung/exynos5250/Makefile.inc rename to 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 similarity index 100% rename from src/cpu/samsung/exynos5250/alternate_cbfs.c rename to 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 similarity index 100% rename from src/cpu/samsung/exynos5250/alternate_cbfs.h rename to src/soc/samsung/exynos5250/alternate_cbfs.h diff --git a/src/cpu/samsung/exynos5250/bootblock.c b/src/soc/samsung/exynos5250/bootblock.c similarity index 100% rename from src/cpu/samsung/exynos5250/bootblock.c rename to src/soc/samsung/exynos5250/bootblock.c diff --git a/src/cpu/samsung/exynos5250/cbmem.c b/src/soc/samsung/exynos5250/cbmem.c similarity index 100% rename from src/cpu/samsung/exynos5250/cbmem.c rename to src/soc/samsung/exynos5250/cbmem.c diff --git a/src/cpu/samsung/exynos5250/chip.h b/src/soc/samsung/exynos5250/chip.h similarity index 96% rename from src/cpu/samsung/exynos5250/chip.h rename to 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 similarity index 100% rename from src/cpu/samsung/exynos5250/clk.h rename to src/soc/samsung/exynos5250/clk.h diff --git a/src/cpu/samsung/exynos5250/clock.c b/src/soc/samsung/exynos5250/clock.c similarity index 100% rename from src/cpu/samsung/exynos5250/clock.c rename to src/soc/samsung/exynos5250/clock.c diff --git a/src/cpu/samsung/exynos5250/clock_init.c b/src/soc/samsung/exynos5250/clock_init.c similarity index 100% rename from src/cpu/samsung/exynos5250/clock_init.c rename to src/soc/samsung/exynos5250/clock_init.c diff --git a/src/cpu/samsung/exynos5250/cpu.c b/src/soc/samsung/exynos5250/cpu.c similarity index 98% rename from src/cpu/samsung/exynos5250/cpu.c rename to 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 similarity index 100% rename from src/cpu/samsung/exynos5250/cpu.h rename to src/soc/samsung/exynos5250/cpu.h diff --git a/src/cpu/samsung/exynos5250/dmc.h b/src/soc/samsung/exynos5250/dmc.h similarity index 100% rename from src/cpu/samsung/exynos5250/dmc.h rename to src/soc/samsung/exynos5250/dmc.h diff --git a/src/cpu/samsung/exynos5250/dmc_common.c b/src/soc/samsung/exynos5250/dmc_common.c similarity index 100% rename from src/cpu/samsung/exynos5250/dmc_common.c rename to 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 similarity index 100% rename from src/cpu/samsung/exynos5250/dmc_init_ddr3.c rename to 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 similarity index 100% rename from src/cpu/samsung/exynos5250/dp-core.h rename to 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 similarity index 100% rename from src/cpu/samsung/exynos5250/dp-reg.c rename to src/soc/samsung/exynos5250/dp-reg.c diff --git a/src/cpu/samsung/exynos5250/dp.h b/src/soc/samsung/exynos5250/dp.h similarity index 100% rename from src/cpu/samsung/exynos5250/dp.h rename to src/soc/samsung/exynos5250/dp.h diff --git a/src/cpu/samsung/exynos5250/dsim.h b/src/soc/samsung/exynos5250/dsim.h similarity index 100% rename from src/cpu/samsung/exynos5250/dsim.h rename to src/soc/samsung/exynos5250/dsim.h diff --git a/src/cpu/samsung/exynos5250/fb.c b/src/soc/samsung/exynos5250/fb.c similarity index 100% rename from src/cpu/samsung/exynos5250/fb.c rename to src/soc/samsung/exynos5250/fb.c diff --git a/src/cpu/samsung/exynos5250/fimd.h b/src/soc/samsung/exynos5250/fimd.h similarity index 100% rename from src/cpu/samsung/exynos5250/fimd.h rename to src/soc/samsung/exynos5250/fimd.h diff --git a/src/cpu/samsung/exynos5250/gpio.c b/src/soc/samsung/exynos5250/gpio.c similarity index 100% rename from src/cpu/samsung/exynos5250/gpio.c rename to src/soc/samsung/exynos5250/gpio.c diff --git a/src/cpu/samsung/exynos5250/gpio.h b/src/soc/samsung/exynos5250/gpio.h similarity index 100% rename from src/cpu/samsung/exynos5250/gpio.h rename to src/soc/samsung/exynos5250/gpio.h diff --git a/src/cpu/samsung/exynos5250/i2c.c b/src/soc/samsung/exynos5250/i2c.c similarity index 100% rename from src/cpu/samsung/exynos5250/i2c.c rename to src/soc/samsung/exynos5250/i2c.c diff --git a/src/cpu/samsung/exynos5250/i2c.h b/src/soc/samsung/exynos5250/i2c.h similarity index 100% rename from src/cpu/samsung/exynos5250/i2c.h rename to src/soc/samsung/exynos5250/i2c.h diff --git a/src/cpu/samsung/exynos5250/i2s-regs.h b/src/soc/samsung/exynos5250/i2s-regs.h similarity index 100% rename from src/cpu/samsung/exynos5250/i2s-regs.h rename to src/soc/samsung/exynos5250/i2s-regs.h diff --git a/src/cpu/samsung/exynos5250/mct.c b/src/soc/samsung/exynos5250/mct.c similarity index 100% rename from src/cpu/samsung/exynos5250/mct.c rename to src/soc/samsung/exynos5250/mct.c diff --git a/src/cpu/samsung/exynos5250/monotonic_timer.c b/src/soc/samsung/exynos5250/monotonic_timer.c similarity index 100% rename from src/cpu/samsung/exynos5250/monotonic_timer.c rename to src/soc/samsung/exynos5250/monotonic_timer.c diff --git a/src/cpu/samsung/exynos5250/periph.h b/src/soc/samsung/exynos5250/periph.h similarity index 100% rename from src/cpu/samsung/exynos5250/periph.h rename to src/soc/samsung/exynos5250/periph.h diff --git a/src/cpu/samsung/exynos5250/pinmux.c b/src/soc/samsung/exynos5250/pinmux.c similarity index 100% rename from src/cpu/samsung/exynos5250/pinmux.c rename to src/soc/samsung/exynos5250/pinmux.c diff --git a/src/cpu/samsung/exynos5250/pinmux.h b/src/soc/samsung/exynos5250/pinmux.h similarity index 100% rename from src/cpu/samsung/exynos5250/pinmux.h rename to src/soc/samsung/exynos5250/pinmux.h diff --git a/src/cpu/samsung/exynos5250/power.c b/src/soc/samsung/exynos5250/power.c similarity index 100% rename from src/cpu/samsung/exynos5250/power.c rename to src/soc/samsung/exynos5250/power.c diff --git a/src/cpu/samsung/exynos5250/power.h b/src/soc/samsung/exynos5250/power.h similarity index 100% rename from src/cpu/samsung/exynos5250/power.h rename to src/soc/samsung/exynos5250/power.h diff --git a/src/cpu/samsung/exynos5250/setup.h b/src/soc/samsung/exynos5250/setup.h similarity index 100% rename from src/cpu/samsung/exynos5250/setup.h rename to src/soc/samsung/exynos5250/setup.h diff --git a/src/cpu/samsung/exynos5250/spi.c b/src/soc/samsung/exynos5250/spi.c similarity index 100% rename from src/cpu/samsung/exynos5250/spi.c rename to src/soc/samsung/exynos5250/spi.c diff --git a/src/cpu/samsung/exynos5250/spi.h b/src/soc/samsung/exynos5250/spi.h similarity index 100% rename from src/cpu/samsung/exynos5250/spi.h rename to src/soc/samsung/exynos5250/spi.h diff --git a/src/cpu/samsung/exynos5250/sysreg.h b/src/soc/samsung/exynos5250/sysreg.h similarity index 100% rename from src/cpu/samsung/exynos5250/sysreg.h rename to src/soc/samsung/exynos5250/sysreg.h diff --git a/src/cpu/samsung/exynos5250/timer.c b/src/soc/samsung/exynos5250/timer.c similarity index 100% rename from src/cpu/samsung/exynos5250/timer.c rename to src/soc/samsung/exynos5250/timer.c diff --git a/src/cpu/samsung/exynos5250/tmu.c b/src/soc/samsung/exynos5250/tmu.c similarity index 100% rename from src/cpu/samsung/exynos5250/tmu.c rename to src/soc/samsung/exynos5250/tmu.c diff --git a/src/cpu/samsung/exynos5250/tmu.h b/src/soc/samsung/exynos5250/tmu.h similarity index 100% rename from src/cpu/samsung/exynos5250/tmu.h rename to src/soc/samsung/exynos5250/tmu.h diff --git a/src/cpu/samsung/exynos5250/trustzone.c b/src/soc/samsung/exynos5250/trustzone.c similarity index 100% rename from src/cpu/samsung/exynos5250/trustzone.c rename to src/soc/samsung/exynos5250/trustzone.c diff --git a/src/cpu/samsung/exynos5250/trustzone.h b/src/soc/samsung/exynos5250/trustzone.h similarity index 100% rename from src/cpu/samsung/exynos5250/trustzone.h rename to src/soc/samsung/exynos5250/trustzone.h diff --git a/src/cpu/samsung/exynos5250/uart.c b/src/soc/samsung/exynos5250/uart.c similarity index 100% rename from src/cpu/samsung/exynos5250/uart.c rename to src/soc/samsung/exynos5250/uart.c diff --git a/src/cpu/samsung/exynos5250/uart.h b/src/soc/samsung/exynos5250/uart.h similarity index 100% rename from src/cpu/samsung/exynos5250/uart.h rename to src/soc/samsung/exynos5250/uart.h diff --git a/src/cpu/samsung/exynos5250/usb.c b/src/soc/samsung/exynos5250/usb.c similarity index 100% rename from src/cpu/samsung/exynos5250/usb.c rename to src/soc/samsung/exynos5250/usb.c diff --git a/src/cpu/samsung/exynos5250/usb.h b/src/soc/samsung/exynos5250/usb.h similarity index 100% rename from src/cpu/samsung/exynos5250/usb.h rename to src/soc/samsung/exynos5250/usb.h diff --git a/src/cpu/samsung/exynos5250/wakeup.c b/src/soc/samsung/exynos5250/wakeup.c similarity index 100% rename from src/cpu/samsung/exynos5250/wakeup.c rename to src/soc/samsung/exynos5250/wakeup.c diff --git a/src/cpu/samsung/exynos5250/wakeup.h b/src/soc/samsung/exynos5250/wakeup.h similarity index 100% rename from src/cpu/samsung/exynos5250/wakeup.h rename to src/soc/samsung/exynos5250/wakeup.h diff --git a/src/cpu/samsung/exynos5420/Kconfig b/src/soc/samsung/exynos5420/Kconfig similarity index 100% rename from src/cpu/samsung/exynos5420/Kconfig rename to src/soc/samsung/exynos5420/Kconfig diff --git a/src/cpu/samsung/exynos5420/Makefile.inc b/src/soc/samsung/exynos5420/Makefile.inc similarity index 96% rename from src/cpu/samsung/exynos5420/Makefile.inc rename to 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 similarity index 100% rename from src/cpu/samsung/exynos5420/alternate_cbfs.c rename to 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 similarity index 100% rename from src/cpu/samsung/exynos5420/alternate_cbfs.h rename to src/soc/samsung/exynos5420/alternate_cbfs.h diff --git a/src/cpu/samsung/exynos5420/bootblock.c b/src/soc/samsung/exynos5420/bootblock.c similarity index 100% rename from src/cpu/samsung/exynos5420/bootblock.c rename to src/soc/samsung/exynos5420/bootblock.c diff --git a/src/cpu/samsung/exynos5420/cbmem.c b/src/soc/samsung/exynos5420/cbmem.c similarity index 100% rename from src/cpu/samsung/exynos5420/cbmem.c rename to src/soc/samsung/exynos5420/cbmem.c diff --git a/src/cpu/samsung/exynos5420/chip.h b/src/soc/samsung/exynos5420/chip.h similarity index 96% rename from src/cpu/samsung/exynos5420/chip.h rename to 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 similarity index 100% rename from src/cpu/samsung/exynos5420/clk.h rename to src/soc/samsung/exynos5420/clk.h diff --git a/src/cpu/samsung/exynos5420/clock.c b/src/soc/samsung/exynos5420/clock.c similarity index 100% rename from src/cpu/samsung/exynos5420/clock.c rename to src/soc/samsung/exynos5420/clock.c diff --git a/src/cpu/samsung/exynos5420/clock_init.c b/src/soc/samsung/exynos5420/clock_init.c similarity index 100% rename from src/cpu/samsung/exynos5420/clock_init.c rename to src/soc/samsung/exynos5420/clock_init.c diff --git a/src/cpu/samsung/exynos5420/cpu.c b/src/soc/samsung/exynos5420/cpu.c similarity index 98% rename from src/cpu/samsung/exynos5420/cpu.c rename to 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 similarity index 100% rename from src/cpu/samsung/exynos5420/cpu.h rename to src/soc/samsung/exynos5420/cpu.h diff --git a/src/cpu/samsung/exynos5420/dmc.h b/src/soc/samsung/exynos5420/dmc.h similarity index 100% rename from src/cpu/samsung/exynos5420/dmc.h rename to src/soc/samsung/exynos5420/dmc.h diff --git a/src/cpu/samsung/exynos5420/dmc_common.c b/src/soc/samsung/exynos5420/dmc_common.c similarity index 100% rename from src/cpu/samsung/exynos5420/dmc_common.c rename to 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 similarity index 100% rename from src/cpu/samsung/exynos5420/dmc_init_ddr3.c rename to src/soc/samsung/exynos5420/dmc_init_ddr3.c diff --git a/src/cpu/samsung/exynos5420/dp.c b/src/soc/samsung/exynos5420/dp.c similarity index 100% rename from src/cpu/samsung/exynos5420/dp.c rename to src/soc/samsung/exynos5420/dp.c diff --git a/src/cpu/samsung/exynos5420/dp.h b/src/soc/samsung/exynos5420/dp.h similarity index 100% rename from src/cpu/samsung/exynos5420/dp.h rename to src/soc/samsung/exynos5420/dp.h diff --git a/src/cpu/samsung/exynos5420/dp_lowlevel.c b/src/soc/samsung/exynos5420/dp_lowlevel.c similarity index 100% rename from src/cpu/samsung/exynos5420/dp_lowlevel.c rename to src/soc/samsung/exynos5420/dp_lowlevel.c diff --git a/src/cpu/samsung/exynos5420/dsim.h b/src/soc/samsung/exynos5420/dsim.h similarity index 100% rename from src/cpu/samsung/exynos5420/dsim.h rename to src/soc/samsung/exynos5420/dsim.h diff --git a/src/cpu/samsung/exynos5420/fimd.c b/src/soc/samsung/exynos5420/fimd.c similarity index 100% rename from src/cpu/samsung/exynos5420/fimd.c rename to src/soc/samsung/exynos5420/fimd.c diff --git a/src/cpu/samsung/exynos5420/fimd.h b/src/soc/samsung/exynos5420/fimd.h similarity index 100% rename from src/cpu/samsung/exynos5420/fimd.h rename to src/soc/samsung/exynos5420/fimd.h diff --git a/src/cpu/samsung/exynos5420/gpio.c b/src/soc/samsung/exynos5420/gpio.c similarity index 100% rename from src/cpu/samsung/exynos5420/gpio.c rename to src/soc/samsung/exynos5420/gpio.c diff --git a/src/cpu/samsung/exynos5420/gpio.h b/src/soc/samsung/exynos5420/gpio.h similarity index 100% rename from src/cpu/samsung/exynos5420/gpio.h rename to src/soc/samsung/exynos5420/gpio.h diff --git a/src/cpu/samsung/exynos5420/i2c.c b/src/soc/samsung/exynos5420/i2c.c similarity index 100% rename from src/cpu/samsung/exynos5420/i2c.c rename to src/soc/samsung/exynos5420/i2c.c diff --git a/src/cpu/samsung/exynos5420/i2c.h b/src/soc/samsung/exynos5420/i2c.h similarity index 100% rename from src/cpu/samsung/exynos5420/i2c.h rename to src/soc/samsung/exynos5420/i2c.h diff --git a/src/cpu/samsung/exynos5420/i2s-regs.h b/src/soc/samsung/exynos5420/i2s-regs.h similarity index 100% rename from src/cpu/samsung/exynos5420/i2s-regs.h rename to src/soc/samsung/exynos5420/i2s-regs.h diff --git a/src/cpu/samsung/exynos5420/mct.c b/src/soc/samsung/exynos5420/mct.c similarity index 100% rename from src/cpu/samsung/exynos5420/mct.c rename to src/soc/samsung/exynos5420/mct.c diff --git a/src/cpu/samsung/exynos5420/monotonic_timer.c b/src/soc/samsung/exynos5420/monotonic_timer.c similarity index 100% rename from src/cpu/samsung/exynos5420/monotonic_timer.c rename to src/soc/samsung/exynos5420/monotonic_timer.c diff --git a/src/cpu/samsung/exynos5420/periph.h b/src/soc/samsung/exynos5420/periph.h similarity index 100% rename from src/cpu/samsung/exynos5420/periph.h rename to src/soc/samsung/exynos5420/periph.h diff --git a/src/cpu/samsung/exynos5420/pinmux.c b/src/soc/samsung/exynos5420/pinmux.c similarity index 100% rename from src/cpu/samsung/exynos5420/pinmux.c rename to src/soc/samsung/exynos5420/pinmux.c diff --git a/src/cpu/samsung/exynos5420/pinmux.h b/src/soc/samsung/exynos5420/pinmux.h similarity index 100% rename from src/cpu/samsung/exynos5420/pinmux.h rename to src/soc/samsung/exynos5420/pinmux.h diff --git a/src/cpu/samsung/exynos5420/power.c b/src/soc/samsung/exynos5420/power.c similarity index 100% rename from src/cpu/samsung/exynos5420/power.c rename to src/soc/samsung/exynos5420/power.c diff --git a/src/cpu/samsung/exynos5420/power.h b/src/soc/samsung/exynos5420/power.h similarity index 100% rename from src/cpu/samsung/exynos5420/power.h rename to src/soc/samsung/exynos5420/power.h diff --git a/src/cpu/samsung/exynos5420/setup.h b/src/soc/samsung/exynos5420/setup.h similarity index 100% rename from src/cpu/samsung/exynos5420/setup.h rename to src/soc/samsung/exynos5420/setup.h diff --git a/src/cpu/samsung/exynos5420/smp.c b/src/soc/samsung/exynos5420/smp.c similarity index 100% rename from src/cpu/samsung/exynos5420/smp.c rename to src/soc/samsung/exynos5420/smp.c diff --git a/src/cpu/samsung/exynos5420/spi.c b/src/soc/samsung/exynos5420/spi.c similarity index 100% rename from src/cpu/samsung/exynos5420/spi.c rename to src/soc/samsung/exynos5420/spi.c diff --git a/src/cpu/samsung/exynos5420/spi.h b/src/soc/samsung/exynos5420/spi.h similarity index 100% rename from src/cpu/samsung/exynos5420/spi.h rename to src/soc/samsung/exynos5420/spi.h diff --git a/src/cpu/samsung/exynos5420/sysreg.h b/src/soc/samsung/exynos5420/sysreg.h similarity index 100% rename from src/cpu/samsung/exynos5420/sysreg.h rename to src/soc/samsung/exynos5420/sysreg.h diff --git a/src/cpu/samsung/exynos5420/timer.c b/src/soc/samsung/exynos5420/timer.c similarity index 100% rename from src/cpu/samsung/exynos5420/timer.c rename to src/soc/samsung/exynos5420/timer.c diff --git a/src/cpu/samsung/exynos5420/tmu.c b/src/soc/samsung/exynos5420/tmu.c similarity index 100% rename from src/cpu/samsung/exynos5420/tmu.c rename to src/soc/samsung/exynos5420/tmu.c diff --git a/src/cpu/samsung/exynos5420/tmu.h b/src/soc/samsung/exynos5420/tmu.h similarity index 100% rename from src/cpu/samsung/exynos5420/tmu.h rename to src/soc/samsung/exynos5420/tmu.h diff --git a/src/cpu/samsung/exynos5420/trustzone.c b/src/soc/samsung/exynos5420/trustzone.c similarity index 100% rename from src/cpu/samsung/exynos5420/trustzone.c rename to src/soc/samsung/exynos5420/trustzone.c diff --git a/src/cpu/samsung/exynos5420/trustzone.h b/src/soc/samsung/exynos5420/trustzone.h similarity index 100% rename from src/cpu/samsung/exynos5420/trustzone.h rename to src/soc/samsung/exynos5420/trustzone.h diff --git a/src/cpu/samsung/exynos5420/uart.c b/src/soc/samsung/exynos5420/uart.c similarity index 100% rename from src/cpu/samsung/exynos5420/uart.c rename to src/soc/samsung/exynos5420/uart.c diff --git a/src/cpu/samsung/exynos5420/uart.h b/src/soc/samsung/exynos5420/uart.h similarity index 100% rename from src/cpu/samsung/exynos5420/uart.h rename to src/soc/samsung/exynos5420/uart.h diff --git a/src/cpu/samsung/exynos5420/usb.c b/src/soc/samsung/exynos5420/usb.c similarity index 100% rename from src/cpu/samsung/exynos5420/usb.c rename to src/soc/samsung/exynos5420/usb.c diff --git a/src/cpu/samsung/exynos5420/usb.h b/src/soc/samsung/exynos5420/usb.h similarity index 100% rename from src/cpu/samsung/exynos5420/usb.h rename to src/soc/samsung/exynos5420/usb.h diff --git a/src/cpu/samsung/exynos5420/wakeup.c b/src/soc/samsung/exynos5420/wakeup.c similarity index 100% rename from src/cpu/samsung/exynos5420/wakeup.c rename to src/soc/samsung/exynos5420/wakeup.c diff --git a/src/cpu/samsung/exynos5420/wakeup.h b/src/soc/samsung/exynos5420/wakeup.h similarity index 100% rename from src/cpu/samsung/exynos5420/wakeup.h rename to src/soc/samsung/exynos5420/wakeup.h