head	1.6;
access;
symbols
	RELENG_8_4:1.6.0.2
	RELENG_9_1_0_RELEASE:1.5.2.1.4.2
	RELENG_9_1:1.5.2.1.0.4
	RELENG_9_1_BP:1.5.2.1
	RELENG_8_3_0_RELEASE:1.4.10.1.8.1
	RELENG_8_3:1.4.10.1.0.8
	RELENG_8_3_BP:1.4.10.1
	RELENG_9_0_0_RELEASE:1.5.2.1.2.1
	RELENG_9_0:1.5.2.1.0.2
	RELENG_9_0_BP:1.5.2.1
	RELENG_9:1.5.0.2
	RELENG_9_BP:1.5
	RELENG_7_4_0_RELEASE:1.4.14.1
	RELENG_8_2_0_RELEASE:1.4.10.1.6.1
	RELENG_7_4:1.4.0.14
	RELENG_7_4_BP:1.4
	RELENG_8_2:1.4.10.1.0.6
	RELENG_8_2_BP:1.4.10.1
	RELENG_8_1_0_RELEASE:1.4.10.1.4.1
	RELENG_8_1:1.4.10.1.0.4
	RELENG_8_1_BP:1.4.10.1
	RELENG_7_3_0_RELEASE:1.4.12.1
	RELENG_7_3:1.4.0.12
	RELENG_7_3_BP:1.4
	RELENG_8_0_0_RELEASE:1.4.10.1.2.1
	RELENG_8_0:1.4.10.1.0.2
	RELENG_8_0_BP:1.4.10.1
	RELENG_8:1.4.0.10
	RELENG_8_BP:1.4
	RELENG_7_2_0_RELEASE:1.4.8.1
	RELENG_7_2:1.4.0.8
	RELENG_7_2_BP:1.4
	RELENG_7_1_0_RELEASE:1.4.6.1
	RELENG_6_4_0_RELEASE:1.3.12.1
	RELENG_7_1:1.4.0.6
	RELENG_7_1_BP:1.4
	RELENG_6_4:1.3.0.12
	RELENG_6_4_BP:1.3
	RELENG_7_0_0_RELEASE:1.4
	RELENG_6_3_0_RELEASE:1.3
	RELENG_7_0:1.4.0.4
	RELENG_7_0_BP:1.4
	RELENG_6_3:1.3.0.10
	RELENG_6_3_BP:1.3
	RELENG_7:1.4.0.2
	RELENG_7_BP:1.4
	RELENG_6_2_0_RELEASE:1.3
	RELENG_6_2:1.3.0.8
	RELENG_6_2_BP:1.3
	RELENG_6_1_0_RELEASE:1.3
	RELENG_6_1:1.3.0.6
	RELENG_6_1_BP:1.3
	RELENG_6_0_0_RELEASE:1.3
	RELENG_6_0:1.3.0.4
	RELENG_6_0_BP:1.3
	RELENG_6:1.3.0.2
	RELENG_6_BP:1.3
	old_RELENG_5:1.2.0.8
	old_RELENG_5_BP:1.2
	old_RELENG_5_2_1_RELEASE:1.2
	old_RELENG_5_2_0_RELEASE:1.2
	old_RELENG_5_2:1.2.0.6
	old_RELENG_5_2_BP:1.2
	old_RELENG_5_1_0_RELEASE:1.2
	old_RELENG_5_1:1.2.0.4
	old_RELENG_5_1_BP:1.2
	old_RELENG_5_0_0_RELEASE:1.2
	old_RELENG_5_0:1.2.0.2
	old_RELENG_5_0_BP:1.2
	old_KSE_MILESTONE_2:1.1;
locks; strict;
comment	@# @;


1.6
date	2012.11.17.01.51.18;	author svnexp;	state Exp;
branches
	1.6.2.1;
next	1.5;

1.5
date	2011.03.16.03.53.18;	author marcel;	state Exp;
branches
	1.5.2.1;
next	1.4;

1.4
date	2006.11.05.22.03.04;	author marcel;	state Exp;
branches
	1.4.2.1
	1.4.6.1
	1.4.8.1
	1.4.10.1
	1.4.12.1
	1.4.14.1;
next	1.3;

1.3
date	2004.09.24.03.51.06;	author marcel;	state Exp;
branches
	1.3.2.1
	1.3.12.1;
next	1.2;

1.2
date	2002.03.30.23.52.34;	author marcel;	state Exp;
branches;
next	1.1;

1.1
date	2001.09.12.08.34.27;	author dfr;	state Exp;
branches;
next	;

1.6.2.1
date	2012.11.17.01.51.18;	author svnexp;	state dead;
branches;
next	1.6.2.2;

1.6.2.2
date	2013.03.28.13.04.02;	author svnexp;	state Exp;
branches;
next	;

1.5.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.5.2.1.2.1
	1.5.2.1.4.1;
next	1.5.2.2;

1.5.2.2
date	2012.11.17.11.36.48;	author svnexp;	state Exp;
branches;
next	;

1.5.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.5.2.1.2.2;

1.5.2.1.2.2
date	2012.11.17.08.36.46;	author svnexp;	state Exp;
branches;
next	;

1.5.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.5.2.1.4.2;

1.5.2.1.4.2
date	2012.11.17.08.47.36;	author svnexp;	state Exp;
branches;
next	;

1.4.2.1
date	2012.11.17.08.04.55;	author svnexp;	state Exp;
branches;
next	;

1.4.6.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.4.8.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.4.10.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.4.10.1.2.1
	1.4.10.1.4.1
	1.4.10.1.6.1
	1.4.10.1.8.1;
next	1.4.10.2;

1.4.10.2
date	2012.11.17.10.36.27;	author svnexp;	state Exp;
branches;
next	;

1.4.10.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.4.10.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.4.10.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.4.10.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.4.10.1.8.2;

1.4.10.1.8.2
date	2012.11.17.08.25.07;	author svnexp;	state Exp;
branches;
next	;

1.4.12.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.4.14.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.4.14.2;

1.4.14.2
date	2012.11.17.08.17.05;	author svnexp;	state Exp;
branches;
next	;

1.3.2.1
date	2012.11.17.07.42.40;	author svnexp;	state Exp;
branches;
next	;

1.3.12.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;


desc
@@


1.6
log
@Switching exporter and resync
@
text
@$FreeBSD: head/sys/boot/ia64/ski/version 219691 2011-03-16 03:53:18Z marcel $

NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
file is important.  Make sure the current version number is on line 6.

2.0:    Add support for PBVM.
1.2:    Restructured. Has some user visible differences. Due to code
	sharing, has been given the same version number as the EFI
	loader.
0.2:	Pass the address of the bootinfo block to the kernel in register
	r8. Keep it at the hardwired address for now.
0.1:	Initial SKI version.
@


1.6.2.1
log
@file version was added on branch RELENG_8_4 on 2013-03-28 13:04:02 +0000
@
text
@d1 12
@


1.6.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 11
$FreeBSD: releng/8.4/sys/boot/ia64/ski/version 164010 2006-11-05 22:03:04Z marcel $

NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
file is important.  Make sure the current version number is on line 6.

1.2:    Restructured. Has some user visible differences. Due to code
	sharing, has been given the same version number as the EFI
	loader.
0.2:	Pass the address of the bootinfo block to the kernel in register
	r8. Keep it at the hardwired address for now.
0.1:	Initial SKI version.
@


1.5
log
@SVN rev 219691 on 2011-03-16 03:53:18Z by marcel

MFaltix:
Add support for Pre-Boot Virtual Memory (PBVM) to the loader.

PBVM allows us to link the kernel at a fixed virtual address without
having to make any assumptions about the physical memory layout. On
the SGI Altix 350 for example, there's no usuable physical memory
below 192GB. Also, the PBVM allows us to control better where we're
going to physically load the kernel and its modules so that we can
make sure we load the kernel in memory that's close to the BSP.

The PBVM is managed by a simple page table. The minimum size of the
page table is 4KB (EFI page size) and the maximum is currently set
to 1MB. A page in the PBVM is 64KB, as that's the maximum alignment
one can specify in a linker script. The bottom line is that PBVM is
between 64KB and 8GB in size.

The loader maps the PBVM page table at a fixed virtual address and
using a single translations. The PBVM itself is also mapped using a
single translation for a maximum of 32MB.

While here, increase the heap in the EFI loader from 512KB to 2MB
and set the stage for supporting relocatable modules.
@
text
@d1 1
a1 1
$FreeBSD$
@


1.5.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.5.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
$FreeBSD: stable/9/sys/boot/ia64/ski/version 219691 2011-03-16 03:53:18Z marcel $
@


1.5.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.5.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: releng/9.1/sys/boot/ia64/ski/version 219691 2011-03-16 03:53:18Z marcel $
@


1.5.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.5.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: releng/9.0/sys/boot/ia64/ski/version 219691 2011-03-16 03:53:18Z marcel $
@


1.4
log
@Major rework of the ia64 loaders. The two primary objectives are:
1. Make libefi portable by removing ia64 specific code and build
   it on i386 and amd64 by default to prevent regressions. These
   changes include fixes and improvements over previous code to
   establish or improve APIs where none existed or when the amount
   of kluging was unacceptably high.
2. Increase the amount of sharing between the efi and ski loaders
   to improve maintainability of the loaders and simplify making
   changes to the loader-kernel handshaking in the future.

The version of the efi and ski loaders are now both changed to 1.2
as user visible improvements and changes have been made.
@
text
@d6 1
@


1.4.2.1
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: stable/7/sys/boot/ia64/ski/version 164010 2006-11-05 22:03:04Z marcel $
@


1.4.14.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.4.14.2
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: releng/7.4/sys/boot/ia64/ski/version 164010 2006-11-05 22:03:04Z marcel $
@


1.4.12.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.4.10.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.4.10.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
$FreeBSD: stable/8/sys/boot/ia64/ski/version 164010 2006-11-05 22:03:04Z marcel $
@


1.4.10.1.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.4.10.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: releng/8.3/sys/boot/ia64/ski/version 164010 2006-11-05 22:03:04Z marcel $
@


1.4.10.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.4.10.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.4.10.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.4.8.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.4.6.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.3
log
@Forced commit to note that this file was repocopied from ../skiload.

Repocopy by: peter
@
text
@d6 3
@


1.3.2.1
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: stable/6/sys/boot/ia64/ski/version 135695 2004-09-24 03:51:06Z marcel $
@


1.3.12.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.2
log
@Pass the address of the bootinfo block to the kernel in register
r8. Keep it at the hardwired address for now. Bump the version.
@
text
@@


1.1
log
@Add a version of the loader which runs under SKI, the HP ia64 simulator.
This loader is quite functional and can load and run kernels. The kernels
don't quite work right after loading but that should be easily fixable.
@
text
@d6 2
@

