diff options
55 files changed, 168 insertions, 181 deletions
diff --git a/src/mainboard/google/peach_pit/chromeos.c b/src/mainboard/google/peach_pit/chromeos.c index 7b0807c71a..a036d80c74 100644 --- a/src/mainboard/google/peach_pit/chromeos.c +++ b/src/mainboard/google/peach_pit/chromeos.c @@ -18,14 +18,14 @@ */ #include <boot/coreboot_tables.h> +#include <bootmode.h> #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/exynos5420/cpu.h> -#include <soc/samsung/exynos5420/gpio.h> void fill_lb_gpios(struct lb_gpios *gpios) { diff --git a/src/mainboard/google/peach_pit/mainboard.c b/src/mainboard/google/peach_pit/mainboard.c index b6f49e2942..fb37cde6d4 100644 --- a/src/mainboard/google/peach_pit/mainboard.c +++ b/src/mainboard/google/peach_pit/mainboard.c @@ -17,30 +17,30 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <string.h> +#include <arch/cache.h> +#include <boot/coreboot_tables.h> +#include <cbmem.h> #include <console/console.h> +#include <delay.h> #include <device/device.h> #include <device/i2c.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/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/periph.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 <edid.h> +#include <soc/tmu.h> +#include <soc/clk.h> +#include <soc/cpu.h> +#include <soc/gpio.h> +#include <soc/power.h> +#include <soc/periph.h> +#include <soc/i2c.h> +#include <soc/dp.h> +#include <soc/fimd.h> +#include <soc/usb.h> #include <stdlib.h> +#include <string.h> #include <symbols.h> +#include <vbe.h> /* convenient shorthand (in MB) */ #define DRAM_START ((uintptr_t)_dram/MiB) diff --git a/src/mainboard/google/peach_pit/memlayout.ld b/src/mainboard/google/peach_pit/memlayout.ld index 565ba89194..ead7f47838 100644 --- a/src/mainboard/google/peach_pit/memlayout.ld +++ b/src/mainboard/google/peach_pit/memlayout.ld @@ -1 +1 @@ -#include <soc/samsung/exynos5420/memlayout.ld> +#include <soc/memlayout.ld> diff --git a/src/mainboard/google/peach_pit/memory.c b/src/mainboard/google/peach_pit/memory.c index 8a9f454886..6db329626c 100644 --- a/src/mainboard/google/peach_pit/memory.c +++ b/src/mainboard/google/peach_pit/memory.c @@ -18,14 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <console/console.h> +#include <soc/clk.h> +#include <soc/dmc.h> +#include <soc/gpio.h> +#include <soc/setup.h> #include <stddef.h> #include <stdlib.h> -#include <console/console.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/peach_pit/romstage.c b/src/mainboard/google/peach_pit/romstage.c index 04be804b05..443eafd97f 100644 --- a/src/mainboard/google/peach_pit/romstage.c +++ b/src/mainboard/google/peach_pit/romstage.c @@ -17,31 +17,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <types.h> -#include <stdlib.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/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 <program_loading.h> - -#include <drivers/maxim/max77802/max77802.h> #include <device/i2c.h> +#include <drivers/maxim/max77802/max77802.h> +#include <program_loading.h> +#include <soc/clk.h> +#include <soc/cpu.h> +#include <soc/dmc.h> +#include <soc/gpio.h> +#include <soc/i2c.h> +#include <soc/periph.h> +#include <soc/power.h> +#include <soc/setup.h> +#include <soc/trustzone.h> +#include <soc/wakeup.h> +#include <stdlib.h> +#include <timestamp.h> +#include <types.h> #define PMIC_I2C_BUS 4 diff --git a/src/mainboard/google/peach_pit/wakeup.c b/src/mainboard/google/peach_pit/wakeup.c index 130282cb64..e0b1a17cc2 100644 --- a/src/mainboard/google/peach_pit/wakeup.c +++ b/src/mainboard/google/peach_pit/wakeup.c @@ -17,8 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <soc/samsung/exynos5420/gpio.h> -#include <soc/samsung/exynos5420/wakeup.h> +#include <soc/gpio.h> +#include <soc/wakeup.h> int wakeup_need_reset(void) { diff --git a/src/soc/samsung/exynos5420/Makefile.inc b/src/soc/samsung/exynos5420/Makefile.inc index eadf8ed348..eab4fb38c6 100644 --- a/src/soc/samsung/exynos5420/Makefile.inc +++ b/src/soc/samsung/exynos5420/Makefile.inc @@ -51,6 +51,8 @@ ramstage-y += cbmem.c rmodules_$(ARCH-romstage-y)-y += monotonic_timer.c rmodules_$(ARCH-romstage-y)-y += mct.c +CPPFLAGS_common += -Isrc/soc/samsung/exynos5420/include/ + $(objcbfs)/bootblock.raw.elf: $(objcbfs)/bootblock.elf cp $< $@ diff --git a/src/soc/samsung/exynos5420/alternate_cbfs.c b/src/soc/samsung/exynos5420/alternate_cbfs.c index 7fc0e6d6fb..9ac0e2478e 100644 --- a/src/soc/samsung/exynos5420/alternate_cbfs.c +++ b/src/soc/samsung/exynos5420/alternate_cbfs.c @@ -18,16 +18,16 @@ */ +#include <arch/cache.h> #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 <arch/cache.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/exynos5420/bootblock.c b/src/soc/samsung/exynos5420/bootblock.c index d5f92eeb3d..f347677b94 100644 --- a/src/soc/samsung/exynos5420/bootblock.c +++ b/src/soc/samsung/exynos5420/bootblock.c @@ -17,12 +17,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <bootblock_common.h> #include <arch/cache.h> - -#include "clk.h" -#include "wakeup.h" -#include "cpu.h" +#include <bootblock_common.h> +#include <soc/clk.h> +#include <soc/wakeup.h> +#include <soc/cpu.h> /* convenient shorthand (in MB) */ #define SRAM_START (EXYNOS5_SRAM_BASE >> 20) diff --git a/src/soc/samsung/exynos5420/cbmem.c b/src/soc/samsung/exynos5420/cbmem.c index 465032013b..9c095d3eed 100644 --- a/src/soc/samsung/exynos5420/cbmem.c +++ b/src/soc/samsung/exynos5420/cbmem.c @@ -17,9 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stddef.h> #include <cbmem.h> -#include "cpu.h" +#include <soc/cpu.h> +#include <stddef.h> void *cbmem_top(void) { diff --git a/src/soc/samsung/exynos5420/chip.h b/src/soc/samsung/exynos5420/chip.h index 65bcacb1fd..b552b6efdc 100644 --- a/src/soc/samsung/exynos5420/chip.h +++ b/src/soc/samsung/exynos5420/chip.h @@ -20,7 +20,7 @@ #ifndef CPU_SAMSUNG_EXYNOS5420_H #define CPU_SAMSUNG_EXYNOS5420_H -#include "gpio.h" +#include <soc/gpio.h> struct soc_samsung_exynos5420_config { /* special magic numbers! */ diff --git a/src/soc/samsung/exynos5420/clock.c b/src/soc/samsung/exynos5420/clock.c index 91e61cb2d1..f6c7845c54 100644 --- a/src/soc/samsung/exynos5420/clock.c +++ b/src/soc/samsung/exynos5420/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: SMDK5420 has 24MHz input clock */ #define CONFIG_SYS_CLK_FREQ 24000000 diff --git a/src/soc/samsung/exynos5420/clock_init.c b/src/soc/samsung/exynos5420/clock_init.c index cfac01e307..25b8beecd1 100644 --- a/src/soc/samsung/exynos5420/clock_init.c +++ b/src/soc/samsung/exynos5420/clock_init.c @@ -19,13 +19,13 @@ /* Clock setup for SMDK5420 board based on EXYNOS5 */ -#include <delay.h> #include <console/console.h> -#include "clk.h" -#include "cpu.h" -#include "dp.h" -#include "dmc.h" -#include "setup.h" +#include <delay.h> +#include <soc/clk.h> +#include <soc/cpu.h> +#include <soc/dp.h> +#include <soc/dmc.h> +#include <soc/setup.h> void system_clock_init(void) { diff --git a/src/soc/samsung/exynos5420/cpu.c b/src/soc/samsung/exynos5420/cpu.c index e8649a0041..021b7a9a76 100644 --- a/src/soc/samsung/exynos5420/cpu.c +++ b/src/soc/samsung/exynos5420/cpu.c @@ -18,21 +18,21 @@ * 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 "dp.h" -#include "fimd.h" -#include "cpu.h" -#include "clk.h" -#include "chip.h" - #include <ec/google/chromeec/ec.h> +#include <soc/dp.h> +#include <soc/fimd.h> +#include <soc/cpu.h> +#include <soc/clk.h> +#include <stddef.h> +#include <stdlib.h> +#include <string.h> + +#include "chip.h" static unsigned int cpu_id; static unsigned int cpu_rev; diff --git a/src/soc/samsung/exynos5420/dmc_common.c b/src/soc/samsung/exynos5420/dmc_common.c index e651b7f947..cb1546e61a 100644 --- a/src/soc/samsung/exynos5420/dmc_common.c +++ b/src/soc/samsung/exynos5420/dmc_common.c @@ -20,12 +20,12 @@ /* Mem setup common file for different types of DDR present on SMDK5420 boards. */ -#include <console/console.h> #include <arch/io.h> +#include <console/console.h> #include <delay.h> -#include "dmc.h" -#include "setup.h" -#include "clk.h" +#include <soc/clk.h> +#include <soc/dmc.h> +#include <soc/setup.h> #define ZQ_INIT_TIMEOUT 10000 diff --git a/src/soc/samsung/exynos5420/dmc_init_ddr3.c b/src/soc/samsung/exynos5420/dmc_init_ddr3.c index 28603ae414..802625f153 100644 --- a/src/soc/samsung/exynos5420/dmc_init_ddr3.c +++ b/src/soc/samsung/exynos5420/dmc_init_ddr3.c @@ -24,13 +24,13 @@ * MA 02111-1307 USA */ -#include <delay.h> #include <arch/io.h> #include <console/console.h> -#include "clk.h" -#include "dmc.h" -#include "power.h" -#include "setup.h" +#include <delay.h> +#include <soc/clk.h> +#include <soc/dmc.h> +#include <soc/power.h> +#include <soc/setup.h> #define TIMEOUT 10000 diff --git a/src/soc/samsung/exynos5420/dp.c b/src/soc/samsung/exynos5420/dp.c index 4c54b4fef1..689be94b5d 100644 --- a/src/soc/samsung/exynos5420/dp.c +++ b/src/soc/samsung/exynos5420/dp.c @@ -20,19 +20,17 @@ */ #include <arch/io.h> +#include <console/console.h> +#include <delay.h> +#include <lib.h> +#include <soc/dp.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 <delay.h> -#include <console/console.h> -#include <lib.h> -#include "timer.h" -#include "power.h" -#include "sysreg.h" - -#include "dp.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/exynos5420/dp_lowlevel.c b/src/soc/samsung/exynos5420/dp_lowlevel.c index e8892cdfcc..00fcb5c817 100644 --- a/src/soc/samsung/exynos5420/dp_lowlevel.c +++ b/src/soc/samsung/exynos5420/dp_lowlevel.c @@ -19,18 +19,17 @@ * MA 02111-1307 USA */ +#include <arch/io.h> +#include <console/console.h> #include <delay.h> +#include <soc/dp.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 "dp.h" -#include "fimd.h" -#include "i2c.h" -#include "power.h" -#include "sysreg.h" -#include "timer.h" /* FIXME: I think the DP controller shouldn't be hardcoded here... */ static struct exynos_dp * const dp_regs = (void *)EXYNOS5_DP1_BASE; diff --git a/src/soc/samsung/exynos5420/fimd.c b/src/soc/samsung/exynos5420/fimd.c index 6cb8eb2eed..dfd123254c 100644 --- a/src/soc/samsung/exynos5420/fimd.c +++ b/src/soc/samsung/exynos5420/fimd.c @@ -20,15 +20,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <delay.h> #include <arch/io.h> #include <console/console.h> -#include "clk.h" -#include "dp.h" -#include "fimd.h" -#include "periph.h" -#include "sysreg.h" -#include "timer.h" +#include <delay.h> +#include <soc/clk.h> +#include <soc/dp.h> +#include <soc/fimd.h> +#include <soc/periph.h> +#include <soc/sysreg.h> +#include <timer.h> /* fairly useful debugging stuff. */ #if 0 diff --git a/src/soc/samsung/exynos5420/gpio.c b/src/soc/samsung/exynos5420/gpio.c index 74d81135d6..92cdc28fc0 100644 --- a/src/soc/samsung/exynos5420/gpio.c +++ b/src/soc/samsung/exynos5420/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/exynos5420/i2c.c b/src/soc/samsung/exynos5420/i2c.c index 8c6c361140..f1b7c6b5bb 100644 --- a/src/soc/samsung/exynos5420/i2c.c +++ b/src/soc/samsung/exynos5420/i2c.c @@ -23,12 +23,12 @@ #include <console/console.h> #include <delay.h> #include <device/i2c.h> -#include <timer.h> +#include <soc/clk.h> +#include <soc/i2c.h> +#include <soc/periph.h> +#include <soc/pinmux.h> #include <stddef.h> -#include "clk.h" -#include "i2c.h" -#include "periph.h" -#include "pinmux.h" +#include <timer.h> struct __attribute__ ((packed)) i2c_regs { diff --git a/src/soc/samsung/exynos5420/alternate_cbfs.h b/src/soc/samsung/exynos5420/include/soc/alternate_cbfs.h index 4df61d53f2..4df61d53f2 100644 --- a/src/soc/samsung/exynos5420/alternate_cbfs.h +++ b/src/soc/samsung/exynos5420/include/soc/alternate_cbfs.h diff --git a/src/soc/samsung/exynos5420/clk.h b/src/soc/samsung/exynos5420/include/soc/clk.h index 0b56f46b51..ca1d721f85 100644 --- a/src/soc/samsung/exynos5420/clk.h +++ b/src/soc/samsung/exynos5420/include/soc/clk.h @@ -21,10 +21,11 @@ #ifndef CPU_SAMSUNG_EXYNOS5420_CLK_H #define CPU_SAMSUNG_EXYNOS5420_CLK_H +#include <soc/cpu.h> +#include <soc/dmc.h> +#include <soc/pinmux.h> #include <stdint.h> -#include "cpu.h" - enum periph_id; /* This master list of PLLs is ordered arbitrarily. */ @@ -55,9 +56,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 /* @@ -730,8 +728,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/exynos5420/cpu.h b/src/soc/samsung/exynos5420/include/soc/cpu.h index bea7f1e1e2..bea7f1e1e2 100644 --- a/src/soc/samsung/exynos5420/cpu.h +++ b/src/soc/samsung/exynos5420/include/soc/cpu.h diff --git a/src/soc/samsung/exynos5420/dmc.h b/src/soc/samsung/exynos5420/include/soc/dmc.h index 7b3e8bf4ac..bc0751de89 100644 --- a/src/soc/samsung/exynos5420/dmc.h +++ b/src/soc/samsung/exynos5420/include/soc/dmc.h @@ -72,7 +72,7 @@ #ifndef __ASSEMBLER__ -#include "cpu.h" +#include <soc/cpu.h> struct exynos5_dmc { uint32_t concontrol; diff --git a/src/soc/samsung/exynos5420/dp.h b/src/soc/samsung/exynos5420/include/soc/dp.h index 5c577089b5..73bc9b21fe 100644 --- a/src/soc/samsung/exynos5420/dp.h +++ b/src/soc/samsung/exynos5420/include/soc/dp.h @@ -23,7 +23,7 @@ #ifndef CPU_SAMSUNG_EXYNOS5420_DP_H #define CPU_SAMSUNG_EXYNOS5420_DP_H -#include "cpu.h" +#include <soc/cpu.h> /* DSIM register map */ struct exynos_dp { diff --git a/src/soc/samsung/exynos5420/dsim.h b/src/soc/samsung/exynos5420/include/soc/dsim.h index 9ad55d71c9..9ad55d71c9 100644 --- a/src/soc/samsung/exynos5420/dsim.h +++ b/src/soc/samsung/exynos5420/include/soc/dsim.h diff --git a/src/soc/samsung/exynos5420/fimd.h b/src/soc/samsung/exynos5420/include/soc/fimd.h index fa1e27a095..5997f5b652 100644 --- a/src/soc/samsung/exynos5420/fimd.h +++ b/src/soc/samsung/exynos5420/include/soc/fimd.h @@ -22,7 +22,7 @@ #ifndef CPU_SAMSUNG_EXYNOS5420_FIMD_H #define CPU_SAMSUNG_EXYNOS5420_FIMD_H -#include "cpu.h" +#include <soc/cpu.h> /* FIMD register map */ struct exynos5_fimd { diff --git a/src/soc/samsung/exynos5420/gpio.h b/src/soc/samsung/exynos5420/include/soc/gpio.h index ea1cd2fec7..1c6a77b7c4 100644 --- a/src/soc/samsung/exynos5420/gpio.h +++ b/src/soc/samsung/exynos5420/include/soc/gpio.h @@ -20,7 +20,7 @@ #ifndef CPU_SAMSUNG_EXYNOS5420_GPIO_H #define CPU_SAMSUNG_EXYNOS5420_GPIO_H -#include "cpu.h" +#include <soc/cpu.h> struct gpio_bank { unsigned int con; diff --git a/src/soc/samsung/exynos5420/i2c.h b/src/soc/samsung/exynos5420/include/soc/i2c.h index b9e3c0f5eb..b9e3c0f5eb 100644 --- a/src/soc/samsung/exynos5420/i2c.h +++ b/src/soc/samsung/exynos5420/include/soc/i2c.h diff --git a/src/soc/samsung/exynos5420/i2s-regs.h b/src/soc/samsung/exynos5420/include/soc/i2s-regs.h index 28d2685c63..28d2685c63 100644 --- a/src/soc/samsung/exynos5420/i2s-regs.h +++ b/src/soc/samsung/exynos5420/include/soc/i2s-regs.h diff --git a/src/soc/samsung/exynos5420/memlayout.ld b/src/soc/samsung/exynos5420/include/soc/memlayout.ld index 3259ff907b..3259ff907b 100644 --- a/src/soc/samsung/exynos5420/memlayout.ld +++ b/src/soc/samsung/exynos5420/include/soc/memlayout.ld diff --git a/src/soc/samsung/exynos5420/periph.h b/src/soc/samsung/exynos5420/include/soc/periph.h index 94f150e6dd..94f150e6dd 100644 --- a/src/soc/samsung/exynos5420/periph.h +++ b/src/soc/samsung/exynos5420/include/soc/periph.h diff --git a/src/soc/samsung/exynos5420/pinmux.h b/src/soc/samsung/exynos5420/include/soc/pinmux.h index fc09fc95fb..fc09fc95fb 100644 --- a/src/soc/samsung/exynos5420/pinmux.h +++ b/src/soc/samsung/exynos5420/include/soc/pinmux.h diff --git a/src/soc/samsung/exynos5420/power.h b/src/soc/samsung/exynos5420/include/soc/power.h index 76507673a0..0d31dc440b 100644 --- a/src/soc/samsung/exynos5420/power.h +++ b/src/soc/samsung/exynos5420/include/soc/power.h @@ -22,7 +22,7 @@ #ifndef CPU_SAMSUNG_EXYNOS5420_POWER_H #define CPU_SAMSUNG_EXYNOS5420_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/exynos5420/setup.h b/src/soc/samsung/exynos5420/include/soc/setup.h index e7b5bd2e08..e7b5bd2e08 100644 --- a/src/soc/samsung/exynos5420/setup.h +++ b/src/soc/samsung/exynos5420/include/soc/setup.h diff --git a/src/soc/samsung/exynos5420/spi.h b/src/soc/samsung/exynos5420/include/soc/spi.h index 78cca6f416..78cca6f416 100644 --- a/src/soc/samsung/exynos5420/spi.h +++ b/src/soc/samsung/exynos5420/include/soc/spi.h diff --git a/src/soc/samsung/exynos5420/sysreg.h b/src/soc/samsung/exynos5420/include/soc/sysreg.h index c73020d752..d2f1bdefea 100644 --- a/src/soc/samsung/exynos5420/sysreg.h +++ b/src/soc/samsung/exynos5420/include/soc/sysreg.h @@ -22,7 +22,7 @@ #ifndef CPU_SAMSUNG_EXYNOS5420_SYSREG_H #define CPU_SAMSUNG_EXYNOS5420_SYSREG_H -#include "cpu.h" +#include <soc/cpu.h> /* sysreg map */ struct exynos5_sysreg { diff --git a/src/soc/samsung/exynos5420/tmu.h b/src/soc/samsung/exynos5420/include/soc/tmu.h index f71c8993de..f71c8993de 100644 --- a/src/soc/samsung/exynos5420/tmu.h +++ b/src/soc/samsung/exynos5420/include/soc/tmu.h diff --git a/src/soc/samsung/exynos5420/trustzone.h b/src/soc/samsung/exynos5420/include/soc/trustzone.h index 209cd9f354..209cd9f354 100644 --- a/src/soc/samsung/exynos5420/trustzone.h +++ b/src/soc/samsung/exynos5420/include/soc/trustzone.h diff --git a/src/soc/samsung/exynos5420/uart.h b/src/soc/samsung/exynos5420/include/soc/uart.h index ed78f60cc3..ed78f60cc3 100644 --- a/src/soc/samsung/exynos5420/uart.h +++ b/src/soc/samsung/exynos5420/include/soc/uart.h diff --git a/src/soc/samsung/exynos5420/usb.h b/src/soc/samsung/exynos5420/include/soc/usb.h index 599b944719..12571057b6 100644 --- a/src/soc/samsung/exynos5420/usb.h +++ b/src/soc/samsung/exynos5420/include/soc/usb.h @@ -20,7 +20,7 @@ #ifndef CPU_SAMSUNG_EXYNOS5420_USB_H #define CPU_SAMSUNG_EXYNOS5420_USB_H -#include "cpu.h" +#include <soc/cpu.h> #define CLK_24MHZ 5 diff --git a/src/soc/samsung/exynos5420/wakeup.h b/src/soc/samsung/exynos5420/include/soc/wakeup.h index 27ce8e2f2d..27ce8e2f2d 100644 --- a/src/soc/samsung/exynos5420/wakeup.h +++ b/src/soc/samsung/exynos5420/include/soc/wakeup.h diff --git a/src/soc/samsung/exynos5420/mct.c b/src/soc/samsung/exynos5420/mct.c index bbb90e49bb..ae6186ab8c 100644 --- a/src/soc/samsung/exynos5420/mct.c +++ b/src/soc/samsung/exynos5420/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/exynos5420/monotonic_timer.c b/src/soc/samsung/exynos5420/monotonic_timer.c index 89ac416eb1..9dafa23567 100644 --- a/src/soc/samsung/exynos5420/monotonic_timer.c +++ b/src/soc/samsung/exynos5420/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/exynos5420/pinmux.c b/src/soc/samsung/exynos5420/pinmux.c index 43a4332503..8fee096ea4 100644 --- a/src/soc/samsung/exynos5420/pinmux.c +++ b/src/soc/samsung/exynos5420/pinmux.c @@ -17,11 +17,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <console/console.h> #include <assert.h> +#include <console/console.h> +#include <soc/gpio.h> +#include <soc/pinmux.h> #include <stdlib.h> -#include "gpio.h" -#include "pinmux.h" static void exynos_pinmux_uart(int start, int count) { diff --git a/src/soc/samsung/exynos5420/power.c b/src/soc/samsung/exynos5420/power.c index 7d947121de..c7d491dd23 100644 --- a/src/soc/samsung/exynos5420/power.c +++ b/src/soc/samsung/exynos5420/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/exynos5420/smp.c b/src/soc/samsung/exynos5420/smp.c index 41a57ab385..8775bc9baf 100644 --- a/src/soc/samsung/exynos5420/smp.c +++ b/src/soc/samsung/exynos5420/smp.c @@ -18,14 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <arch/cpu.h> +#include <arch/io.h> +#include <soc/cpu.h> +#include <soc/power.h> #include <stdlib.h> #include <string.h> #include <types.h> -#include <arch/cpu.h> -#include <arch/io.h> - -#include "cpu.h" -#include "power.h" /* ACTLR, L2CTLR L2ACTLR constants used in SMP core power up. */ diff --git a/src/soc/samsung/exynos5420/spi.c b/src/soc/samsung/exynos5420/spi.c index 36742a7279..6ceb92edd2 100644 --- a/src/soc/samsung/exynos5420/spi.c +++ b/src/soc/samsung/exynos5420/spi.c @@ -18,16 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <console/console.h> #include <arch/io.h> -#include <stdlib.h> #include <assert.h> +#include <console/console.h> +#include <soc/cpu.h> +#include <soc/spi.h> #include <spi_flash.h> +#include <stdlib.h> #include <string.h> -#include "cpu.h" -#include "spi.h" - #define EXYNOS_SPI_MAX_TRANSFER_BYTES (65535) #if defined(CONFIG_DEBUG_SPI) && CONFIG_DEBUG_SPI diff --git a/src/soc/samsung/exynos5420/timer.c b/src/soc/samsung/exynos5420/timer.c index ae13342c92..7156a010af 100644 --- a/src/soc/samsung/exynos5420/timer.c +++ b/src/soc/samsung/exynos5420/timer.c @@ -18,10 +18,10 @@ */ #include <console/console.h> -#include <timer.h> #include <delay.h> +#include <soc/clk.h> #include <thread.h> -#include "clk.h" +#include <timer.h> void init_timer(void) { diff --git a/src/soc/samsung/exynos5420/tmu.c b/src/soc/samsung/exynos5420/tmu.c index ea706cba2a..8ed78bba4a 100644 --- a/src/soc/samsung/exynos5420/tmu.c +++ b/src/soc/samsung/exynos5420/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/exynos5420/trustzone.c b/src/soc/samsung/exynos5420/trustzone.c index 7b1489a1a6..983690dbef 100644 --- a/src/soc/samsung/exynos5420/trustzone.c +++ b/src/soc/samsung/exynos5420/trustzone.c @@ -19,7 +19,7 @@ */ #include <arch/io.h> -#include "trustzone.h" +#include <soc/trustzone.h> /* Setting TZPC[TrustZone Protection Controller] * We pretty much disable it all, as the kernel diff --git a/src/soc/samsung/exynos5420/uart.c b/src/soc/samsung/exynos5420/uart.c index 4d71155a55..e2be882a2e 100644 --- a/src/soc/samsung/exynos5420/uart.c +++ b/src/soc/samsung/exynos5420/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/exynos5420/usb.c b/src/soc/samsung/exynos5420/usb.c index 84a6f4ca4c..0df63e2666 100644 --- a/src/soc/samsung/exynos5420/usb.c +++ b/src/soc/samsung/exynos5420/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/exynos5420/wakeup.c b/src/soc/samsung/exynos5420/wakeup.c index a2407175f9..cf9a46bc16 100644 --- a/src/soc/samsung/exynos5420/wakeup.c +++ b/src/soc/samsung/exynos5420/wakeup.c @@ -19,8 +19,8 @@ #include <arch/cache.h> #include <console/console.h> -#include "power.h" -#include "wakeup.h" +#include <soc/power.h> +#include <soc/wakeup.h> void wakeup(void) { |