Changeset 5f1fffb in mainline

Timestamp:

2010-06-13T22:53:22Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

96e7a94

Parents:

510bc07 (diff), 0a925a8 (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 progress from the ia64 revival branch.

As of now, the ia64 support is partially back. The system boots under Ski
and Simics. On Simics, however, it will take a long time before some HelenOS
output is displayed because the ia64's loader cannot print to EGA yet and
inflating all components takes time.

The real machines are not expected to run now as that support has not been
revived yet.

HelenOS/ia64 on both Ski and Simics shows some apparently unrelated issues that
will have to be resolved later. It appears the userspace fb driver has some
configuration problems under Ski and the system seems to hang under Simics after
getterm prints its message.

Files:

• boot/arch/ia64/Makefile.inc (added)
• boot/arch/ia64/_link.ld.in (added)
• boot/arch/ia64/include/arch.h (added)
• boot/arch/ia64/include/asm.h (added)
• boot/arch/ia64/include/main.h (added)
• boot/arch/ia64/include/ski.h (added)
• boot/arch/ia64/include/types.h (added)
• boot/arch/ia64/src/asm.S (added)
• boot/arch/ia64/src/boot.S (added)
• boot/arch/ia64/src/main.c (added)
• boot/arch/ia64/src/putchar.c (added)
• boot/arch/ia64/src/ski.c (added)
• kernel/arch/ia64/_link.ld.in (modified) (1 diff)
• kernel/arch/ia64/include/bootinfo.h (modified) (3 diffs)

kernel/arch/ia64/_link.ld.in

@@ -7 +7 @@
  */
 
-#define LOAD_ADDRESS_V  0xe000000004404000
-#define LOAD_ADDRESS_P  0x0000000004404000
+#define LOAD_ADDRESS_V  0xe000000004800000
+#define LOAD_ADDRESS_P  0x0000000004800000
 
 ENTRY(kernel_image_start)

kernel/arch/ia64/include/bootinfo.h

@@ -30 +30 @@
 #define KERN_ia64_BOOTINFO_H_
 
-#define BOOTINFO_ADDRESS 0x4401000
-
 #define TASKMAP_MAX_RECORDS  32
 
@@ -37 +35 @@
 
 #define EFI_MEMMAP_FREE_MEM 0
-#define EFI_MEMMAP_IO 1
-#define EFI_MEMMAP_IO_PORTS 2
 
 /** Size of buffer for storing task name in binit_task_t. */
@@ -75 +71 @@
 extern bootinfo_t *bootinfo;
 
-extern void start(void);
-extern void bootstrap(void);
-
 #endif