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>
diff --git a/src/mainboard/google/nyan/boardid.c b/src/mainboard/google/nyan/boardid.c
index a5ec61f..4628cb6 100644
--- a/src/mainboard/google/nyan/boardid.c
+++ b/src/mainboard/google/nyan/boardid.c
@@ -17,10 +17,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <console/console.h>
-#include <soc/nvidia/tegra124/gpio.h>
-
#include <boardid.h>
+#include <console/console.h>
+#include <soc/gpio.h>
uint8_t board_id(void)
{
diff --git a/src/mainboard/google/nyan/bootblock.c b/src/mainboard/google/nyan/bootblock.c
index 2b033a6..1f23d43 100644
--- a/src/mainboard/google/nyan/bootblock.c
+++ b/src/mainboard/google/nyan/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/chromeos.c b/src/mainboard/google/nyan/chromeos.c
index c4d98b7..1210f75 100644
--- a/src/mainboard/google/nyan/chromeos.c
+++ b/src/mainboard/google/nyan/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/early_configs.c b/src/mainboard/google/nyan/early_configs.c
index c1f5f9b..046e2bd 100644
--- a/src/mainboard/google/nyan/early_configs.c
+++ b/src/mainboard/google/nyan/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/mainboard.c b/src/mainboard/google/nyan/mainboard.c
index e52db83..f4aa93a 100644
--- a/src/mainboard/google/nyan/mainboard.c
+++ b/src/mainboard/google/nyan/mainboard.c
@@ -23,13 +23,13 @@
#include <boot/coreboot_tables.h>
#include <soc/addressmap.h>
#include <soc/clock.h>
+#include <soc/clk_rst.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/nvidia/tegra/usb.h>
+#include <soc/pmc.h>
+#include <soc/spi.h>
#include <symbols.h>
#include <vendorcode/google/chromeos/chromeos.h>
diff --git a/src/mainboard/google/nyan/memlayout.ld b/src/mainboard/google/nyan/memlayout.ld
index 33ce644..ead7f47 100644
--- a/src/mainboard/google/nyan/memlayout.ld
+++ b/src/mainboard/google/nyan/memlayout.ld
@@ -1 +1 @@
-#include <soc/nvidia/tegra124/memlayout.ld>
+#include <soc/memlayout.ld>
diff --git a/src/mainboard/google/nyan/pmic.c b/src/mainboard/google/nyan/pmic.c
index b290871..cfafff1 100644
--- a/src/mainboard/google/nyan/pmic.c
+++ b/src/mainboard/google/nyan/pmic.c
@@ -18,16 +18,16 @@
* 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 <boardid.h>
-#include "pmic.h"
#include <reset.h>
+#include "pmic.h"
+
enum {
AS3722_I2C_ADDR = 0x40
};
diff --git a/src/mainboard/google/nyan/reset.c b/src/mainboard/google/nyan/reset.c
index 05cca27..de096c6 100644
--- a/src/mainboard/google/nyan/reset.c
+++ b/src/mainboard/google/nyan/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/romstage.c b/src/mainboard/google/nyan/romstage.c
index f2077bb..83d2eef 100644
--- a/src/mainboard/google/nyan/romstage.c
+++ b/src/mainboard/google/nyan/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/sdram_configs.c b/src/mainboard/google/nyan/sdram_configs.c
index 3b774b2..d99f6bd 100644
--- a/src/mainboard/google/nyan/sdram_configs.c
+++ b/src/mainboard/google/nyan/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/sdram_configs.h b/src/mainboard/google/nyan/sdram_configs.h
index e0ea1e2..4a5ae68 100644
--- a/src/mainboard/google/nyan/sdram_configs.h
+++ b/src/mainboard/google/nyan/sdram_configs.h
@@ -20,7 +20,7 @@
#ifndef __MAINBOARD_GOOGLE_NYAN_SDRAM_CONFIG_H__
#define __MAINBOARD_GOOGLE_NYAN_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);
diff --git a/src/mainboard/google/nyan_big/boardid.c b/src/mainboard/google/nyan_big/boardid.c
index 3a22ded..335da87 100644
--- a/src/mainboard/google/nyan_big/boardid.c
+++ b/src/mainboard/google/nyan_big/boardid.c
@@ -17,11 +17,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <console/console.h>
-#include <soc/nvidia/tegra124/gpio.h>
-#include <stdlib.h>
-
#include <boardid.h>
+#include <console/console.h>
+#include <soc/gpio.h>
+#include <stdlib.h>
uint8_t board_id(void)
{
diff --git a/src/mainboard/google/nyan_big/bootblock.c b/src/mainboard/google/nyan_big/bootblock.c
index 05bb1c9..b24862e 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 054abf6..28da053 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 c1f5f9b..046e2bd 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 05f6fae..63d9d5c 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 33ce644..ead7f47 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 c89db28..f57bf08 100644
--- a/src/mainboard/google/nyan_big/pmic.c
+++ b/src/mainboard/google/nyan_big/pmic.c
@@ -18,16 +18,16 @@
* 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 <boardid.h>
-#include "pmic.h"
#include <reset.h>
+#include "pmic.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 05cca27..de096c6 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 f2077bb..83d2eef 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 748b6dc..7904b4e 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 4bf376c..6c3bda0 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);
diff --git a/src/mainboard/google/nyan_blaze/boardid.c b/src/mainboard/google/nyan_blaze/boardid.c
index 3a22ded..335da87 100644
--- a/src/mainboard/google/nyan_blaze/boardid.c
+++ b/src/mainboard/google/nyan_blaze/boardid.c
@@ -17,11 +17,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <console/console.h>
-#include <soc/nvidia/tegra124/gpio.h>
-#include <stdlib.h>
-
#include <boardid.h>
+#include <console/console.h>
+#include <soc/gpio.h>
+#include <stdlib.h>
uint8_t board_id(void)
{
diff --git a/src/mainboard/google/nyan_blaze/bootblock.c b/src/mainboard/google/nyan_blaze/bootblock.c
index 05bb1c9..b24862e 100644
--- a/src/mainboard/google/nyan_blaze/bootblock.c
+++ b/src/mainboard/google/nyan_blaze/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_blaze/chromeos.c b/src/mainboard/google/nyan_blaze/chromeos.c
index da017ea..0b944d1 100644
--- a/src/mainboard/google/nyan_blaze/chromeos.c
+++ b/src/mainboard/google/nyan_blaze/chromeos.c
@@ -21,9 +21,9 @@
#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 <soc/nvidia/tegra124/gpio.h>
//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 c1f5f9b..020f3fd 100644
--- a/src/mainboard/google/nyan_blaze/early_configs.c
+++ b/src/mainboard/google/nyan_blaze/early_configs.c
@@ -19,9 +19,9 @@
#include <soc/addressmap.h>
#include <soc/clock.h>
+#include <soc/gpio.h>
+#include <soc/early_configs.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_blaze/mainboard.c b/src/mainboard/google/nyan_blaze/mainboard.c
index 5f1cb49..da49377 100644
--- a/src/mainboard/google/nyan_blaze/mainboard.c
+++ b/src/mainboard/google/nyan_blaze/mainboard.c
@@ -18,18 +18,18 @@
*/
#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/clock.h>
+#include <soc/clk_rst.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/nvidia/tegra/usb.h>
+#include <soc/pmc.h>
+#include <soc/spi.h>
#include <symbols.h>
#include <vendorcode/google/chromeos/chromeos.h>
diff --git a/src/mainboard/google/nyan_blaze/memlayout.ld b/src/mainboard/google/nyan_blaze/memlayout.ld
index 33ce644..ead7f47 100644
--- a/src/mainboard/google/nyan_blaze/memlayout.ld
+++ b/src/mainboard/google/nyan_blaze/memlayout.ld
@@ -1 +1 @@
-#include <soc/nvidia/tegra124/memlayout.ld>
+#include <soc/memlayout.ld>
diff --git a/src/mainboard/google/nyan_blaze/pmic.c b/src/mainboard/google/nyan_blaze/pmic.c
index c89db28..f57bf08 100644
--- a/src/mainboard/google/nyan_blaze/pmic.c
+++ b/src/mainboard/google/nyan_blaze/pmic.c
@@ -18,16 +18,16 @@
* 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 <boardid.h>
-#include "pmic.h"
#include <reset.h>
+#include "pmic.h"
+
enum {
AS3722_I2C_ADDR = 0x40
};
diff --git a/src/mainboard/google/nyan_blaze/reset.c b/src/mainboard/google/nyan_blaze/reset.c
index 05cca27..de096c6 100644
--- a/src/mainboard/google/nyan_blaze/reset.c
+++ b/src/mainboard/google/nyan_blaze/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_blaze/romstage.c b/src/mainboard/google/nyan_blaze/romstage.c
index fb1b9e2..034a929 100644
--- a/src/mainboard/google/nyan_blaze/romstage.c
+++ b/src/mainboard/google/nyan_blaze/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_blaze/sdram_configs.c b/src/mainboard/google/nyan_blaze/sdram_configs.c
index 6fb517d..94c9203 100644
--- a/src/mainboard/google/nyan_blaze/sdram_configs.c
+++ b/src/mainboard/google/nyan_blaze/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_blaze/sdram_configs.h b/src/mainboard/google/nyan_blaze/sdram_configs.h
index 26fd048..e5f9873 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 <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);