summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Jones <marc.jones@se-eng.com>2015-03-03 15:17:15 -0700
committerMarc Jones <marc.jones@se-eng.com>2015-03-04 18:25:18 +0100
commit0e69639909ff4e1d824781b7404461b07ea29942 (patch)
treedd90214e85b1ce193a928b4ef347b1cc87ef88d1
parent1ac4e591bfcfd135ab46843fcbee0342e21a8689 (diff)
downloadcoreboot-0e69639909ff4e1d824781b7404461b07ea29942.tar.xz
t132: Replace fallback with CONFIG_CBFS_PREFIX
Use the Kconfig value to load the name of the stage instead of the hard-coded fallback stage. (cherry picked from commit de4310af6f6dbeedd7432683d1d1fe12ce48f46e) Signed-off-by: Marc Jones <marc.jones@se-eng.com> Change-Id: I1ac707efe38e29f109dbbe206de74fbfe7cb7b0b Reviewed-on: http://review.coreboot.org/8576 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Aaron Durbin <adurbin@google.com>
-rw-r--r--src/soc/nvidia/tegra132/bootblock.c3
-rw-r--r--src/soc/nvidia/tegra132/romstage.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/soc/nvidia/tegra132/bootblock.c b/src/soc/nvidia/tegra132/bootblock.c
index 62e5228829..ad78f51f16 100644
--- a/src/soc/nvidia/tegra132/bootblock.c
+++ b/src/soc/nvidia/tegra132/bootblock.c
@@ -68,7 +68,8 @@ void main(void)
printk(BIOS_INFO, "T132 bootblock: Mainboard bootblock init done\n");
- entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, "fallback/romstage");
+ entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA,
+ CONFIG_CBFS_PREFIX "/romstage");
if (entry) {
printk(BIOS_INFO, "T132 bootblock: jumping to romstage\n");
diff --git a/src/soc/nvidia/tegra132/romstage.c b/src/soc/nvidia/tegra132/romstage.c
index a4a0636cab..20429a5e53 100644
--- a/src/soc/nvidia/tegra132/romstage.c
+++ b/src/soc/nvidia/tegra132/romstage.c
@@ -40,6 +40,7 @@ void main(void)
while (1);
- entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, "fallback/ramstage");
+ entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA,
+ CONFIG_CBFS_PREFIX "/ramstage");
stage_exit(entry);
}