11 files changed, 32 insertions, 31 deletions

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 <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_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 <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 da017eaed1..0b944d1667 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 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 <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 5f1cb49ceb..da49377166 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 33ce6446ad..ead7f47838 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 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 <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_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 <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 fb1b9e2b77..034a929944 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 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 <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 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 <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);