From owner-p4-projects@FreeBSD.ORG Sat Feb 23 19:33:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98CD116A409; Sat, 23 Feb 2008 19:33:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5D8B816A406 for ; Sat, 23 Feb 2008 19:33:01 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5AFA613C45D for ; Sat, 23 Feb 2008 19:33:01 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1NJX1oP019708 for ; Sat, 23 Feb 2008 19:33:01 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1NJX0La019686 for perforce@freebsd.org; Sat, 23 Feb 2008 19:33:00 GMT (envelope-from marcel@freebsd.org) Date: Sat, 23 Feb 2008 19:33:00 GMT Message-Id: <200802231933.m1NJX0La019686@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 136027 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Feb 2008 19:33:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=136027 Change 136027 by marcel@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 ==== //depot/projects/e500/sys/boot/common/load_elf.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__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 #include @@ -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 -__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 #include "bootstrap.h" ==== //depot/projects/e500/sys/boot/powerpc/uboot/metadata.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__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 #include ==== //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