bmk_init -> bmk_cons_clear

Also, we don't need to call it in multiboot(), since we already need
to call it in early bootstrap to properly deliver the "no multiboot"
message if necessary.

diff --git a/platform/baremetal/arch/i386/locore32.S b/platform/baremetal/arch/i386/locore32.S
index 175d43699bb2ec834ace49e1eba43c537ec13c9b..165db51415c5beb70db5202d8154061f1381072e 100644 (file)
--- a/platform/baremetal/arch/i386/locore32.S
+++ b/platform/baremetal/arch/i386/locore32.S
@@ -45,7 +45,7 @@ ENTRY(_start32)
 
        pushl %ebx
        pushl %eax
-       call bmk_init
+       call bmk_cons_clear
        popl %eax
 
        /* only multiboot is supported for now */

diff --git a/platform/baremetal/arch/i386/vgacons.c b/platform/baremetal/arch/i386/vgacons.c
index 5020814a910c896fa58678e391832ae0dc55f2dd..cad0672cf4183453eb76e998f947751940d20ed8 100644 (file)
--- a/platform/baremetal/arch/i386/vgacons.c
+++ b/platform/baremetal/arch/i386/vgacons.c
@@ -76,7 +76,7 @@ bmk_cons_putc(int c)
 }
 
 void
-bmk_init(void)
+bmk_cons_clear(void)
 {
        int x;
 

diff --git a/platform/baremetal/include/bmk/kernel.h b/platform/baremetal/include/bmk/kernel.h
index 760d1de1cc7b92fe0cda5fb5f740729075094af0..211a720674ebada031ee45f797700b1fd0b4d4ed 100644 (file)
--- a/platform/baremetal/include/bmk/kernel.h
+++ b/platform/baremetal/include/bmk/kernel.h
@@ -17,8 +17,6 @@ void *bmk_allocpg(size_t);
 
 void bmk_halt(const char *) __attribute__((noreturn));
 
-void bmk_init(void);
-
 struct multiboot_info;
 void bmk_multiboot(struct multiboot_info *);
 

diff --git a/platform/baremetal/multiboot.c b/platform/baremetal/multiboot.c
index 8cb8cee1a837373c242f8dbe9a5d60fb113603e6..2eac45dbbec8083a4d0fecb160c2c5148e3f2b02 100644 (file)
--- a/platform/baremetal/multiboot.c
+++ b/platform/baremetal/multiboot.c
@@ -76,7 +76,6 @@ bmk_multiboot(struct multiboot_info *mbi)
 {
        unsigned long cmdlinelen;
 
-       bmk_init(); /* XXX: convert to cons_clear */
        bmk_printf_init(bmk_cons_putc, NULL);
        bmk_core_init(BMK_THREAD_STACK_PAGE_ORDER, PAGE_SIZE);