diff options
author | Julius Werner <jwerner@chromium.org> | 2014-10-20 13:16:29 -0700 |
---|---|---|
committer | Patrick Georgi <pgeorgi@google.com> | 2015-04-07 18:48:04 +0200 |
commit | 1ed0c8c0b221962855b6f547cc663c506b9cb5c6 (patch) | |
tree | d692c7d36281de239adc71ef133bba1c81c65786 | |
parent | 0c00f9a58f69e81a059f20ac0834dc46411e5def (diff) | |
download | coreboot-1ed0c8c0b221962855b6f547cc663c506b9cb5c6.tar.gz |
exynos5250: Change all SoC headers to <soc/headername.h> system
This patch aligns exynos5250 to the new SoC header include scheme.
Also alphabetized headers in affected files since we touch them anyway.
BUG=None
TEST=Tested with whole series. Compiled Daisy.
Change-Id: I39805c0346e117a0f9b2667763ecaa428f0f55a8
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: db6762f0c8425371d9860f908a5cefdeee8d1abc
Original-Change-Id: Ic358061ddcbbe7d83a95ca11247b8b505b20491d
Original-Signed-off-by: Julius Werner <jwerner@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/224500
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/9323
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
54 files changed, 145 insertions, 153 deletions
diff --git a/src/mainboard/google/daisy/chromeos.c b/src/mainboard/google/daisy/chromeos.c index f7443becc7..9e67a4c127 100644 --- a/src/mainboard/google/daisy/chromeos.c +++ b/src/mainboard/google/daisy/chromeos.c @@ -21,11 +21,11 @@ #include <console/console.h> #include <ec/google/chromeec/ec.h> #include <ec/google/chromeec/ec_commands.h> +#include <soc/cpu.h> +#include <soc/gpio.h> #include <string.h> #include <vendorcode/google/chromeos/chromeos.h> #include <bootmode.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/daisy/mainboard.c b/src/mainboard/google/daisy/mainboard.c index 138e498de8..e2ad5b0eb8 100644 --- a/src/mainboard/google/daisy/mainboard.c +++ b/src/mainboard/google/daisy/mainboard.c @@ -17,26 +17,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <arch/cache.h> +#include <boot/coreboot_tables.h> #include <console/console.h> +#include <cbmem.h> +#include <delay.h> #include <device/device.h> #include <device/i2c.h> #include <drivers/ti/tps65090/tps65090.h> -#include <cbmem.h> -#include <delay.h> #include <edid.h> -#include <vbe.h> -#include <boot/coreboot_tables.h> -#include <arch/cache.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/periph.h> -#include <soc/samsung/exynos5250/usb.h> +#include <soc/clk.h> +#include <soc/dp.h> +#include <soc/dp-core.h> +#include <soc/gpio.h> +#include <soc/i2c.h> +#include <soc/periph.h> +#include <soc/power.h> +#include <soc/tmu.h> +#include <soc/usb.h> #include <symbols.h> +#include <vbe.h> #include "exynos5250.h" diff --git a/src/mainboard/google/daisy/memlayout.ld b/src/mainboard/google/daisy/memlayout.ld index 72c018edd2..ead7f47838 100644 --- a/src/mainboard/google/daisy/memlayout.ld +++ b/src/mainboard/google/daisy/memlayout.ld @@ -1 +1 @@ -#include <soc/samsung/exynos5250/memlayout.ld> +#include <soc/memlayout.ld> diff --git a/src/mainboard/google/daisy/memory.c b/src/mainboard/google/daisy/memory.c index 5640f313e0..71abb8142b 100644 --- a/src/mainboard/google/daisy/memory.c +++ b/src/mainboard/google/daisy/memory.c @@ -18,14 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <console/console.h> +#include <soc/gpio.h> +#include <soc/setup.h> +#include <soc/dmc.h> +#include <soc/clk.h> #include <stddef.h> #include <stdlib.h> -#include <console/console.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/daisy/romstage.c b/src/mainboard/google/daisy/romstage.c index ebd07d7c5e..76de90a198 100644 --- a/src/mainboard/google/daisy/romstage.c +++ b/src/mainboard/google/daisy/romstage.c @@ -17,30 +17,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <types.h> - +#include <arch/cache.h> +#include <arch/exception.h> +#include <arch/stages.h> #include <armv7.h> #include <cbfs.h> #include <cbmem.h> -#include <timestamp.h> - -#include <arch/cache.h> -#include <arch/exception.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 <program_loading.h> - -#include <drivers/maxim/max77686/max77686.h> #include <device/i2c.h> +#include <drivers/maxim/max77686/max77686.h> +#include <soc/clk.h> +#include <soc/cpu.h> +#include <soc/dmc.h> +#include <soc/gpio.h> +#include <soc/i2c.h> +#include <soc/setup.h> +#include <soc/periph.h> +#include <soc/power.h> +#include <soc/trustzone.h> +#include <soc/wakeup.h> +#include <timestamp.h> +#include <types.h> #include "exynos5250.h" diff --git a/src/mainboard/google/daisy/wakeup.c b/src/mainboard/google/daisy/wakeup.c index 8b7fc4b9d2..95ef879cd9 100644 --- a/src/mainboard/google/daisy/wakeup.c +++ b/src/mainboard/google/daisy/wakeup.c @@ -17,8 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <soc/samsung/exynos5250/gpio.h> -#include <soc/samsung/exynos5250/wakeup.h> +#include <soc/gpio.h> +#include <soc/wakeup.h> int wakeup_need_reset(void) { diff --git a/src/soc/samsung/exynos5250/Makefile.inc b/src/soc/samsung/exynos5250/Makefile.inc index 735ce2e867..4483f820d0 100644 --- a/src/soc/samsung/exynos5250/Makefile.inc +++ b/src/soc/samsung/exynos5250/Makefile.inc @@ -48,6 +48,8 @@ ramstage-y += fb.c ramstage-y += usb.c ramstage-y += cbmem.c +CPPFLAGS_common += -Isrc/soc/samsung/exynos5250/include/ + $(objcbfs)/bootblock.raw.elf: $(objcbfs)/bootblock.elf cp $< $@ diff --git a/src/soc/samsung/exynos5250/alternate_cbfs.c b/src/soc/samsung/exynos5250/alternate_cbfs.c index e46221cd2d..93a3363b4f 100644 --- a/src/soc/samsung/exynos5250/alternate_cbfs.c +++ b/src/soc/samsung/exynos5250/alternate_cbfs.c @@ -20,13 +20,13 @@ #include <assert.h> #include <cbfs.h> /* This driver serves as a CBFS media source. */ +#include <console/console.h> +#include <soc/alternate_cbfs.h> +#include <soc/power.h> +#include <soc/spi.h> #include <stdlib.h> #include <string.h> #include <symbols.h> -#include <console/console.h> -#include "alternate_cbfs.h" -#include "power.h" -#include "spi.h" /* This allows USB A-A firmware upload from a compatible host in four parts: * The first two are the bare BL1 and the Coreboot boot block, which are just diff --git a/src/soc/samsung/exynos5250/bootblock.c b/src/soc/samsung/exynos5250/bootblock.c index 1f101d6827..dd0e01c87c 100644 --- a/src/soc/samsung/exynos5250/bootblock.c +++ b/src/soc/samsung/exynos5250/bootblock.c @@ -18,9 +18,8 @@ */ #include <bootblock_common.h> - -#include "clk.h" -#include "wakeup.h" +#include <soc/clk.h> +#include <soc/wakeup.h> void bootblock_soc_init(void) { diff --git a/src/soc/samsung/exynos5250/cbmem.c b/src/soc/samsung/exynos5250/cbmem.c index 465032013b..34b5891e58 100644 --- a/src/soc/samsung/exynos5250/cbmem.c +++ b/src/soc/samsung/exynos5250/cbmem.c @@ -19,7 +19,7 @@ #include <stddef.h> #include <cbmem.h> -#include "cpu.h" +#include <soc/cpu.h> void *cbmem_top(void) { diff --git a/src/soc/samsung/exynos5250/chip.h b/src/soc/samsung/exynos5250/chip.h index 242bd21c70..183bda2028 100644 --- a/src/soc/samsung/exynos5250/chip.h +++ b/src/soc/samsung/exynos5250/chip.h @@ -20,7 +20,7 @@ #ifndef CPU_SAMSUNG_EXYNOS5250_H #define CPU_SAMSUNG_EXYNOS5250_H -#include "gpio.h" +#include <soc/gpio.h> struct soc_samsung_exynos5250_config { /* special magic numbers! */ diff --git a/src/soc/samsung/exynos5250/clock.c b/src/soc/samsung/exynos5250/clock.c index 246b9dc8e2..0986f8b9bd 100644 --- a/src/soc/samsung/exynos5250/clock.c +++ b/src/soc/samsung/exynos5250/clock.c @@ -17,13 +17,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <arch/io.h> #include <assert.h> +#include <console/console.h> +#include <soc/clk.h> +#include <soc/periph.h> #include <stdlib.h> #include <timer.h> -#include <arch/io.h> -#include <console/console.h> -#include "clk.h" -#include "periph.h" /* input clock of PLL: SMDK5250 has 24MHz input clock */ #define CONFIG_SYS_CLK_FREQ 24000000 diff --git a/src/soc/samsung/exynos5250/clock_init.c b/src/soc/samsung/exynos5250/clock_init.c index c8cf3babfb..409230180b 100644 --- a/src/soc/samsung/exynos5250/clock_init.c +++ b/src/soc/samsung/exynos5250/clock_init.c @@ -21,9 +21,9 @@ #include <delay.h> #include <console/console.h> -#include "clk.h" -#include "dp.h" -#include "setup.h" +#include <soc/clk.h> +#include <soc/dp.h> +#include <soc/setup.h> void system_clock_init(struct mem_timings *mem, struct arm_clk_ratios *arm_clk_ratio) diff --git a/src/soc/samsung/exynos5250/cpu.c b/src/soc/samsung/exynos5250/cpu.c index 60fa55a3de..cff1466a64 100644 --- a/src/soc/samsung/exynos5250/cpu.c +++ b/src/soc/samsung/exynos5250/cpu.c @@ -18,18 +18,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdlib.h> -#include <string.h> -#include <stddef.h> -#include <delay.h> +#include <arch/cache.h> +#include <cbmem.h> #include <console/console.h> +#include <delay.h> #include <device/device.h> -#include <cbmem.h> -#include <arch/cache.h> -#include "fimd.h" -#include "dp-core.h" -#include "cpu.h" -#include "clk.h" +#include <soc/clk.h> +#include <soc/cpu.h> +#include <soc/dp-core.h> +#include <soc/fimd.h> +#include <stddef.h> +#include <stdlib.h> +#include <string.h> + #include "chip.h" static unsigned int cpu_id; diff --git a/src/soc/samsung/exynos5250/dmc_common.c b/src/soc/samsung/exynos5250/dmc_common.c index 624097b12b..17dff1ec92 100644 --- a/src/soc/samsung/exynos5250/dmc_common.c +++ b/src/soc/samsung/exynos5250/dmc_common.c @@ -20,13 +20,12 @@ /* Mem setup common file for different types of DDR present on SMDK5250 boards. */ -#include <console/console.h> #include <arch/io.h> +#include <console/console.h> #include <delay.h> -#include "setup.h" -#include "dmc.h" -#include "clk.h" -#include "setup.h" +#include <soc/clk.h> +#include <soc/dmc.h> +#include <soc/setup.h> #define ZQ_INIT_TIMEOUT 10000 diff --git a/src/soc/samsung/exynos5250/dmc_init_ddr3.c b/src/soc/samsung/exynos5250/dmc_init_ddr3.c index 89a7b613e7..3b26c206c1 100644 --- a/src/soc/samsung/exynos5250/dmc_init_ddr3.c +++ b/src/soc/samsung/exynos5250/dmc_init_ddr3.c @@ -19,13 +19,13 @@ /* DDR3 mem setup file for SMDK5250 board based on EXYNOS5 */ -#include <delay.h> #include <arch/io.h> #include <console/console.h> -#include "clk.h" -#include "cpu.h" -#include "dmc.h" -#include "setup.h" +#include <delay.h> +#include <soc/clk.h> +#include <soc/cpu.h> +#include <soc/dmc.h> +#include <soc/setup.h> #define RDLVL_COMPLETE_TIMEOUT 10000 diff --git a/src/soc/samsung/exynos5250/dp-reg.c b/src/soc/samsung/exynos5250/dp-reg.c index 018633e899..a2c0aa482d 100644 --- a/src/soc/samsung/exynos5250/dp-reg.c +++ b/src/soc/samsung/exynos5250/dp-reg.c @@ -19,16 +19,16 @@ /* Samsung DP (Display port) register interface driver. */ -#include <console/console.h> #include <arch/io.h> +#include <console/console.h> #include <delay.h> -#include "timer.h" -#include "clk.h" -#include "cpu.h" -#include "periph.h" -#include "dp.h" -#include "fimd.h" -#include "dp-core.h" +#include <soc/clk.h> +#include <soc/cpu.h> +#include <soc/dp.h> +#include <soc/dp-core.h> +#include <soc/fimd.h> +#include <soc/periph.h> +#include <timer.h> void s5p_dp_reset(struct s5p_dp_device *dp) { diff --git a/src/soc/samsung/exynos5250/fb.c b/src/soc/samsung/exynos5250/fb.c index 48295a5f09..3c7c5ef27b 100644 --- a/src/soc/samsung/exynos5250/fb.c +++ b/src/soc/samsung/exynos5250/fb.c @@ -20,19 +20,18 @@ /* LCD driver for Exynos */ +#include <arch/io.h> +#include <console/console.h> #include <delay.h> +#include <soc/dp.h> +#include <soc/dp-core.h> +#include <soc/fimd.h> +#include <soc/i2c.h> +#include <soc/power.h> +#include <soc/sysreg.h> #include <stdlib.h> #include <string.h> #include <timer.h> -#include <arch/io.h> -#include <console/console.h> -#include "power.h" -#include "sysreg.h" - -#include "dp.h" -#include "dp-core.h" -#include "fimd.h" -#include "i2c.h" /* * Here is the rough outline of how we bring up the display: diff --git a/src/soc/samsung/exynos5250/gpio.c b/src/soc/samsung/exynos5250/gpio.c index 98c177d4d2..203aa03a42 100644 --- a/src/soc/samsung/exynos5250/gpio.c +++ b/src/soc/samsung/exynos5250/gpio.c @@ -17,12 +17,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <assert.h> #include <console/console.h> -#include <string.h> #include <delay.h> -#include <assert.h> -#include "gpio.h" -#include "cpu.h" +#include <soc/cpu.h> +#include <soc/gpio.h> +#include <string.h> #define CON_MASK(x) (0xf << ((x) << 2)) #define CON_SFR(x, v) ((v) << ((x) << 2)) diff --git a/src/soc/samsung/exynos5250/i2c.c b/src/soc/samsung/exynos5250/i2c.c index 1e526d633a..f92182a77a 100644 --- a/src/soc/samsung/exynos5250/i2c.c +++ b/src/soc/samsung/exynos5250/i2c.c @@ -18,14 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <arch/io.h> #include <assert.h> #include <console/console.h> #include <delay.h> -#include <arch/io.h> #include <device/i2c.h> -#include "clk.h" -#include "i2c.h" -#include "periph.h" +#include <soc/clk.h> +#include <soc/i2c.h> +#include <soc/periph.h> struct __attribute__ ((packed)) i2c_regs { diff --git a/src/soc/samsung/exynos5250/alternate_cbfs.h b/src/soc/samsung/exynos5250/include/soc/alternate_cbfs.h index fe1af46d72..fe1af46d72 100644 --- a/src/soc/samsung/exynos5250/alternate_cbfs.h +++ b/src/soc/samsung/exynos5250/include/soc/alternate_cbfs.h diff --git a/src/soc/samsung/exynos5250/clk.h b/src/soc/samsung/exynos5250/include/soc/clk.h index 2fe59b8f85..cefd37ad45 100644 --- a/src/soc/samsung/exynos5250/clk.h +++ b/src/soc/samsung/exynos5250/include/soc/clk.h @@ -21,10 +21,11 @@ #ifndef CPU_SAMSUNG_EXYNOS5250_CLK_H #define CPU_SAMSUNG_EXYNOS5250_CLK_H +#include <soc/cpu.h> +#include <soc/dmc.h> +#include <soc/pinmux.h> #include <stdint.h> -#include "cpu.h" - enum periph_id; #define APLL 0 @@ -66,9 +67,6 @@ void set_mmc_clk(int dev_index, unsigned int div); */ unsigned long clock_get_periph_rate(enum periph_id peripheral); -#include "pinmux.h" - - #define MCT_HZ 24000000 /* @@ -594,8 +592,6 @@ void clock_gate(void); void mct_start(void); uint64_t mct_raw_value(void); -#include "dmc.h" - /* These are the ratio's for configuring ARM clock */ struct arm_clk_ratios { unsigned int arm_freq_mhz; /* Frequency of ARM core in MHz */ diff --git a/src/soc/samsung/exynos5250/cpu.h b/src/soc/samsung/exynos5250/include/soc/cpu.h index c9c5832359..c9c5832359 100644 --- a/src/soc/samsung/exynos5250/cpu.h +++ b/src/soc/samsung/exynos5250/include/soc/cpu.h diff --git a/src/soc/samsung/exynos5250/dmc.h b/src/soc/samsung/exynos5250/include/soc/dmc.h index acd9850a04..09fedc6844 100644 --- a/src/soc/samsung/exynos5250/dmc.h +++ b/src/soc/samsung/exynos5250/include/soc/dmc.h @@ -20,7 +20,7 @@ #ifndef __ASSEMBLER__ -#include "cpu.h" +#include <soc/cpu.h> struct exynos5_dmc { unsigned int concontrol; diff --git a/src/soc/samsung/exynos5250/dp-core.h b/src/soc/samsung/exynos5250/include/soc/dp-core.h index ab7e7e4b32..ab7e7e4b32 100644 --- a/src/soc/samsung/exynos5250/dp-core.h +++ b/src/soc/samsung/exynos5250/include/soc/dp-core.h diff --git a/src/soc/samsung/exynos5250/dp.h b/src/soc/samsung/exynos5250/include/soc/dp.h index d031929ef6..da204f45ac 100644 --- a/src/soc/samsung/exynos5250/dp.h +++ b/src/soc/samsung/exynos5250/include/soc/dp.h @@ -23,6 +23,8 @@ #ifndef CPU_SAMSUNG_EXYNOS5250_DP_H #define CPU_SAMSUNG_EXYNOS5250_DP_H +#include <soc/cpu.h> + /* DSIM register map */ struct exynos5_dp { u8 res1[0x10]; diff --git a/src/soc/samsung/exynos5250/dsim.h b/src/soc/samsung/exynos5250/include/soc/dsim.h index b975a106a8..b975a106a8 100644 --- a/src/soc/samsung/exynos5250/dsim.h +++ b/src/soc/samsung/exynos5250/include/soc/dsim.h diff --git a/src/soc/samsung/exynos5250/fimd.h b/src/soc/samsung/exynos5250/include/soc/fimd.h index 751e71b05c..b32b6f5fe7 100644 --- a/src/soc/samsung/exynos5250/fimd.h +++ b/src/soc/samsung/exynos5250/include/soc/fimd.h @@ -22,7 +22,7 @@ #ifndef CPU_SAMSUNG_EXYNOS5250_FIMD_H #define CPU_SAMSUNG_EXYNOS5250_FIMD_H -#include "cpu.h" +#include <soc/cpu.h> /* FIMD register map */ struct exynos5_fimd { diff --git a/src/soc/samsung/exynos5250/gpio.h b/src/soc/samsung/exynos5250/include/soc/gpio.h index a8f22f7df0..bbe97a1048 100644 --- a/src/soc/samsung/exynos5250/gpio.h +++ b/src/soc/samsung/exynos5250/include/soc/gpio.h @@ -20,7 +20,7 @@ #ifndef CPU_SAMSUNG_EXYNOS5250_GPIO_H #define CPU_SAMSUNG_EXYNOS5250_GPIO_H -#include "cpu.h" +#include <soc/cpu.h> struct gpio_bank { unsigned int con; diff --git a/src/soc/samsung/exynos5250/i2c.h b/src/soc/samsung/exynos5250/include/soc/i2c.h index af4f2160ab..af4f2160ab 100644 --- a/src/soc/samsung/exynos5250/i2c.h +++ b/src/soc/samsung/exynos5250/include/soc/i2c.h diff --git a/src/soc/samsung/exynos5250/i2s-regs.h b/src/soc/samsung/exynos5250/include/soc/i2s-regs.h index fabd914180..fabd914180 100644 --- a/src/soc/samsung/exynos5250/i2s-regs.h +++ b/src/soc/samsung/exynos5250/include/soc/i2s-regs.h diff --git a/src/soc/samsung/exynos5250/memlayout.ld b/src/soc/samsung/exynos5250/include/soc/memlayout.ld index 010bb7b64d..010bb7b64d 100644 --- a/src/soc/samsung/exynos5250/memlayout.ld +++ b/src/soc/samsung/exynos5250/include/soc/memlayout.ld diff --git a/src/soc/samsung/exynos5250/periph.h b/src/soc/samsung/exynos5250/include/soc/periph.h index 7d8bf623f6..7d8bf623f6 100644 --- a/src/soc/samsung/exynos5250/periph.h +++ b/src/soc/samsung/exynos5250/include/soc/periph.h diff --git a/src/soc/samsung/exynos5250/pinmux.h b/src/soc/samsung/exynos5250/include/soc/pinmux.h index 227a2807e3..227a2807e3 100644 --- a/src/soc/samsung/exynos5250/pinmux.h +++ b/src/soc/samsung/exynos5250/include/soc/pinmux.h diff --git a/src/soc/samsung/exynos5250/power.h b/src/soc/samsung/exynos5250/include/soc/power.h index 28f25a6ec1..6f64a845db 100644 --- a/src/soc/samsung/exynos5250/power.h +++ b/src/soc/samsung/exynos5250/include/soc/power.h @@ -22,7 +22,7 @@ #ifndef CPU_SAMSUNG_EXYNOS5250_POWER_H #define CPU_SAMSUNG_EXYNOS5250_POWER_H -#include "cpu.h" +#include <soc/cpu.h> /* Enable HW thermal trip with PS_HOLD_CONTROL register ENABLE_HW_TRIP bit */ void power_enable_hw_thermal_trip(void); diff --git a/src/soc/samsung/exynos5250/setup.h b/src/soc/samsung/exynos5250/include/soc/setup.h index 274ceb1ad0..274ceb1ad0 100644 --- a/src/soc/samsung/exynos5250/setup.h +++ b/src/soc/samsung/exynos5250/include/soc/setup.h diff --git a/src/soc/samsung/exynos5250/spi.h b/src/soc/samsung/exynos5250/include/soc/spi.h index 4301d42e24..4301d42e24 100644 --- a/src/soc/samsung/exynos5250/spi.h +++ b/src/soc/samsung/exynos5250/include/soc/spi.h diff --git a/src/soc/samsung/exynos5250/sysreg.h b/src/soc/samsung/exynos5250/include/soc/sysreg.h index ece9011abf..a869f3dd5f 100644 --- a/src/soc/samsung/exynos5250/sysreg.h +++ b/src/soc/samsung/exynos5250/include/soc/sysreg.h @@ -22,7 +22,7 @@ #ifndef CPU_SAMSUNG_EXYNOS5250_SYSREG_H #define CPU_SAMSUNG_EXYNOS5250_SYSREG_H -#include "cpu.h" +#include <soc/cpu.h> /* sysreg map */ struct exynos5_sysreg { diff --git a/src/soc/samsung/exynos5250/tmu.h b/src/soc/samsung/exynos5250/include/soc/tmu.h index 34d1f45fef..34d1f45fef 100644 --- a/src/soc/samsung/exynos5250/tmu.h +++ b/src/soc/samsung/exynos5250/include/soc/tmu.h diff --git a/src/soc/samsung/exynos5250/trustzone.h b/src/soc/samsung/exynos5250/include/soc/trustzone.h index 4cbb1aa1a5..4cbb1aa1a5 100644 --- a/src/soc/samsung/exynos5250/trustzone.h +++ b/src/soc/samsung/exynos5250/include/soc/trustzone.h diff --git a/src/soc/samsung/exynos5250/uart.h b/src/soc/samsung/exynos5250/include/soc/uart.h index e2514d7b6d..e2514d7b6d 100644 --- a/src/soc/samsung/exynos5250/uart.h +++ b/src/soc/samsung/exynos5250/include/soc/uart.h diff --git a/src/soc/samsung/exynos5250/usb.h b/src/soc/samsung/exynos5250/include/soc/usb.h index 20a22571a2..efac46f181 100644 --- a/src/soc/samsung/exynos5250/usb.h +++ b/src/soc/samsung/exynos5250/include/soc/usb.h @@ -20,7 +20,7 @@ #ifndef CPU_SAMSUNG_EXYNOS5250_USB_H #define CPU_SAMSUNG_EXYNOS5250_USB_H -#include "cpu.h" +#include <soc/cpu.h> #define CLK_24MHZ 5 diff --git a/src/soc/samsung/exynos5250/wakeup.h b/src/soc/samsung/exynos5250/include/soc/wakeup.h index 690c6a3262..690c6a3262 100644 --- a/src/soc/samsung/exynos5250/wakeup.h +++ b/src/soc/samsung/exynos5250/include/soc/wakeup.h diff --git a/src/soc/samsung/exynos5250/mct.c b/src/soc/samsung/exynos5250/mct.c index bbb90e49bb..ae6186ab8c 100644 --- a/src/soc/samsung/exynos5250/mct.c +++ b/src/soc/samsung/exynos5250/mct.c @@ -17,9 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdint.h> #include <arch/io.h> -#include "clk.h" +#include <soc/clk.h> +#include <stdint.h> uint64_t mct_raw_value(void) { diff --git a/src/soc/samsung/exynos5250/monotonic_timer.c b/src/soc/samsung/exynos5250/monotonic_timer.c index 89ac416eb1..9dafa23567 100644 --- a/src/soc/samsung/exynos5250/monotonic_timer.c +++ b/src/soc/samsung/exynos5250/monotonic_timer.c @@ -17,11 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <soc/clk.h> #include <stdint.h> #include <timer.h> -#include "clk.h" - static const uint32_t clocks_per_usec = MCT_HZ/1000000; void timer_monotonic_get(struct mono_time *mt) diff --git a/src/soc/samsung/exynos5250/pinmux.c b/src/soc/samsung/exynos5250/pinmux.c index dc9590f20f..e4e4346193 100644 --- a/src/soc/samsung/exynos5250/pinmux.c +++ b/src/soc/samsung/exynos5250/pinmux.c @@ -17,10 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <console/console.h> #include <assert.h> -#include "gpio.h" -#include "pinmux.h" +#include <console/console.h> +#include <soc/gpio.h> +#include <soc/pinmux.h> static void exynos_pinmux_uart(int start, int count) { diff --git a/src/soc/samsung/exynos5250/power.c b/src/soc/samsung/exynos5250/power.c index 7d947121de..c7d491dd23 100644 --- a/src/soc/samsung/exynos5250/power.c +++ b/src/soc/samsung/exynos5250/power.c @@ -22,9 +22,9 @@ #include <arch/io.h> #include <console/console.h> #include <halt.h> -#include "dmc.h" -#include "power.h" -#include "setup.h" +#include <soc/dmc.h> +#include <soc/power.h> +#include <soc/setup.h> /* Set the PS-Hold drive value */ static void ps_hold_setup(void) diff --git a/src/soc/samsung/exynos5250/spi.c b/src/soc/samsung/exynos5250/spi.c index 33ec6984db..33a8c740f7 100644 --- a/src/soc/samsung/exynos5250/spi.c +++ b/src/soc/samsung/exynos5250/spi.c @@ -18,13 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <assert.h> -#include <stdlib.h> #include <arch/io.h> +#include <assert.h> #include <console/console.h> -#include "clk.h" -#include "gpio.h" -#include "spi.h" +#include <soc/clk.h> +#include <soc/gpio.h> +#include <soc/spi.h> +#include <stdlib.h> #if defined(CONFIG_DEBUG_SPI) && CONFIG_DEBUG_SPI # define DEBUG_SPI(x,...) printk(BIOS_DEBUG, "EXYNOS_SPI: " x) diff --git a/src/soc/samsung/exynos5250/timer.c b/src/soc/samsung/exynos5250/timer.c index 5d402bc4bc..891c3d74cd 100644 --- a/src/soc/samsung/exynos5250/timer.c +++ b/src/soc/samsung/exynos5250/timer.c @@ -18,10 +18,9 @@ */ #include <console/console.h> -#include <timer.h> #include <delay.h> - -#include "clk.h" +#include <soc/clk.h> +#include <timer.h> void init_timer(void) { diff --git a/src/soc/samsung/exynos5250/tmu.c b/src/soc/samsung/exynos5250/tmu.c index 1b5e9c2b64..bde11a2550 100644 --- a/src/soc/samsung/exynos5250/tmu.c +++ b/src/soc/samsung/exynos5250/tmu.c @@ -20,10 +20,10 @@ /* EXYNOS - Thermal Management Unit */ -#include <console/console.h> #include <arch/io.h> -#include "power.h" -#include "tmu.h" +#include <console/console.h> +#include <soc/power.h> +#include <soc/tmu.h> #define TRIMINFO_RELOAD 1 #define CORE_EN 1 diff --git a/src/soc/samsung/exynos5250/trustzone.c b/src/soc/samsung/exynos5250/trustzone.c index d67eb33228..c4d3bc64b6 100644 --- a/src/soc/samsung/exynos5250/trustzone.c +++ b/src/soc/samsung/exynos5250/trustzone.c @@ -19,7 +19,7 @@ */ #include <arch/io.h> -#include "trustzone.h" +#include <soc/trustzone.h> /* Setting TZPC[TrustZone Protection Controller] */ void trustzone_init(void) diff --git a/src/soc/samsung/exynos5250/uart.c b/src/soc/samsung/exynos5250/uart.c index c02cdf74c0..997aa0df8d 100644 --- a/src/soc/samsung/exynos5250/uart.c +++ b/src/soc/samsung/exynos5250/uart.c @@ -17,15 +17,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <types.h> -#include <console/uart.h> #include <arch/io.h> #include <boot/coreboot_tables.h> -#include "uart.h" -#include "clk.h" -#include "cpu.h" -#include "periph.h" -#include "uart.h" +#include <console/uart.h> +#include <soc/clk.h> +#include <soc/cpu.h> +#include <soc/periph.h> +#include <soc/uart.h> +#include <types.h> #define RX_FIFO_COUNT_MASK 0xff #define RX_FIFO_FULL_MASK (1 << 8) diff --git a/src/soc/samsung/exynos5250/usb.c b/src/soc/samsung/exynos5250/usb.c index 76da1dd56e..8a91497e1f 100644 --- a/src/soc/samsung/exynos5250/usb.c +++ b/src/soc/samsung/exynos5250/usb.c @@ -18,14 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <delay.h> #include <arch/io.h> #include <console/console.h> +#include <delay.h> #include <device/device.h> -#include "gpio.h" -#include "power.h" -#include "sysreg.h" -#include "usb.h" +#include <soc/gpio.h> +#include <soc/power.h> +#include <soc/sysreg.h> +#include <soc/usb.h> static void reset_dwc3(struct exynos5_usb_drd_dwc3 *dwc3) { diff --git a/src/soc/samsung/exynos5250/wakeup.c b/src/soc/samsung/exynos5250/wakeup.c index b7161cf935..e688db7e1d 100644 --- a/src/soc/samsung/exynos5250/wakeup.c +++ b/src/soc/samsung/exynos5250/wakeup.c @@ -18,8 +18,8 @@ */ #include <console/console.h> -#include "power.h" -#include "wakeup.h" +#include <soc/power.h> +#include <soc/wakeup.h> void wakeup(void) { |