d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge r242125 into the other ARMv6 copies of initarm.

Browse Source
This commit is contained in:
Andrew Turner 2012-10-31 08:25:45 +00:00
parent bf57b7b2ce
commit ef8abaaebf
4 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/arm/broadcom/bcm2835/bcm2835_machdep.c
View File

@ -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);

5
sys/arm/lpc/lpc_machdep.c
View File

@ -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);

5
sys/arm/mv/mv_machdep.c
View File

@ -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);

5
sys/arm/tegra/tegra2_machdep.c
View File

@ -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);