Changeset 5f1fffb in mainline


Ignore:
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:
12 added
2 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/ia64/_link.ld.in

    r510bc07 r5f1fffb  
    77 */
    88
    9 #define LOAD_ADDRESS_V  0xe000000004404000
    10 #define LOAD_ADDRESS_P  0x0000000004404000
     9#define LOAD_ADDRESS_V  0xe000000004800000
     10#define LOAD_ADDRESS_P  0x0000000004800000
    1111
    1212ENTRY(kernel_image_start)
  • kernel/arch/ia64/include/bootinfo.h

    r510bc07 r5f1fffb  
    3030#define KERN_ia64_BOOTINFO_H_
    3131
    32 #define BOOTINFO_ADDRESS 0x4401000
    33 
    3432#define TASKMAP_MAX_RECORDS  32
    3533
     
    3735
    3836#define EFI_MEMMAP_FREE_MEM 0
    39 #define EFI_MEMMAP_IO 1
    40 #define EFI_MEMMAP_IO_PORTS 2
    4137
    4238/** Size of buffer for storing task name in binit_task_t. */
     
    7571extern bootinfo_t *bootinfo;
    7672
    77 extern void start(void);
    78 extern void bootstrap(void);
    79 
    8073#endif
Note: See TracChangeset for help on using the changeset viewer.