From f0d21ff3dab80b1583fd6432f152111de2c6df02 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Mon, 20 Oct 2014 13:24:14 -0700 Subject: tegra124: Change all SoC headers to 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 Original-Commit-Id: 4d23774e071ec22781991ff20fbf63802f620c88 Original-Change-Id: Ia126cff8590117788d1872e50608c257d2659c1f Original-Signed-off-by: Julius Werner Original-Reviewed-on: https://chromium-review.googlesource.com/224504 Original-Reviewed-by: Aaron Durbin Reviewed-on: http://review.coreboot.org/9326 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/mainboard/google/nyan_blaze/boardid.c | 5 ++--- src/mainboard/google/nyan_blaze/bootblock.c | 8 ++++---- src/mainboard/google/nyan_blaze/chromeos.c | 2 +- src/mainboard/google/nyan_blaze/early_configs.c | 4 ++-- src/mainboard/google/nyan_blaze/mainboard.c | 12 ++++++------ src/mainboard/google/nyan_blaze/memlayout.ld | 2 +- src/mainboard/google/nyan_blaze/pmic.c | 4 ++-- src/mainboard/google/nyan_blaze/reset.c | 2 +- src/mainboard/google/nyan_blaze/romstage.c | 19 ++++++++++--------- src/mainboard/google/nyan_blaze/sdram_configs.c | 3 ++- src/mainboard/google/nyan_blaze/sdram_configs.h | 2 +- 11 files changed, 32 insertions(+), 31 deletions(-) (limited to 'src/mainboard/google/nyan_blaze') diff --git a/src/mainboard/google/nyan_blaze/boardid.c b/src/mainboard/google/nyan_blaze/boardid.c index 3a22dede45..335da87a50 100644 --- a/src/mainboard/google/nyan_blaze/boardid.c +++ b/src/mainboard/google/nyan_blaze/boardid.c @@ -17,12 +17,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include -#include +#include #include -#include - uint8_t board_id(void) { static int id = -1; diff --git a/src/mainboard/google/nyan_blaze/bootblock.c b/src/mainboard/google/nyan_blaze/bootblock.c index 05bb1c94c0..b24862e8b9 100644 --- a/src/mainboard/google/nyan_blaze/bootblock.c +++ b/src/mainboard/google/nyan_blaze/bootblock.c @@ -22,12 +22,12 @@ #include #include #include +#include #include +#include #include -#include -#include -#include -#include /* FIXME: move back to soc code? */ +#include +#include /* FIXME: move back to soc code? */ #include "pmic.h" diff --git a/src/mainboard/google/nyan_blaze/chromeos.c b/src/mainboard/google/nyan_blaze/chromeos.c index da017eaed1..0b944d1667 100644 --- a/src/mainboard/google/nyan_blaze/chromeos.c +++ b/src/mainboard/google/nyan_blaze/chromeos.c @@ -21,9 +21,9 @@ #include #include #include +#include #include #include -#include //enum { // ACTIVE_LOW = 0, diff --git a/src/mainboard/google/nyan_blaze/early_configs.c b/src/mainboard/google/nyan_blaze/early_configs.c index c1f5f9b2f6..020f3fd8a8 100644 --- a/src/mainboard/google/nyan_blaze/early_configs.c +++ b/src/mainboard/google/nyan_blaze/early_configs.c @@ -19,9 +19,9 @@ #include #include +#include +#include #include -#include -#include static struct clk_rst_ctlr *clk_rst = (void *)TEGRA_CLK_RST_BASE; diff --git a/src/mainboard/google/nyan_blaze/mainboard.c b/src/mainboard/google/nyan_blaze/mainboard.c index 5f1cb49ceb..da49377166 100644 --- a/src/mainboard/google/nyan_blaze/mainboard.c +++ b/src/mainboard/google/nyan_blaze/mainboard.c @@ -18,18 +18,18 @@ */ #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/nyan_blaze/memlayout.ld b/src/mainboard/google/nyan_blaze/memlayout.ld index 33ce6446ad..ead7f47838 100644 --- a/src/mainboard/google/nyan_blaze/memlayout.ld +++ b/src/mainboard/google/nyan_blaze/memlayout.ld @@ -1 +1 @@ -#include +#include diff --git a/src/mainboard/google/nyan_blaze/pmic.c b/src/mainboard/google/nyan_blaze/pmic.c index c89db2895b..f57bf08c52 100644 --- a/src/mainboard/google/nyan_blaze/pmic.c +++ b/src/mainboard/google/nyan_blaze/pmic.c @@ -18,15 +18,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include #include #include #include #include +#include -#include #include "pmic.h" -#include enum { AS3722_I2C_ADDR = 0x40 diff --git a/src/mainboard/google/nyan_blaze/reset.c b/src/mainboard/google/nyan_blaze/reset.c index 05cca2777e..de096c6520 100644 --- a/src/mainboard/google/nyan_blaze/reset.c +++ b/src/mainboard/google/nyan_blaze/reset.c @@ -18,7 +18,7 @@ */ #include -#include +#include #include void hard_reset(void) diff --git a/src/mainboard/google/nyan_blaze/romstage.c b/src/mainboard/google/nyan_blaze/romstage.c index fb1b9e2b77..034a929944 100644 --- a/src/mainboard/google/nyan_blaze/romstage.c +++ b/src/mainboard/google/nyan_blaze/romstage.c @@ -27,20 +27,21 @@ #include #include #include -#include -#include "sdram_configs.h" -#include -#include -#include -#include -#include -#include -#include #include +#include +#include #include #include +#include +#include +#include +#include +#include #include #include +#include + +#include "sdram_configs.h" static void __attribute__((noinline)) romstage(void) { diff --git a/src/mainboard/google/nyan_blaze/sdram_configs.c b/src/mainboard/google/nyan_blaze/sdram_configs.c index 6fb517d3e2..94c9203b5f 100644 --- a/src/mainboard/google/nyan_blaze/sdram_configs.c +++ b/src/mainboard/google/nyan_blaze/sdram_configs.c @@ -18,7 +18,8 @@ */ #include -#include +#include + #include "sdram_configs.h" static struct sdram_params sdram_configs[] = { diff --git a/src/mainboard/google/nyan_blaze/sdram_configs.h b/src/mainboard/google/nyan_blaze/sdram_configs.h index 26fd048120..e5f987339f 100644 --- a/src/mainboard/google/nyan_blaze/sdram_configs.h +++ b/src/mainboard/google/nyan_blaze/sdram_configs.h @@ -20,7 +20,7 @@ #ifndef __MAINBOARD_GOOGLE_NYAN_BLAZE_SDRAM_CONFIG_H__ #define __MAINBOARD_GOOGLE_NYAN_BLAZE_SDRAM_CONFIG_H__ -#include +#include /* Loads SDRAM configurations for current system. */ const struct sdram_params *get_sdram_config(void); -- cgit v1.2.3