Changeset 25a76ab8 in mainline for kernel/arch/arm32

Timestamp:

2010-05-08T07:53:23Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

051bc69a

Parents:

6c39a907 (diff), 1317380 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

kernel/arch/arm32

Files:

• _link.ld.in (modified) (1 diff)
• include/arch.h (modified) (1 diff)
• include/mm/frame.h (modified) (1 diff)
• src/arm32.c (modified) (1 diff)

kernel/arch/arm32/_link.ld.in

@@ -7 +7 @@
  */
 
-#define KERNEL_LOAD_ADDRESS 0x80800000
+#define KERNEL_LOAD_ADDRESS 0x80a00000
 
 OUTPUT_ARCH(arm)

kernel/arch/arm32/include/arch.h

@@ -45 +45 @@
 
 typedef struct {
-        uintptr_t addr;
-        uint32_t size;
+        void *addr;
+        size_t size;
         char name[BOOTINFO_TASK_NAME_BUFLEN];
 } utask_t;
 
 typedef struct {
-        uint32_t cnt;
+        size_t cnt;
         utask_t tasks[TASKMAP_MAX_RECORDS];
 } bootinfo_t;

kernel/arch/arm32/include/mm/frame.h

@@ -46 +46 @@
 
 #define BOOT_PAGE_TABLE_SIZE     0x4000
-#define BOOT_PAGE_TABLE_ADDRESS  0x4000
+#define BOOT_PAGE_TABLE_ADDRESS  0x8000
 
 #define BOOT_PAGE_TABLE_START_FRAME     (BOOT_PAGE_TABLE_ADDRESS >> FRAME_WIDTH)

kernel/arch/arm32/src/arm32.c

@@ -62 +62 @@
 void arch_pre_main(void *entry __attribute__((unused)), bootinfo_t *bootinfo)
 {
-        unsigned int i;
+        init.cnt = min3(bootinfo->cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS);
         
-        init.cnt = bootinfo->cnt;
-        
-        for (i = 0; i < min3(bootinfo->cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS); ++i) {
-                init.tasks[i].addr = bootinfo->tasks[i].addr;
+        size_t i;
+        for (i = 0; i < init.cnt; i++) {
+                init.tasks[i].addr = (uintptr_t) bootinfo->tasks[i].addr;
                 init.tasks[i].size = bootinfo->tasks[i].size;
                 str_cpy(init.tasks[i].name, CONFIG_TASK_NAME_BUFLEN,