diff options
| author | andrew <andrew@FreeBSD.org> | 2012-09-22 22:41:38 +0000 |
|---|---|---|
| committer | andrew <andrew@FreeBSD.org> | 2012-09-22 22:41:38 +0000 |
| commit | 32eb506f225e2b85e47ea826ddccfaf600657810 (patch) | |
| tree | 80ef4f90009db9525d5d1ae87fe67e96ca55131e /sys/arm/lpc | |
| parent | ec17dd03e0b43e9e9f9b96fc7e6ed1072b7a9154 (diff) | |
| download | FreeBSD-src-32eb506f225e2b85e47ea826ddccfaf600657810.zip FreeBSD-src-32eb506f225e2b85e47ea826ddccfaf600657810.tar.gz | |
Reduce the diff between the FDT implementations of initarm.
This only touches whitespace and comments.
Diffstat (limited to 'sys/arm/lpc')
| -rw-r--r-- | sys/arm/lpc/lpc_machdep.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/arm/lpc/lpc_machdep.c b/sys/arm/lpc/lpc_machdep.c index 869baf8..6efc3cf 100644 --- a/sys/arm/lpc/lpc_machdep.c +++ b/sys/arm/lpc/lpc_machdep.c @@ -306,7 +306,7 @@ initarm(struct arm_boot_params *abp) set_cpufuncs(); kmdp = preload_search_by_type("elf kernel"); - if (kmdp != NULL) + if (kmdp != NULL) dtbp = MD_FETCH(kmdp, MODINFOMD_DTBP, vm_offset_t); else dtbp = (vm_offset_t)NULL; @@ -318,7 +318,6 @@ initarm(struct arm_boot_params *abp) */ if (dtbp == (vm_offset_t)NULL) dtbp = (vm_offset_t)&fdt_static_dtb; - #endif if (OF_install(OFW_FDT, 0) == FALSE) @@ -427,7 +426,7 @@ initarm(struct arm_boot_params *abp) &kernel_pt_table[i]); pmap_curmaxkvaddr = l2_start + (l2size - 1) * L1_S_SIZE; - + /* Map kernel code and data */ pmap_map_chunk(l1pagetable, KERNVIRTADDR, KERNPHYSADDR, (((uint32_t)(lastaddr) - KERNVIRTADDR) + PAGE_MASK) & ~PAGE_MASK, @@ -480,7 +479,7 @@ initarm(struct arm_boot_params *abp) #endif cninit(); - + physmem = memsize / PAGE_SIZE; debugf("initarm: console initialized\n"); @@ -547,6 +546,7 @@ initarm(struct arm_boot_params *abp) /* Do basic tuning, hz etc */ init_param2(physmem); kdb_init(); + return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP - sizeof(struct pcb))); } |
