summaryrefslogtreecommitdiff
path: root/src/boot
diff options
context:
space:
mode:
authorPatrick Georgi <patrick.georgi@coresystems.de>2010-02-09 19:35:16 +0000
committerPatrick Georgi <patrick.georgi@coresystems.de>2010-02-09 19:35:16 +0000
commit4b8a24193512c8889c532e56df7e706c79dec447 (patch)
tree590433bd432d309846be622787fe79f18aa3b881 /src/boot
parentf64b42ed7a0ec95e275b78e6a6c453aa523d9ee0 (diff)
Allow building images with different prefixes (ie. normal/romstage,
helloWorld/romstage, ...). It defaults to fallback/, so there's no user visible change now. Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de> Acked-by: Peter Stuge <peter@stuge.se> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5102 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/boot')
-rw-r--r--src/boot/hardwaremain.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c
index f56069effd..071e056892 100644
--- a/src/boot/hardwaremain.c
+++ b/src/boot/hardwaremain.c
@@ -103,11 +103,7 @@ void hardwaremain(int boot_complete)
* write our configuration tables.
*/
lb_mem = write_tables();
-#if CONFIG_USE_FALLBACK_IMAGE == 1
- cbfs_load_payload(lb_mem, "fallback/payload");
-#else
- cbfs_load_payload(lb_mem, "normal/payload");
-#endif
+ cbfs_load_payload(lb_mem, CONFIG_CBFS_PREFIX "/payload");
printk(BIOS_ERR, "Boot failed.\n");
}