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 --- openbios-devel/arch/sparc32/boot.h | 3 --- openbios-devel/arch/sparc32/console.c | 18 ------------------ openbios-devel/arch/sparc32/openbios.c | 2 -- openbios-devel/arch/sparc64/console.c | 12 ------------ openbios-devel/arch/sparc64/openbios.c | 2 -- 5 files changed, 37 deletions(-)
diff --git a/openbios-devel/arch/sparc32/boot.h b/openbios-devel/arch/sparc32/boot.h index fa701e5..55e391a 100644 --- a/openbios-devel/arch/sparc32/boot.h +++ b/openbios-devel/arch/sparc32/boot.h @@ -22,9 +22,6 @@ extern void go(void); 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; diff --git a/openbios-devel/arch/sparc32/console.c b/openbios-devel/arch/sparc32/console.c index 55a0ee7..91587fc 100644 --- a/openbios-devel/arch/sparc32/console.c +++ b/openbios-devel/arch/sparc32/console.c @@ -12,8 +12,6 @@ #include "libopenbios/ofmem.h" #include "libopenbios/video.h"
-void cls(void); - #ifdef CONFIG_DEBUG_CONSOLE
/* ****************************************************************** @@ -30,11 +28,6 @@ void cls(void); 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 @@ int getchar(void) 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 diff --git a/openbios-devel/arch/sparc32/openbios.c b/openbios-devel/arch/sparc32/openbios.c index 0437b9c..40948d1 100644 --- a/openbios-devel/arch/sparc32/openbios.c +++ b/openbios-devel/arch/sparc32/openbios.c @@ -971,8 +971,6 @@ int openbios(void) tcx_init(hwdef->tcx_base); kbd_init(hwdef->ms_kb_base); #endif - /* Clear the screen. */ - cls(); #endif
collect_sys_info(&sys_info); diff --git a/openbios-devel/arch/sparc64/console.c b/openbios-devel/arch/sparc64/console.c index b4b4b76..ec7571c 100644 --- a/openbios-devel/arch/sparc64/console.c +++ b/openbios-devel/arch/sparc64/console.c @@ -58,16 +58,4 @@ int getchar(void) 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 diff --git a/openbios-devel/arch/sparc64/openbios.c b/openbios-devel/arch/sparc64/openbios.c index 6b2b041..b1e5f47 100644 --- a/openbios-devel/arch/sparc64/openbios.c +++ b/openbios-devel/arch/sparc64/openbios.c @@ -619,8 +619,6 @@ int openbios(void) #ifdef CONFIG_DEBUG_CONSOLE_SERIAL uart_init(CONFIG_SERIAL_PORT, CONFIG_SERIAL_SPEED); #endif - /* Clear the screen. */ - cls(); printk("OpenBIOS for Sparc64\n"); #endif