PERFORCE change 136027 for review

[Marcel Moolenaar]

http://perforce.freebsd.org/chv.cgi?CH=136027

Change 136027 by marcel at marcel_cluster on 2008/02/23 19:32:33

	IFC @136026

Affected files ...

.. //depot/projects/e500/sys/boot/common/bootstrap.h#3 integrate
.. //depot/projects/e500/sys/boot/common/load_elf.c#3 integrate
.. //depot/projects/e500/sys/boot/powerpc/uboot/conf.c#6 integrate
.. //depot/projects/e500/sys/boot/powerpc/uboot/metadata.c#8 integrate
.. //depot/projects/e500/sys/boot/powerpc/uboot/start.S#10 integrate

Differences ...

==== //depot/projects/e500/sys/boot/common/bootstrap.h#3 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/boot/common/bootstrap.h,v 1.44 2006/12/18 07:35:14 kmacy Exp $
+ * $FreeBSD: src/sys/boot/common/bootstrap.h,v 1.45 2008/02/23 18:33:49 marcel Exp $
  */
 
 #include <sys/types.h>

==== //depot/projects/e500/sys/boot/common/load_elf.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/common/load_elf.c,v 1.37 2006/11/02 17:52:43 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/common/load_elf.c,v 1.38 2008/02/23 18:33:50 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/exec.h>
@@ -280,9 +280,9 @@
 	if (off & 0xf0000000u) {
 	    off = -(off & 0xf0000000u);
 	    /*
-	     * FIXME allow for specifying the offset via loader env var -
-	     * hard code 0x01000000 for the moment - needs to be on 16MB
-	     * boundary!
+	     * XXX the physical load address should not be hardcoded. Note
+	     * that the Book-E kernel assumes that it's loaded at a 16MB
+	     * boundary for now...
 	     */
 	    off += 0x01000000;
 	    ehdr->e_entry += off;

==== //depot/projects/e500/sys/boot/powerpc/uboot/conf.c#6 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/powerpc/uboot/conf.c,v 1.1 2008/02/16 22:40:55 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/powerpc/uboot/conf.c,v 1.2 2008/02/23 18:36:13 marcel Exp $");
 
 #include <stand.h>
 #include "bootstrap.h"

==== //depot/projects/e500/sys/boot/powerpc/uboot/metadata.c#8 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/powerpc/uboot/metadata.c,v 1.1 2008/02/16 22:40:55 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/powerpc/uboot/metadata.c,v 1.2 2008/02/23 19:08:25 marcel Exp $");
 
 #include <stand.h>
 #include <sys/param.h>

==== //depot/projects/e500/sys/boot/powerpc/uboot/start.S#10 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/boot/powerpc/uboot/start.S,v 1.2 2008/02/17 20:38:22 marcel Exp $
+ * $FreeBSD: src/sys/boot/powerpc/uboot/start.S,v 1.3 2008/02/23 18:42:53 marcel Exp $
  */
 
 #include <machine/asm.h>