Garbage-collect vestigial support for the Simtec Hydra board. The main code
to support it was never committed to the tree, and it would probably need major reworking anyway.
This commit is contained in:
bjh21
parent
504ce207cb
commit
d7fca27e58
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: pmap.c,v 1.70 2001/01/14 03:31:45 thorpej Exp $ */
|
||||
/* $NetBSD: pmap.c,v 1.71 2001/02/19 13:29:39 bjh21 Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1999 The NetBSD Foundation, Inc.
|
||||
@ -113,10 +113,6 @@
|
||||
#include <machine/param.h>
|
||||
#include <machine/katelib.h>
|
||||
|
||||
#ifdef HYDRA
|
||||
#include "hydrabus.h"
|
||||
#endif /* HYDRA */
|
||||
|
||||
#ifdef PMAP_DEBUG
|
||||
#define PDEBUG(_lev_,_stat_) \
|
||||
if (pmap_debug_level >= (_lev_)) \
|
||||
@ -160,10 +156,6 @@ vm_offset_t avail_end;
|
||||
|
||||
extern pv_addr_t systempage;
|
||||
|
||||
#if NHYDRABUS > 0
|
||||
extern pv_addr_t hydrascratch;
|
||||
#endif /* NHYDRABUS */
|
||||
|
||||
#define ALLOC_PAGE_HOOK(x, s) \
|
||||
x.va = virtual_start; \
|
||||
x.pte = (pt_entry_t *)pmap_pte(kernel_pmap, virtual_start); \
|
||||
@ -800,15 +792,6 @@ pmap_bootstrap(kernel_l1pt, kernel_ptpt)
|
||||
msgbufpte = (pt_entry_t)pmap_pte(kernel_pmap, virtual_start);
|
||||
virtual_start += round_page(MSGBUFSIZE);
|
||||
|
||||
#if NHYDRABUS > 0
|
||||
hydrascratch.virtual = virtual_start;
|
||||
virtual_start += NBPG;
|
||||
|
||||
*((pt_entry_t *)pmap_pte(kernel_pmap, hydrascratch.virtual)) =
|
||||
L2_PTE_NC_NB(hydrascratch.physical, AP_KRW);
|
||||
cpu_tlb_flushD_SE(hydrascratch.virtual);
|
||||
#endif /* NHYDRABUS */
|
||||
|
||||
size = npages * sizeof(struct pv_entry);
|
||||
boot_pvent = (struct pv_entry *)uvm_pageboot_alloc(size);
|
||||
bzero(boot_pvent, size);
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: stubs.c,v 1.30 2000/06/29 08:52:58 mrg Exp $ */
|
||||
/* $NetBSD: stubs.c,v 1.31 2001/02/19 13:29:40 bjh21 Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994-1998 Mark Brinicombe.
|
||||
@ -52,10 +52,6 @@
|
||||
#include <machine/bootconfig.h>
|
||||
#include <machine/pcb.h>
|
||||
|
||||
#ifdef HYDRA
|
||||
#include "hydrabus.h"
|
||||
#endif
|
||||
|
||||
extern dev_t dumpdev;
|
||||
extern BootConfig bootconfig;
|
||||
|
||||
@ -203,10 +199,6 @@ dumpsys()
|
||||
|
||||
for (block = 0; block < bootconfig.dramblocks && error == 0; ++block) {
|
||||
addr = bootconfig.dram[block].address;
|
||||
#if NHYDRABUS > 0
|
||||
if (block == 0)
|
||||
addr += NBPG;
|
||||
#endif /* NHYDRABUS */
|
||||
for (;addr < (bootconfig.dram[block].address
|
||||
+ (bootconfig.dram[block].pages * NBPG)); addr += NBPG) {
|
||||
if ((len % (1024*1024)) == 0)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: bootoptions,v 1.3 1998/03/26 20:42:34 mark Exp $ */
|
||||
/* $NetBSD: bootoptions,v 1.4 2001/02/19 13:29:40 bjh21 Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1996 Mark Brinicombe.
|
||||
@ -71,10 +71,6 @@ RiscPC Boot options
|
||||
termdebug Enable console debugging (*)
|
||||
notermcls Console debugging option
|
||||
|
||||
Special development options
|
||||
|
||||
hydra= Enable specified hydra slave processors
|
||||
|
||||
|
||||
(*) These options have their own fields in the bootloader configuration
|
||||
window.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: cpus.h,v 1.6 1998/05/01 15:32:55 mark Exp $ */
|
||||
/* $NetBSD: cpus.h,v 1.7 2001/02/19 13:29:41 bjh21 Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995 Mark Brinicombe.
|
||||
@ -45,17 +45,9 @@
|
||||
#include <sys/param.h>
|
||||
#endif
|
||||
|
||||
/* If hydra is defined then we take into consideration the slave CPU's available */
|
||||
|
||||
#ifdef HYDRA
|
||||
#define MAX_CPUS 6
|
||||
#define MAX_SLAVE_CPUS 4
|
||||
#define MAX_FOREIGN_CPUS 1
|
||||
#else
|
||||
#define MAX_CPUS 2
|
||||
#define MAX_SLAVE_CPUS 0
|
||||
#define MAX_FOREIGN_CPUS 1
|
||||
#endif
|
||||
|
||||
#define CPU_MASTER 0
|
||||
#define CPU_486 1
|
||||
@ -68,7 +60,6 @@
|
||||
|
||||
#define CPU_HOST_NONE 0 /* No host */
|
||||
#define CPU_HOST_MAINBUS 1 /* Hosted via motherboard */
|
||||
#define CPU_HOST_HYDRA 2 /* Hosted via hydra multiprocessor board */
|
||||
|
||||
#define CPU_FLAG_PRESENT 0x01
|
||||
#define CPU_FLAG_HALTED 0x02
|
||||
@ -152,4 +143,4 @@ extern cpu_t cpus[MAX_CPUS];
|
||||
#endif /* _KERNEL */
|
||||
#endif /* _LOCORE */
|
||||
|
||||
/* End of hydra.h */
|
||||
/* End of cpus.h */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: rpc_machdep.c,v 1.35 2001/02/18 00:59:33 reinoud Exp $ */
|
||||
/* $NetBSD: rpc_machdep.c,v 1.36 2001/02/19 13:29:41 bjh21 Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2000-2001 Reinoud Zandijk.
|
||||
@ -83,9 +83,6 @@
|
||||
#include <arm32/iomd/iomdreg.h>
|
||||
|
||||
#include "opt_ipkdb.h"
|
||||
#ifdef HYDRA
|
||||
#include "hydrabus.h"
|
||||
#endif /* HYDRA */
|
||||
|
||||
/*
|
||||
* Address to call from cpu_reset() to reset the machine.
|
||||
@ -139,9 +136,6 @@ pv_addr_t irqstack;
|
||||
pv_addr_t undstack;
|
||||
pv_addr_t abtstack;
|
||||
pv_addr_t kernelstack;
|
||||
#if NHYDRABUS > 0
|
||||
pv_addr_t hydrascratch;
|
||||
#endif /* NHYDRABUS */
|
||||
|
||||
vm_offset_t msgbufphys;
|
||||
|
||||
@ -205,7 +199,6 @@ extern void parse_mi_bootargs __P((char *args));
|
||||
void parse_rpc_bootargs __P((char *args));
|
||||
|
||||
extern void dumpsys __P((void));
|
||||
extern void hydrastop __P((void));
|
||||
|
||||
|
||||
/*
|
||||
@ -228,15 +221,6 @@ cpu_reboot(howto, bootstr)
|
||||
int howto;
|
||||
char *bootstr;
|
||||
{
|
||||
#if NHYDRABUS > 0
|
||||
/*
|
||||
* If we are halting the master then we should halt the slaves :-)
|
||||
* otherwise it can get a bit disconcerting to have 4 other
|
||||
* processors still tearing away doing things.
|
||||
*/
|
||||
|
||||
hydrastop();
|
||||
#endif /* NHYDRABUS */
|
||||
|
||||
#ifdef DIAGNOSTIC
|
||||
printf("boot: howto=%08x curproc=%p\n", howto, curproc);
|
||||
@ -1421,21 +1405,10 @@ initarm_old_bootloader(bootconf)
|
||||
bootconfig.kernphysicalbase + logical);
|
||||
}
|
||||
|
||||
#if NHYDRABUS > 0
|
||||
/*
|
||||
* If we have the hydra nick the first physical page for hydra booting
|
||||
* Needs to be 2MB aligned
|
||||
*/
|
||||
for (logical = 0; logical < 0x400000; logical += NBPG) {
|
||||
map_entry(l2pagetable + 0x2000, logical,
|
||||
bootconfig.dram[0].address + logical + NBPG);
|
||||
}
|
||||
#else /* NHYDRABUS */
|
||||
for (logical = 0; logical < 0x400000; logical += NBPG) {
|
||||
map_entry(l2pagetable + 0x2000, logical,
|
||||
bootconfig.dram[0].address + logical);
|
||||
}
|
||||
#endif /* NHYDRABUS */
|
||||
|
||||
/*
|
||||
* Now we construct the L1 pagetable. This only needs the minimum to
|
||||
@ -1626,17 +1599,6 @@ initarm_old_bootloader(bootconf)
|
||||
printf("Allocating page tables\n");
|
||||
#endif
|
||||
|
||||
#if NHYDRABUS > 0
|
||||
/*
|
||||
* The Simtec Hydra board needs a 2MB aligned page for bootstrapping.
|
||||
* Simplest thing is to nick the bottom page of physical memory.
|
||||
*/
|
||||
|
||||
hydrascratch.pv_pa = physical_start;
|
||||
physical_start += NBPG;
|
||||
--free_pages;
|
||||
#endif /* NHYDRABUS */
|
||||
|
||||
/* Update the address of the first free page of physical memory */
|
||||
physical_freestart = physical_start + kerneldatasize;
|
||||
free_pages -= (physical_freestart - physical_start) / NBPG;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user