Author: mcayland Date: Sat Jul 27 12:15:11 2013 New Revision: 1190 URL: http://tracker.coreboot.org/trac/openbios/changeset/1190
Log: SPARC: remove cls() from the console startup
The video_cls() function is no longer needed, since the fb8-install routines now handle the video initialisation instead.
Remove the serial_cls() functions to make SPARC consistent with PPC and aid debugging.
Signed-off-by: Mark Cave-Ayland mark.cave-ayland@ilande.co.uk
Modified: trunk/openbios-devel/arch/sparc32/boot.h trunk/openbios-devel/arch/sparc32/console.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc64/console.c trunk/openbios-devel/arch/sparc64/openbios.c
Modified: trunk/openbios-devel/arch/sparc32/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.h Sat Jul 27 12:15:08 2013 (r1189) +++ trunk/openbios-devel/arch/sparc32/boot.h Sat Jul 27 12:15:11 2013 (r1190) @@ -22,9 +22,6 @@ extern unsigned int qemu_mem_size; extern void collect_sys_info(struct sys_info *info);
-// console.c -void cls(void); - // romvec.c extern struct linux_arguments_v0 obp_arg; extern const void *romvec;
Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Sat Jul 27 12:15:08 2013 (r1189) +++ trunk/openbios-devel/arch/sparc32/console.c Sat Jul 27 12:15:11 2013 (r1190) @@ -12,8 +12,6 @@ #include "libopenbios/ofmem.h" #include "libopenbios/video.h"
-void cls(void); - #ifdef CONFIG_DEBUG_CONSOLE
/* ****************************************************************** @@ -30,11 +28,6 @@ unsigned char *vmem; volatile uint32_t *dac;
-static void video_cls(void) -{ - memset((void *)vmem, 0, VMEM_SIZE); -} - void tcx_init(uint64_t base) { vmem = (unsigned char *)ofmem_map_io(base + VMEM_BASE, VMEM_SIZE); @@ -97,15 +90,4 @@ return 0; }
-void cls(void) -{ -#ifdef CONFIG_DEBUG_CONSOLE_SERIAL - serial_cls(); -#endif -#ifdef CONFIG_DEBUG_CONSOLE_VIDEO - video_cls(); -#endif -} - - #endif // CONFIG_DEBUG_CONSOLE
Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sat Jul 27 12:15:08 2013 (r1189) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sat Jul 27 12:15:11 2013 (r1190) @@ -971,8 +971,6 @@ tcx_init(hwdef->tcx_base); kbd_init(hwdef->ms_kb_base); #endif - /* Clear the screen. */ - cls(); #endif
collect_sys_info(&sys_info);
Modified: trunk/openbios-devel/arch/sparc64/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/console.c Sat Jul 27 12:15:08 2013 (r1189) +++ trunk/openbios-devel/arch/sparc64/console.c Sat Jul 27 12:15:11 2013 (r1190) @@ -58,16 +58,4 @@ return 0; }
-void cls(void) -{ -#ifdef CONFIG_DEBUG_CONSOLE_SERIAL - serial_putchar(27); - serial_putchar('['); - serial_putchar('H'); - serial_putchar(27); - serial_putchar('['); - serial_putchar('J'); -#endif -} - #endif // CONFIG_DEBUG_CONSOLE
Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sat Jul 27 12:15:08 2013 (r1189) +++ trunk/openbios-devel/arch/sparc64/openbios.c Sat Jul 27 12:15:11 2013 (r1190) @@ -619,8 +619,6 @@ #ifdef CONFIG_DEBUG_CONSOLE_SERIAL uart_init(CONFIG_SERIAL_PORT, CONFIG_SERIAL_SPEED); #endif - /* Clear the screen. */ - cls(); printk("OpenBIOS for Sparc64\n"); #endif