Changeset 71eef11 in mainline for kernel/generic/src/main/main.c

Timestamp:

2008-02-06T14:24:13Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7208b6c

Parents:

1b067315

Message:

remove config.memory_size, get_memory_size() and memory_init.{c|d}
the amount of available memory can be calculated from the sizes of the zones
add FRAMES2SIZE, SIZE2KB and SIZE2MB functions/macros (code readability)

File:

• kernel/generic/src/main/main.c (modified) (3 diffs)

kernel/generic/src/main/main.c

@@ -64 +64 @@
 #include <align.h>
 #include <interrupt.h>
-#include <arch/mm/memory_init.h>
 #include <mm/frame.h>
 #include <mm/page.h>
@@ -144 +143 @@
         
         config.base = hardcoded_load_address;
-        config.memory_size = get_memory_size();
-        
         config.kernel_size = ALIGN_UP(hardcoded_ktext_size +
             hardcoded_kdata_size, PAGE_SIZE);
@@ -220 +217 @@
         ddi_init();
         arch_post_mm_init();
-
+        
         version_print();
-        printf("kernel: %.*p hardcoded_ktext_size=%zdK, "
-            "hardcoded_kdata_size=%zdK\n", sizeof(uintptr_t) * 2,
-            config.base, hardcoded_ktext_size >> 10,
-            hardcoded_kdata_size >> 10);
-        printf("stack:  %.*p size=%zdK\n", sizeof(uintptr_t) * 2,
-            config.stack_base, config.stack_size >> 10);
-
+        printf("kernel: %.*p hardcoded_ktext_size=%zd KB, "
+            "hardcoded_kdata_size=%zd KB\n", sizeof(uintptr_t) * 2,
+                config.base, SIZE2KB(hardcoded_ktext_size),
+                SIZE2KB(hardcoded_kdata_size));
+        printf("stack:  %.*p size=%zd KB\n", sizeof(uintptr_t) * 2,
+            config.stack_base, SIZE2KB(config.stack_size));
+        
         arch_pre_smp_init();
         smp_init();
         /* Slab must be initialized after we know the number of processors. */
         slab_enable_cpucache();
-
-        printf("config.memory_size=%zdM\n", config.memory_size >> 20);
-        printf("config.cpu_count=%zd\n", config.cpu_count);
+        
+        printf("Detected %zu CPU(s), %llu MB free memory\n",
+                config.cpu_count, SIZE2MB(zone_total_size()));
         cpu_init();