Changeset 3681 for trunk/payloads

Show
Ignore:
Timestamp:
10/21/08 23:49:48 (3 months ago)
Author:
jcrouse
Message:

[PATCH] fix video console init

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

Signed-off-by: Jordan Crouse <jordan.crouse@…>
Acked-by: Jordan Crouse <jordan.crouse@…>

Location:
trunk/payloads/libpayload
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/payloads/libpayload/Makefile

    r3673 r3681  
    116116        $(Q)$(AR) rc $@ $(OBJS) 
    117117 
     118include util/kconfig/Makefile 
     119 
    118120$(obj)/%.o: $(src)/%.c 
    119121        $(Q)printf "  CC      $(subst $(shell pwd)/,,$(@))\n" 
    … …  
    165167        $(Q)rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig* 
    166168 
    167 include util/kconfig/Makefile 
    168169 
    169170.PHONY: $(PHONY) prepare clean distclean doxygen doxy 

  • trunk/payloads/libpayload/drivers/video/video.c

    r3679 r3681  
    194194 
    195195                        video_console_fixup_cursor(); 
     196                        console_add_output_driver(&cons); 
    196197                        return 0; 
    197198                } 
    198199 
    199                 console_add_output_driver(&cons); 
    200  
    201200                return 0; 
    202201} 

  • trunk/payloads/libpayload/sample/hello.c

    r3316 r3681  
    3535{ 
    3636        printf("Hello world!\n"); 
     37        halt(); 
    3738        return 0; 
    3839}