Changeset f6f22cdb in mainline for boot/arch/sparc32/src/main.c

Timestamp:

2013-12-27T18:45:56Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

32e8cd1

Parents:

e47ed05

Message:

code revision
coding style changes

File:

• boot/arch/sparc32/src/main.c (modified) (6 diffs)

boot/arch/sparc32/src/main.c

@@ -52 +52 @@
 
 #define TOP2ADDR(top)  (((void *) PA2KA(BOOT_OFFSET)) + (top))
+
 static bootinfo_t bootinfo;
 
@@ -58 +59 @@
         /* Initialize AMBA P&P device list */
         ambapp_scan();
-
-        /* Look up for UART */
+        
+        /* Look for UART */
         amba_device_t *uart = ambapp_lookup_first(GAISLER, GAISLER_APBUART);
         amba_uart_base = uart->bars[0].start;
         bootinfo.uart_base = amba_uart_base;
         bootinfo.uart_irq = uart->irq;
-
-        /* Look up for IRQMP */
+        
+        /* Look for IRQMP */
         amba_device_t *irqmp = ambapp_lookup_first(GAISLER, GAISLER_IRQMP);
         bootinfo.intc_base = irqmp->bars[0].start;
-
-        /* Look up for timer */
+        
+        /* Look for timer */
         amba_device_t *timer = ambapp_lookup_first(GAISLER, GAISLER_GPTIMER);
         bootinfo.timer_base = timer->bars[0].start;
         bootinfo.timer_irq = timer->irq;
         
-        /* Lookp up for memory controller and obtain memory size */
-        if (ambapp_fake()) {
-                bootinfo.memsize = 64 * 1024 * 1024; // 64MB
-        } else {
+        /* Look for memory controller and obtain memory size */
+        if (!ambapp_fake()) {
                 amba_device_t *mctrl = ambapp_lookup_first(ESA, ESA_MCTRL);
-                volatile mctrl_mcfg2_t *mcfg2 = (volatile mctrl_mcfg2_t *)(mctrl->bars[0].start + 0x4);
+                volatile mctrl_mcfg2_t *mcfg2 = (volatile mctrl_mcfg2_t *)
+                    (mctrl->bars[0].start + 0x4);
                 bootinfo.memsize = (1 << (13 + mcfg2->bank_size));
-        }
+        } else
+                bootinfo.memsize = 64 * 1024 * 1024;
         
         /* Standard output is now initialized */
         version_print();
-
+        
         for (size_t i = 0; i < COMPONENTS; i++) {
                 printf(" %p|%p: %s image (%u/%u bytes)\n", components[i].start,
@@ -91 +92 @@
                     components[i].size);
         }
-
+        
         ambapp_print_devices();
-
-        printf("Memory size: %dMB\n", bootinfo.memsize >> 20);
-
+        
+        printf("Memory size: %u MB\n", bootinfo.memsize >> 20);
+        
         mmu_init();
-
+        
         void *dest[COMPONENTS];
         size_t top = 0;
@@ -116 +117 @@
                 
                 dest[i] = TOP2ADDR(top);
-
+                
                 top += components[i].inflated;
                 cnt++;
@@ -128 +129 @@
                         printf("\n%s: Image too large to fit (%p >= %p), halting.\n",
                             components[i].name, tail, dest[i - 1]);
-                        for (;;);
+                        halt();
                 }
                 
@@ -137 +138 @@
                 if (err != EOK) {
                         printf("\n%s: Inflating error %d\n", components[i - 1].name, err);
-                        for (;;);
+                        halt();
                 }
         }
-
+        
         printf("Booting the kernel ... \n");
         jump_to_kernel((void *) PA2KA(BOOT_OFFSET), &bootinfo);