Changeset 96e0748d in mainline for kernel/arch/ppc32

Timestamp:

2009-02-17T22:47:27Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

f89979b

Parents:

e662a5f

Message:

make arch_pre_main optional, don't force any specific prototype
simplify boot process
mips32: detect number of configured CPUs in msim

Location:

kernel/arch/ppc32

Files:

• include/arch.h (modified) (2 diffs)
• include/boot/boot.h (modified) (2 diffs)
• src/boot/boot.S (modified) (2 diffs)
• src/ppc32.c (modified) (2 diffs)

kernel/arch/ppc32/include/arch.h

@@ -27 +27 @@
  */
 
-/** @addtogroup ppc32   
+/** @addtogroup ppc32
  * @{
  */
@@ -36 +36 @@
 #define KERN_ppc32_ARCH_H_
 
-#include <arch/drivers/cuda.h>
+extern void arch_pre_main(void);
 
 #endif

kernel/arch/ppc32/include/boot/boot.h

@@ -27 +27 @@
  */
 
-/** @addtogroup ppc32   
+/** @addtogroup ppc32
  * @{
  */
@@ -36 +36 @@
 #define KERN_ppc32_BOOT_H_
 
-#define BOOT_OFFSET             0x8000
+#define BOOT_OFFSET  0x8000
 
 /* Temporary stack size for boot process */
-#define TEMP_STACK_SIZE 0x1000
+#define TEMP_STACK_SIZE  0x1000
 
-#define TASKMAP_MAX_RECORDS 32
-#define MEMMAP_MAX_RECORDS 32
+#define TASKMAP_MAX_RECORDS  32
+#define MEMMAP_MAX_RECORDS   32
 
 #ifndef __ASM__

kernel/arch/ppc32/src/boot/boot.S

@@ -34 +34 @@
 .global kernel_image_start
 kernel_image_start:
-
+        
         # load temporal kernel stack
         
@@ -53 +53 @@
         
         addis r3, r3, 0x8000
-
+        
         lis r31, bootinfo@ha
         addi r31, r31, bootinfo@l  # r31 = bootinfo

kernel/arch/ppc32/src/ppc32.c

@@ -46 +46 @@
 #include <ddi/irq.h>
 #include <arch/drivers/pic.h>
+#include <macros.h>
 
-#define IRQ_COUNT       64
+#define IRQ_COUNT  64
 
 bootinfo_t bootinfo;
@@ -53 +54 @@
 void arch_pre_main(void)
 {
-        /* Setup usermode */
         init.cnt = bootinfo.taskmap.count;
         
         uint32_t i;
         
-        for (i = 0; i < bootinfo.taskmap.count; i++) {
+        for (i = 0; i < min3(bootinfo.taskmap.count, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS); i++) {
                 init.tasks[i].addr = PA2KA(bootinfo.taskmap.tasks[i].addr);
                 init.tasks[i].size = bootinfo.taskmap.tasks[i].size;