summaryrefslogtreecommitdiffstats
path: root/sys/arm/mv
diff options
context:
space:
mode:
authorandrew <andrew@FreeBSD.org>2012-10-31 08:25:45 +0000
committerandrew <andrew@FreeBSD.org>2012-10-31 08:25:45 +0000
commit245c75ddd9d9843e079e3280fcd1c008b66baf3e (patch)
tree883b80ed4af9e93182587fa8d82373c7b9b7860c /sys/arm/mv
parent5d8a47063abbe28e44dbd610088cc0b58d4354d4 (diff)
downloadFreeBSD-src-245c75ddd9d9843e079e3280fcd1c008b66baf3e.zip
FreeBSD-src-245c75ddd9d9843e079e3280fcd1c008b66baf3e.tar.gz
Merge r242125 into the other ARMv6 copies of initarm.
Diffstat (limited to 'sys/arm/mv')
-rw-r--r--sys/arm/mv/mv_machdep.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sys/arm/mv/mv_machdep.c b/sys/arm/mv/mv_machdep.c
index 19d66c0..87a0e6c 100644
--- a/sys/arm/mv/mv_machdep.c
+++ b/sys/arm/mv/mv_machdep.c
@@ -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);
OpenPOWER on IntegriCloud