summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Crouse <jordan.crouse@amd.com>2008-10-21 21:49:48 +0000
committerJordan Crouse <jordan.crouse@amd.com>2008-10-21 21:49:48 +0000
commit6ec8285aa151a246a05805ee7165c3c1ddb43958 (patch)
treedbe108b258d4d4f6cc464bd345dca32a7c364ca7
parent039255c59c11863e00a64c47c487fe59c5c12097 (diff)
downloadcoreboot-6ec8285aa151a246a05805ee7165c3c1ddb43958.tar.xz
[PATCH] fix video console init
Move console_add_output-driver() inside the for() loop Signed-off-by: Jordan Crouse <jordan.crouse@amd.com> Acked-by: Jordan Crouse <jordan.crouse@amd.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3681 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--payloads/libpayload/Makefile3
-rw-r--r--payloads/libpayload/drivers/video/video.c3
-rw-r--r--payloads/libpayload/sample/hello.c1
3 files changed, 4 insertions, 3 deletions
diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile
index 57f6bd8bcd..6d169ccc92 100644
--- a/payloads/libpayload/Makefile
+++ b/payloads/libpayload/Makefile
@@ -115,6 +115,8 @@ $(obj)/lib/libpayload.a: $(OBJS)
$(Q)printf " AR $(subst $(shell pwd)/,,$(@))\n"
$(Q)$(AR) rc $@ $(OBJS)
+include util/kconfig/Makefile
+
$(obj)/%.o: $(src)/%.c
$(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n"
$(Q)$(CC) -m32 $(CFLAGS) -c -o $@ $<
@@ -164,7 +166,6 @@ distclean: clean
$(Q)rm -rf build
$(Q)rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig*
-include util/kconfig/Makefile
.PHONY: $(PHONY) prepare clean distclean doxygen doxy
diff --git a/payloads/libpayload/drivers/video/video.c b/payloads/libpayload/drivers/video/video.c
index 83c393b4db..a9c070d527 100644
--- a/payloads/libpayload/drivers/video/video.c
+++ b/payloads/libpayload/drivers/video/video.c
@@ -193,11 +193,10 @@ int video_console_init(void)
}
video_console_fixup_cursor();
+ console_add_output_driver(&cons);
return 0;
}
- console_add_output_driver(&cons);
-
return 0;
}
diff --git a/payloads/libpayload/sample/hello.c b/payloads/libpayload/sample/hello.c
index ffd9dc909b..8112501474 100644
--- a/payloads/libpayload/sample/hello.c
+++ b/payloads/libpayload/sample/hello.c
@@ -34,5 +34,6 @@
int main(void)
{
printf("Hello world!\n");
+ halt();
return 0;
}