[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

diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile
index 57f6bd8bcd159213635c3a936e766705830d054d..6d169ccc929466205e5be18c192e86813bf655af 100644 (file)
--- 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 83c393b4db10b00ccf0cec13073b1dfd21732c85..a9c070d527c285ec4ac79f8cc49e63e8ce02f6e1 100644 (file)
--- 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 ffd9dc909b8b49b3722b7bb3621f11352ed79647..8112501474049880df0c8602f3d84c8461eaa928 100644 (file)
--- 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;
 }