summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/google/rush/Makefile.inc3
-rw-r--r--src/mainboard/google/rush/sdram_configs.c3
-rw-r--r--src/soc/nvidia/tegra132/Makefile.inc1
-rw-r--r--src/soc/nvidia/tegra132/include/soc/sdram_configs.h (renamed from src/mainboard/google/rush/sdram_configs.h)8
-rw-r--r--src/soc/nvidia/tegra132/romstage.c (renamed from src/mainboard/google/rush/romstage.c)6
5 files changed, 10 insertions, 11 deletions
diff --git a/src/mainboard/google/rush/Makefile.inc b/src/mainboard/google/rush/Makefile.inc
index 746af11392..6f4a7748ed 100644
--- a/src/mainboard/google/rush/Makefile.inc
+++ b/src/mainboard/google/rush/Makefile.inc
@@ -32,8 +32,7 @@ bootblock-y += bootblock.c
bootblock-y += pmic.c
bootblock-y += reset.c
-romstage-y += romstage.c
romstage-y += reset.c
romstage-y += sdram_configs.c
-ramstage-y += mainboard.c \ No newline at end of file
+ramstage-y += mainboard.c
diff --git a/src/mainboard/google/rush/sdram_configs.c b/src/mainboard/google/rush/sdram_configs.c
index 18386ac53e..ea62499205 100644
--- a/src/mainboard/google/rush/sdram_configs.c
+++ b/src/mainboard/google/rush/sdram_configs.c
@@ -18,8 +18,7 @@
*/
#include <console/console.h>
-#include <soc/nvidia/tegra132/sdram.h>
-#include "sdram_configs.h"
+#include <soc/sdram_configs.h>
static struct sdram_params sdram_configs[] = {
#include "bct/sdram-hynix-2GB-924.inc" /* ram_code = 0000 */
diff --git a/src/soc/nvidia/tegra132/Makefile.inc b/src/soc/nvidia/tegra132/Makefile.inc
index 855ef24832..a98467431b 100644
--- a/src/soc/nvidia/tegra132/Makefile.inc
+++ b/src/soc/nvidia/tegra132/Makefile.inc
@@ -24,6 +24,7 @@ romstage-y += spi.c
romstage-y += i2c.c
romstage-y += dma.c
romstage-y += monotonic_timer.c
+romstage-y += romstage.c
romstage-y += sdram.c
romstage-y += sdram_lp0.c
romstage-y += ../tegra/gpio.c
diff --git a/src/mainboard/google/rush/sdram_configs.h b/src/soc/nvidia/tegra132/include/soc/sdram_configs.h
index e00e9ca04c..300be1093c 100644
--- a/src/mainboard/google/rush/sdram_configs.h
+++ b/src/soc/nvidia/tegra132/include/soc/sdram_configs.h
@@ -17,12 +17,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef __MAINBOARD_GOOGLE_RUSH_SDRAM_CONFIG_H__
-#define __MAINBOARD_GOOGLE_RUSH_SDRAM_CONFIG_H__
+#ifndef __SOC_NVIDIA_TEGRA132_SDRAM_CONFIGS_H__
+#define __SOC_NVIDIA_TEGRA132_SDRAM_CONFIGS_H__
-#include <soc/nvidia/tegra132/sdram_param.h>
+#include <soc/nvidia/tegra132/sdram.h>
/* Loads SDRAM configurations for current system. */
const struct sdram_params *get_sdram_config(void);
-#endif /* __MAINBOARD_GOOGLE_RUSH_SDRAM_CONFIG_H__ */
+#endif /* __SOC_NVIDIA_TEGRA132_SDRAM_CONFIGS_H__ */
diff --git a/src/mainboard/google/rush/romstage.c b/src/soc/nvidia/tegra132/romstage.c
index 9db52989f7..a4a0636cab 100644
--- a/src/mainboard/google/rush/romstage.c
+++ b/src/soc/nvidia/tegra132/romstage.c
@@ -22,7 +22,7 @@
#include <console/console.h>
#include <arch/exception.h>
-#include "sdram_configs.h"
+#include <soc/sdram_configs.h>
#include <soc/nvidia/tegra132/sdram.h>
void main(void)
@@ -40,6 +40,6 @@ void main(void)
while (1);
- entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, "fallback/ramstage");
- stage_exit(entry);
+ entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, "fallback/ramstage");
+ stage_exit(entry);
}