Changeset f8d069e8 in mainline for arch

Timestamp:

2006-06-02T00:54:56Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

01ebbdf

Parents:

8da51ad

Message:

Remove three infinite loops introduced yesterday

Make ia64 ready to load 5 ELF images.

Location:

arch/ia64

Files:

• Makefile.inc (modified) (1 diff)
• src/ia64.c (modified) (1 diff)

arch/ia64/Makefile.inc

@@ -42 +42 @@
 INIT0_SIZE = 0x100000
 
-INIT1_ADDRESS = 0xe000000000800000
-INIT1_SIZE = 0x100000
-
 CFLAGS += -mconstant-gp -fno-unwind-tables -mfixed-range=f32-f127
 LFLAGS += -EL
 AFLAGS += -mconstant-gp
 
-DEFS += -D__64_BITS__ -DINIT0_ADDRESS=$(INIT0_ADDRESS) -DINIT0_SIZE=$(INIT0_SIZE) \
-        -DINIT1_ADDRESS=$(INIT1_ADDRESS) -DINIT1_SIZE=$(INIT1_SIZE)
+DEFS += -D__64_BITS__ -DINIT0_ADDRESS=$(INIT0_ADDRESS) -DINIT0_SIZE=$(INIT0_SIZE)
 
 ## Compile with page hash table support.

arch/ia64/src/ia64.c

@@ -48 +48 @@
 {
         /* Setup usermode init tasks. */
-        init.cnt = 2;
+        init.cnt = 5;
         init.tasks[0].addr = INIT0_ADDRESS;
         init.tasks[0].size = INIT0_SIZE;
-        init.tasks[1].addr = INIT1_ADDRESS;
-        init.tasks[1].size = INIT1_SIZE;
+        init.tasks[1].addr = INIT0_ADDRESS + 0x400000;
+        init.tasks[1].size = INIT0_SIZE;
+        init.tasks[2].addr = INIT0_ADDRESS + 0x800000;
+        init.tasks[2].size = INIT0_SIZE;
+        init.tasks[3].addr = INIT0_ADDRESS + 0xc00000;
+        init.tasks[3].size = INIT0_SIZE;
+        init.tasks[4].addr = INIT0_ADDRESS + 0x1000000;
+        init.tasks[4].size = INIT0_SIZE;
 }