fusee: cleanup and optimize boot sequence

fusee/fusee-primary/src/main.c

@@ -84,12 +84,9 @@ static int config_ini_handler(void *user, const char *section, const char *name,
     return 1;
 }
 
-static void setup_env(void) {
+static void setup_display(void) {
     g_framebuffer = (void *)0xC0000000;
-
-    /* Initialize hardware. */
-    nx_hwinit();
-
+    
     /* Zero-fill the framebuffer and register it as printk provider. */
     video_init(g_framebuffer);
 
@@ -102,6 +99,19 @@ static void setup_env(void) {
     /* Turn on the backlight after initializing the lfb */
     /* to avoid flickering. */
     display_backlight(true);
+}
+
+static void cleanup_display(void) {
+    /* Turn off the backlight. */
+    display_backlight(false);
+    
+    /* Terminate the display. */
+    display_end();
+}
+
+static void setup_env(void) {
+    /* Initialize hardware. */
+    nx_hwinit();
 
     /* Set up the exception handlers. */
     setup_exception_handlers();
@@ -113,9 +123,6 @@ static void setup_env(void) {
 static void cleanup_env(void) {
     /* Unmount the SD card. */
     unmount_sd();
-
-    display_backlight(false);
-    display_end();
 }
 
 static void exit_callback(int rc) {
@@ -128,12 +135,9 @@ int main(void) {
     const char *stage2_path;
     stage2_args_t *stage2_args;
     uint32_t stage2_version = 0;
-    ScreenLogLevel log_level = SCREEN_LOG_LEVEL_MANDATORY;
-    
-    /* Override the global logging level. */
-    log_set_log_level(log_level);
-    
-    /* Initialize the display, console, etc. */
+    ScreenLogLevel log_level = SCREEN_LOG_LEVEL_NONE;
+        
+    /* Initialize the boot environment. */
     setup_env();
 
     /* Check for panics. */
@@ -147,8 +151,16 @@ int main(void) {
         fatal_error("Failed to parse BCT.ini!\n");
     }
     
+    /* Override the global logging level. */
+    log_set_log_level(log_level);
+    
+    if (log_level != SCREEN_LOG_LEVEL_NONE) {
+        /* Initialize the display for debugging. */
+        setup_display();
+    }
+    
     /* Say hello. */
-    print(SCREEN_LOG_LEVEL_MANDATORY, "Welcome to Atmosph\xe8re Fus\xe9" "e!\n");
+    print(SCREEN_LOG_LEVEL_DEBUG | SCREEN_LOG_LEVEL_NO_PREFIX, "Welcome to Atmosph\xe8re Fus\xe9" "e!\n");
     print(SCREEN_LOG_LEVEL_DEBUG, "Using color linear framebuffer at 0x%p!\n", g_framebuffer);
     
     /* Load the loader payload into DRAM. */
@@ -160,15 +172,19 @@ int main(void) {
     stage2_args = (stage2_args_t *)(g_chainloader_arg_data + strlen(stage2_path) + 1); /* May be unaligned. */
     memcpy(&stage2_args->version, &stage2_version, 4);
     memcpy(&stage2_args->log_level, &log_level, sizeof(log_level));
-    stage2_args->display_initialized = false;
     strcpy(stage2_args->bct0, bct0);
     g_chainloader_argc = 2;
     
-    /* Wait a while. */
-    mdelay(1000);
-    
-    /* Deinitialize the display, console, etc. */
+    /* Terminate the boot environment. */
     cleanup_env();
+    
+    if (log_level != SCREEN_LOG_LEVEL_NONE) {
+        /* Wait a while for debugging. */
+        mdelay(1000);
+        
+        /* Terminate the display for debugging. */
+        cleanup_display();
+    }
 
     /* Finally, after the cleanup routines (__libc_fini_array, etc.) are called, jump to Stage2. */
     __program_exit_callback = exit_callback;