summaryrefslogtreecommitdiff
path: root/sys/arch/arm64
diff options
context:
space:
mode:
authorPatrick Wildt <patrick@cvs.openbsd.org>2017-02-04 19:49:19 +0000
committerPatrick Wildt <patrick@cvs.openbsd.org>2017-02-04 19:49:19 +0000
commite4ac75fd7a555d639178ffbd4163c5c31795b4c4 (patch)
tree7571f865a3f5822382c89cbe5cd034034bcf6042 /sys/arch/arm64
parent281b8868cdae64283e45adc61deda6012d0ac6d1 (diff)
A bit of code and comment cleanup.
Diffstat (limited to 'sys/arch/arm64')
-rw-r--r--sys/arch/arm64/arm64/machdep.c40
1 files changed, 4 insertions, 36 deletions
diff --git a/sys/arch/arm64/arm64/machdep.c b/sys/arch/arm64/arm64/machdep.c
index f126558ccba..abd8ec3531e 100644
--- a/sys/arch/arm64/arm64/machdep.c
+++ b/sys/arch/arm64/arm64/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.8 2017/02/04 19:12:54 patrick Exp $ */
+/* $OpenBSD: machdep.c,v 1.9 2017/02/04 19:49:18 patrick Exp $ */
/*
* Copyright (c) 2014 Patrick Wildt <patrick@blueri.se>
*
@@ -810,19 +810,9 @@ initarm(struct arm64_bootparams *abp)
if (reg.size > 0x80000000)
memsize = 0x80000000;
-#if 0
- /* Load the physical memory ranges */
- physmap_idx = 0;
- efihdr = (struct efi_map_header *)preload_search_info(kmdp,
- MODINFO_METADATA | MODINFOMD_EFI_MAP);
- add_efi_map_entries(efihdr, physmap, &physmap_idx);
-#endif
-
/* Set the pcpu data, this is needed by pmap_bootstrap */
// smp
pcpup = &cpu_info_primary;
- //pcpu_init(pcpup, 0, sizeof(struct pcpu));
-
/*
* Set the pcpu pointer with a backup in tpidr_el1 to be
@@ -838,13 +828,6 @@ initarm(struct arm64_bootparams *abp)
}
process_kernel_args();
- // PCPU_SET(curthread, &thread0);
-
- /* Do basic tuning, hz etc */
- // init_param1();
-
- // cache_setup();
-
// XXX
paddr_t pmap_steal_avail(size_t size, int align, void **kva);
@@ -856,18 +839,8 @@ initarm(struct arm64_bootparams *abp)
kernbase, esym,
memstart, memstart + memsize);
- //arm_devmap_bootstrap(0, NULL);
-
- //cninit();
-
// XX correctly sized?
proc0paddr = (struct user *)abp->kern_stack;
- //msgbufinit(msgbufp, msgbufsize);
- //mutex_init();
- //init_param2(physmem);
-
- //dbg_monitor_init();
- //kdb_init();
msgbufaddr = (caddr_t)vstart;
msgbufphys = pmap_steal_avail(round_page(MSGBUFSIZE), PAGE_SIZE, NULL);
@@ -900,11 +873,6 @@ initarm(struct arm64_bootparams *abp)
vstart += size;
}
- /* XXX */
-#if 0
- // XXX ?
- vstart += reserve_dumppages( (caddr_t)(?address? + arm_kvm_stolen));
-#endif
/*
* Managed KVM space is what we have claimed up to end of
* mapped kernel buffers.
@@ -921,9 +889,9 @@ initarm(struct arm64_bootparams *abp)
if (fdt)
fdt_init(fdt);
-// XXX
-int pmap_bootstrap_bs_map(bus_space_tag_t t, bus_addr_t bpa, bus_size_t size,
- int flags, bus_space_handle_t *bshp);
+ // XXX
+ int pmap_bootstrap_bs_map(bus_space_tag_t t, bus_addr_t bpa,
+ bus_size_t size, int flags, bus_space_handle_t *bshp);
map_func_save = arm64_bs_tag._space_map;
map_a4x_func_save = arm64_a4x_bs_tag._space_map;