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);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
