summaryrefslogtreecommitdiff
path: root/src/boot
diff options
context:
space:
mode:
authorEd Swierk <eswierk@arastra.com>2006-12-15 12:56:28 +0000
committerStefan Reinauer <stepan@openbios.org>2006-12-15 12:56:28 +0000
commitbe13dc72d91bd3c5791fb2a3a18ee610860404ee (patch)
tree97e8702383a84bfb0cd22f337d70885ebe7713dc /src/boot
parent8bb1dc5c776699d2037923c6594e2e998c7bec09 (diff)
Apply linuxbios-rename-other-payload-options.patch
(Patch 2, refs #14) Signed-off-by: Ed Swierk <eswierk@arastra.com> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2529 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/boot')
-rw-r--r--src/boot/Config.lb2
-rw-r--r--src/boot/hardwaremain.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/boot/Config.lb b/src/boot/Config.lb
index 9e38661824..f6b82a3610 100644
--- a/src/boot/Config.lb
+++ b/src/boot/Config.lb
@@ -1,5 +1,5 @@
object elfboot.o
object hardwaremain.o
-if CONFIG_FS_STREAM
+if CONFIG_FS_PAYLOAD
object filo.o
end
diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c
index 00bc559771..eb971246c2 100644
--- a/src/boot/hardwaremain.c
+++ b/src/boot/hardwaremain.c
@@ -88,7 +88,7 @@ void hardwaremain(int boot_complete)
*/
lb_mem = write_tables();
-#if CONFIG_FS_STREAM == 1
+#if CONFIG_FS_PAYLOAD == 1
filo(lb_mem);
#else
elfboot(lb_mem);