From owner-svn-src-head@FreeBSD.ORG Wed Oct 31 08:25:45 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id C974DD33;
Wed, 31 Oct 2012 08:25:45 +0000 (UTC)
(envelope-from andrew@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id B10C98FC08;
Wed, 31 Oct 2012 08:25:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9V8Pj88090555;
Wed, 31 Oct 2012 08:25:45 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9V8PjQD090550;
Wed, 31 Oct 2012 08:25:45 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201210310825.q9V8PjQD090550@svn.freebsd.org>
From: Andrew Turner <andrew@FreeBSD.org>
Date: Wed, 31 Oct 2012 08:25:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r242394 - in head/sys/arm: broadcom/bcm2835 lpc mv tegra
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 31 Oct 2012 08:25:46 -0000
Author: andrew
Date: Wed Oct 31 08:25:45 2012
New Revision: 242394
URL: http://svn.freebsd.org/changeset/base/242394
Log:
Merge r242125 into the other ARMv6 copies of initarm.
Modified:
head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
head/sys/arm/lpc/lpc_machdep.c
head/sys/arm/mv/mv_machdep.c
head/sys/arm/tegra/tegra2_machdep.c
Modified: head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
==============================================================================
--- head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c Wed Oct 31 07:57:49 2012 (r242393)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_machdep.c Wed Oct 31 08:25:45 2012 (r242394)
@@ -306,6 +306,7 @@ initarm(struct arm_boot_params *abp)
struct pv_addr dpcpu;
vm_offset_t dtbp, freemempos, l2_start, lastaddr;
uint32_t memsize, l2size;
+ char *env;
void *kmdp;
u_int l1pagetable;
int i = 0, j = 0, err_devmap = 0;
@@ -491,6 +492,10 @@ initarm(struct arm_boot_params *abp)
print_kernel_section_addr();
print_kenv();
+ env = getenv("kernelname");
+ if (env != NULL)
+ strlcpy(kernelname, env, sizeof(kernelname));
+
if (err_devmap != 0)
printf("WARNING: could not fully configure devmap, error=%d\n",
err_devmap);
Modified: head/sys/arm/lpc/lpc_machdep.c
==============================================================================
--- head/sys/arm/lpc/lpc_machdep.c Wed Oct 31 07:57:49 2012 (r242393)
+++ head/sys/arm/lpc/lpc_machdep.c Wed Oct 31 08:25:45 2012 (r242394)
@@ -307,6 +307,7 @@ initarm(struct arm_boot_params *abp)
struct pv_addr dpcpu;
vm_offset_t dtbp, freemempos, l2_start, lastaddr;
uint32_t memsize, l2size;
+ char *env;
void *kmdp;
u_int l1pagetable;
int i = 0, j = 0, err_devmap = 0;
@@ -492,6 +493,10 @@ initarm(struct arm_boot_params *abp)
print_kernel_section_addr();
print_kenv();
+ env = getenv("kernelname");
+ if (env != NULL)
+ strlcpy(kernelname, env, sizeof(kernelname));
+
if (err_devmap != 0)
printf("WARNING: could not fully configure devmap, error=%d\n",
err_devmap);
Modified: head/sys/arm/mv/mv_machdep.c
==============================================================================
--- head/sys/arm/mv/mv_machdep.c Wed Oct 31 07:57:49 2012 (r242393)
+++ head/sys/arm/mv/mv_machdep.c Wed Oct 31 08:25:45 2012 (r242394)
@@ -297,6 +297,7 @@ initarm(struct arm_boot_params *abp)
struct pv_addr dpcpu;
vm_offset_t dtbp, freemempos, l2_start, lastaddr;
uint32_t memsize, l2size;
+ char *env;
void *kmdp;
u_int l1pagetable;
int i = 0, j = 0, err_devmap = 0;
@@ -482,6 +483,10 @@ initarm(struct arm_boot_params *abp)
print_kernel_section_addr();
print_kenv();
+ env = getenv("kernelname");
+ if (env != NULL)
+ strlcpy(kernelname, env, sizeof(kernelname));
+
if (err_devmap != 0)
printf("WARNING: could not fully configure devmap, error=%d\n",
err_devmap);
Modified: head/sys/arm/tegra/tegra2_machdep.c
==============================================================================
--- head/sys/arm/tegra/tegra2_machdep.c Wed Oct 31 07:57:49 2012 (r242393)
+++ head/sys/arm/tegra/tegra2_machdep.c Wed Oct 31 08:25:45 2012 (r242394)
@@ -346,6 +346,7 @@ initarm(struct arm_boot_params *abp)
struct pv_addr dpcpu;
vm_offset_t dtbp, freemempos, l2_start, lastaddr;
uint32_t memsize, l2size;
+ char *env;
void *kmdp;
u_int l1pagetable;
int i = 0, j = 0, err_devmap = 0;
@@ -531,6 +532,10 @@ initarm(struct arm_boot_params *abp)
print_kernel_section_addr();
print_kenv();
+ env = getenv("kernelname");
+ if (env != NULL)
+ strlcpy(kernelname, env, sizeof(kernelname));
+
if (err_devmap != 0)
printf("WARNING: could not fully configure devmap, error=%d\n",
err_devmap);