r3681 - in trunk/payloads/libpayload: . drivers/video sample

Author: jcrouse
Date: 2008-10-21 23:49:48 +0200 (Tue, 21 Oct 2008)
New Revision: 3681

Modified:
   trunk/payloads/libpayload/Makefile
   trunk/payloads/libpayload/drivers/video/video.c
   trunk/payloads/libpayload/sample/hello.c
Log:
[PATCH] fix video console init

Move console_add_output-driver() inside the for() loop

Signed-off-by: Jordan Crouse 
Acked-by: Jordan Crouse

Modified: trunk/payloads/libpayload/Makefile
===================================================================
--- trunk/payloads/libpayload/Makefile	2008-10-21 16:27:38 UTC (rev 3680)
+++ trunk/payloads/libpayload/Makefile	2008-10-21 21:49:48 UTC (rev 3681)
@@ -115,6 +115,8 @@
    $(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 @@
    $(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

Modified: trunk/payloads/libpayload/drivers/video/video.c
===================================================================
--- trunk/payloads/libpayload/drivers/video/video.c	2008-10-21 16:27:38 UTC (rev 3680)
+++ trunk/payloads/libpayload/drivers/video/video.c	2008-10-21 21:49:48 UTC (rev 3681)
@@ -193,11 +193,10 @@
    		}

video_console_fixup_cursor();
+			console_add_output_driver(&cons);
    		return 0;
    	}

-		console_add_output_driver(&cons);
-
    	return 0;
 }

Modified: trunk/payloads/libpayload/sample/hello.c
===================================================================
--- trunk/payloads/libpayload/sample/hello.c	2008-10-21 16:27:38 UTC (rev 3680)
+++ trunk/payloads/libpayload/sample/hello.c	2008-10-21 21:49:48 UTC (rev 3681)
@@ -34,5 +34,6 @@
 int main(void)
 {
    printf("Hello world!\n");
+	halt();
    return 0;
 }