diff options
author | Julius Werner <jwerner@chromium.org> | 2014-10-20 13:24:14 -0700 |
---|---|---|
committer | Patrick Georgi <pgeorgi@google.com> | 2015-04-08 09:42:08 +0200 |
commit | f0d21ff3dab80b1583fd6432f152111de2c6df02 (patch) | |
tree | 7e435e15f906892189d24602c3d1ec04ce48559f /src/mainboard/google/nyan_big | |
parent | 73d1ed66d316489d8dfd7f1b61dd0c4fceb0e24b (diff) |
tegra124: Change all SoC headers to <soc/headername.h> system
This patch aligns tegra124 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 Nyan, Nyan_Big and Nyan_Blaze.
Change-Id: Ia82ab86b2af903690cc6c9d310f7bdda3425ea7c
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 4d23774e071ec22781991ff20fbf63802f620c88
Original-Change-Id: Ia126cff8590117788d1872e50608c257d2659c1f
Original-Signed-off-by: Julius Werner <jwerner@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/224504
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/9326
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/mainboard/google/nyan_big')
-rw-r--r-- | src/mainboard/google/nyan_big/boardid.c | 5 | ||||
-rw-r--r-- | src/mainboard/google/nyan_big/bootblock.c | 8 | ||||
-rw-r--r-- | src/mainboard/google/nyan_big/chromeos.c | 4 | ||||
-rw-r--r-- | src/mainboard/google/nyan_big/early_configs.c | 4 | ||||
-rw-r--r-- | src/mainboard/google/nyan_big/mainboard.c | 12 | ||||
-rw-r--r-- | src/mainboard/google/nyan_big/memlayout.ld | 2 | ||||
-rw-r--r-- | src/mainboard/google/nyan_big/pmic.c | 4 | ||||
-rw-r--r-- | src/mainboard/google/nyan_big/reset.c | 2 | ||||
-rw-r--r-- | src/mainboard/google/nyan_big/romstage.c | 19 | ||||
-rw-r--r-- | src/mainboard/google/nyan_big/sdram_configs.c | 3 | ||||
-rw-r--r-- | src/mainboard/google/nyan_big/sdram_configs.h | 2 |
11 files changed, 33 insertions, 32 deletions
diff --git a/src/mainboard/google/nyan_big/boardid.c b/src/mainboard/google/nyan_big/boardid.c index 3a22dede45..335da87a50 100644 --- a/src/mainboard/google/nyan_big/boardid.c +++ b/src/mainboard/google/nyan_big/boardid.c @@ -17,12 +17,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <boardid.h> #include <console/console.h> -#include <soc/nvidia/tegra124/gpio.h> +#include <soc/gpio.h> #include <stdlib.h> -#include <boardid.h> - uint8_t board_id(void) { static int id = -1; diff --git a/src/mainboard/google/nyan_big/bootblock.c b/src/mainboard/google/nyan_big/bootblock.c index 05bb1c94c0..b24862e8b9 100644 --- a/src/mainboard/google/nyan_big/bootblock.c +++ b/src/mainboard/google/nyan_big/bootblock.c @@ -22,12 +22,12 @@ #include <console/console.h> #include <device/i2c.h> #include <soc/addressmap.h> +#include <soc/clk_rst.h> #include <soc/clock.h> +#include <soc/gpio.h> #include <soc/nvidia/tegra/i2c.h> -#include <soc/nvidia/tegra124/clk_rst.h> -#include <soc/nvidia/tegra124/gpio.h> -#include <soc/nvidia/tegra124/pinmux.h> -#include <soc/nvidia/tegra124/spi.h> /* FIXME: move back to soc code? */ +#include <soc/pinmux.h> +#include <soc/spi.h> /* FIXME: move back to soc code? */ #include "pmic.h" diff --git a/src/mainboard/google/nyan_big/chromeos.c b/src/mainboard/google/nyan_big/chromeos.c index 054abf6edb..28da0538f1 100644 --- a/src/mainboard/google/nyan_big/chromeos.c +++ b/src/mainboard/google/nyan_big/chromeos.c @@ -18,13 +18,13 @@ */ #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/gpio.h> #include <string.h> #include <vendorcode/google/chromeos/chromeos.h> -#include <bootmode.h> -#include <soc/nvidia/tegra124/gpio.h> void fill_lb_gpios(struct lb_gpios *gpios) { diff --git a/src/mainboard/google/nyan_big/early_configs.c b/src/mainboard/google/nyan_big/early_configs.c index c1f5f9b2f6..046e2bd419 100644 --- a/src/mainboard/google/nyan_big/early_configs.c +++ b/src/mainboard/google/nyan_big/early_configs.c @@ -19,9 +19,9 @@ #include <soc/addressmap.h> #include <soc/clock.h> +#include <soc/early_configs.h> +#include <soc/gpio.h> #include <soc/nvidia/tegra/i2c.h> -#include <soc/nvidia/tegra124/gpio.h> -#include <soc/nvidia/tegra124/early_configs.h> static struct clk_rst_ctlr *clk_rst = (void *)TEGRA_CLK_RST_BASE; diff --git a/src/mainboard/google/nyan_big/mainboard.c b/src/mainboard/google/nyan_big/mainboard.c index 05f6faeef1..63d9d5c93e 100644 --- a/src/mainboard/google/nyan_big/mainboard.c +++ b/src/mainboard/google/nyan_big/mainboard.c @@ -18,17 +18,17 @@ */ #include <arch/io.h> +#include <boot/coreboot_tables.h> #include <device/device.h> #include <elog.h> -#include <boot/coreboot_tables.h> #include <soc/addressmap.h> +#include <soc/clk_rst.h> #include <soc/clock.h> +#include <soc/gpio.h> +#include <soc/mc.h> #include <soc/nvidia/tegra/i2c.h> -#include <soc/nvidia/tegra124/clk_rst.h> -#include <soc/nvidia/tegra124/gpio.h> -#include <soc/nvidia/tegra124/mc.h> -#include <soc/nvidia/tegra124/pmc.h> -#include <soc/nvidia/tegra124/spi.h> +#include <soc/pmc.h> +#include <soc/spi.h> #include <soc/nvidia/tegra/usb.h> #include <symbols.h> #include <vendorcode/google/chromeos/chromeos.h> diff --git a/src/mainboard/google/nyan_big/memlayout.ld b/src/mainboard/google/nyan_big/memlayout.ld index 33ce6446ad..ead7f47838 100644 --- a/src/mainboard/google/nyan_big/memlayout.ld +++ b/src/mainboard/google/nyan_big/memlayout.ld @@ -1 +1 @@ -#include <soc/nvidia/tegra124/memlayout.ld> +#include <soc/memlayout.ld> diff --git a/src/mainboard/google/nyan_big/pmic.c b/src/mainboard/google/nyan_big/pmic.c index c89db2895b..f57bf08c52 100644 --- a/src/mainboard/google/nyan_big/pmic.c +++ b/src/mainboard/google/nyan_big/pmic.c @@ -18,15 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <boardid.h> #include <console/console.h> #include <delay.h> #include <device/i2c.h> #include <stdint.h> #include <stdlib.h> +#include <reset.h> -#include <boardid.h> #include "pmic.h" -#include <reset.h> enum { AS3722_I2C_ADDR = 0x40 diff --git a/src/mainboard/google/nyan_big/reset.c b/src/mainboard/google/nyan_big/reset.c index 05cca2777e..de096c6520 100644 --- a/src/mainboard/google/nyan_big/reset.c +++ b/src/mainboard/google/nyan_big/reset.c @@ -18,7 +18,7 @@ */ #include <arch/io.h> -#include <soc/nvidia/tegra124/gpio.h> +#include <soc/gpio.h> #include <reset.h> void hard_reset(void) diff --git a/src/mainboard/google/nyan_big/romstage.c b/src/mainboard/google/nyan_big/romstage.c index f2077bbb27..83d2eeffea 100644 --- a/src/mainboard/google/nyan_big/romstage.c +++ b/src/mainboard/google/nyan_big/romstage.c @@ -27,20 +27,21 @@ #include <reset.h> #include <program_loading.h> #include <romstage_handoff.h> -#include <vendorcode/google/chromeos/chromeos.h> -#include "sdram_configs.h" -#include <soc/nvidia/tegra/i2c.h> -#include <soc/nvidia/tegra124/cache.h> -#include <soc/nvidia/tegra124/chip.h> -#include <soc/nvidia/tegra124/clk_rst.h> -#include <soc/nvidia/tegra124/early_configs.h> -#include <soc/nvidia/tegra124/power.h> -#include <soc/nvidia/tegra124/sdram.h> #include <soc/addressmap.h> +#include <soc/cache.h> +#include <soc/clk_rst.h> #include <soc/clock.h> #include <soc/display.h> +#include <soc/early_configs.h> +#include <soc/nvidia/tegra/i2c.h> +#include <soc/nvidia/tegra124/chip.h> +#include <soc/power.h> +#include <soc/sdram.h> #include <symbols.h> #include <timestamp.h> +#include <vendorcode/google/chromeos/chromeos.h> + +#include "sdram_configs.h" static void __attribute__((noinline)) romstage(void) { diff --git a/src/mainboard/google/nyan_big/sdram_configs.c b/src/mainboard/google/nyan_big/sdram_configs.c index 748b6dc3ba..7904b4e94b 100644 --- a/src/mainboard/google/nyan_big/sdram_configs.c +++ b/src/mainboard/google/nyan_big/sdram_configs.c @@ -18,7 +18,8 @@ */ #include <console/console.h> -#include <soc/nvidia/tegra124/sdram.h> +#include <soc/sdram.h> + #include "sdram_configs.h" static struct sdram_params sdram_configs[] = { diff --git a/src/mainboard/google/nyan_big/sdram_configs.h b/src/mainboard/google/nyan_big/sdram_configs.h index 4bf376c190..6c3bda097a 100644 --- a/src/mainboard/google/nyan_big/sdram_configs.h +++ b/src/mainboard/google/nyan_big/sdram_configs.h @@ -20,7 +20,7 @@ #ifndef __MAINBOARD_GOOGLE_NYAN_BIG_SDRAM_CONFIG_H__ #define __MAINBOARD_GOOGLE_NYAN_BIG_SDRAM_CONFIG_H__ -#include <soc/nvidia/tegra124/sdram_param.h> +#include <soc/sdram_param.h> /* Loads SDRAM configurations for current system. */ const struct sdram_params *get_sdram_config(void); |