diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/arc/arc/arcbios.c | 10 | ||||
| -rw-r--r-- | sys/arch/arc/arc/machdep.c | 6 | ||||
| -rw-r--r-- | sys/arch/arc/arc/pmap.c | 12 | ||||
| -rw-r--r-- | sys/arch/arc/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/arc/conf/Makefile.arc | 4 | ||||
| -rw-r--r-- | sys/arch/arc/dti/desktech.h | 6 |
6 files changed, 20 insertions, 22 deletions
diff --git a/sys/arch/arc/arc/arcbios.c b/sys/arch/arc/arc/arcbios.c index 39806af5b16..b96ea28d396 100644 --- a/sys/arch/arc/arc/arcbios.c +++ b/sys/arch/arc/arc/arcbios.c @@ -1,4 +1,4 @@ -/* $OpenBSD: arcbios.c,v 1.3 1996/09/15 09:46:06 pefo Exp $ */ +/* $OpenBSD: arcbios.c,v 1.4 1996/09/24 19:37:23 pefo Exp $ */ /*- * Copyright (c) 1996 M. Warner Losh. All rights reserved. * @@ -173,11 +173,6 @@ bios_configure_memory() descr = (arc_mem_t *)Bios_GetMemoryDescriptor(descr); while(descr != 0) { - sprintf(buf, "mem %d, 0x%x, 0x%x\n", - descr->Type, - descr->BasePage * 4096, - descr->PageCount * 4096); - bios_putstring(buf); seg_start = descr->BasePage * 4096; seg_end = seg_start + descr->PageCount * 4096; @@ -226,6 +221,7 @@ bios_configure_memory() descr = (arc_mem_t *)Bios_GetMemoryDescriptor(descr); } +#if 0 for( i = 0; i < MAXMEMSEGS; i++) { if(mem_layout[i].mem_size) { sprintf(buf, "MEM %d, 0x%x, 0x%x\n",i, @@ -234,6 +230,7 @@ bios_configure_memory() bios_putstring(buf); } } +#endif } /* @@ -298,3 +295,4 @@ bios_display_info(xpos, ypos, xsize, ysize) *xsize = displayinfo.CursorMaxXPosition; *ysize = displayinfo.CursorMaxYPosition; } + diff --git a/sys/arch/arc/arc/machdep.c b/sys/arch/arc/arc/machdep.c index d58d3c17a9c..93b200a84e9 100644 --- a/sys/arch/arc/arc/machdep.c +++ b/sys/arch/arc/arc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.14 1996/09/19 22:30:07 pefo Exp $ */ +/* $OpenBSD: machdep.c,v 1.15 1996/09/24 19:37:24 pefo Exp $ */ /* * Copyright (c) 1988 University of Utah. * Copyright (c) 1992, 1993 @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 8.3 (Berkeley) 1/12/94 - * $Id: machdep.c,v 1.14 1996/09/19 22:30:07 pefo Exp $ + * $Id: machdep.c,v 1.15 1996/09/24 19:37:24 pefo Exp $ */ /* from: Utah Hdr: machdep.c 1.63 91/04/24 */ @@ -243,7 +243,7 @@ mips_init(argc, argv, code) #endif if (argc > 1) { for (i = 1; i < argc; i++) { - if(strncmp("OSLOADOPTIONS=",argv[i],14) == 0) { + if(strncasecmp("osloadoptions=",argv[i],14) == 0) { for (cp = argv[i]+14; *cp; cp++) { switch (*cp) { case 'a': /* autoboot */ diff --git a/sys/arch/arc/arc/pmap.c b/sys/arch/arc/arc/pmap.c index 9fcfa6bba58..51e5b715b28 100644 --- a/sys/arch/arc/arc/pmap.c +++ b/sys/arch/arc/arc/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.4 1996/09/14 15:58:17 pefo Exp $ */ +/* $OpenBSD: pmap.c,v 1.5 1996/09/24 19:37:25 pefo Exp $ */ /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 8.4 (Berkeley) 1/26/94 - * $Id: pmap.c,v 1.4 1996/09/14 15:58:17 pefo Exp $ + * $Id: pmap.c,v 1.5 1996/09/24 19:37:25 pefo Exp $ */ /* @@ -260,11 +260,11 @@ pmap_bootstrap(firstaddr) for( i = 0; i < MAXMEMSEGS; i++) { /* Adjust for the kernel exeption vectors and sys data area */ - if(mem_layout[i].mem_start < 0x8000) { + if(mem_layout[i].mem_start < 0x20000) { if((mem_layout[i].mem_start + mem_layout[i].mem_size) < 0x8000) continue; /* To small skip it */ - mem_layout[i].mem_size -= 0x8000 - mem_layout[i].mem_start; - mem_layout[i].mem_start = 0x8000; /* Adjust to be above vec's */ + mem_layout[i].mem_size -= 0x20000 - mem_layout[i].mem_start; + mem_layout[i].mem_start = 0x20000; /* Adjust to be above vec's */ } /* Adjust for the kernel expansion area (bufs etc) */ if((mem_layout[i].mem_start + mem_layout[i].mem_size > CACHED_TO_PHYS(_ftext)) && @@ -351,7 +351,7 @@ pmap_init(phys_start, phys_end) { #ifdef DEBUG - if (1 || pmapdebug & (PDB_FOLLOW|PDB_INIT)) + if (pmapdebug & (PDB_FOLLOW|PDB_INIT)) #ifdef MACHINE_NONCONTIG printf("pmap_init(%lx, %lx)\n", avail_start, avail_end); #else diff --git a/sys/arch/arc/conf/GENERIC b/sys/arch/arc/conf/GENERIC index 262afdd595b..0cc5855093d 100644 --- a/sys/arch/arc/conf/GENERIC +++ b/sys/arch/arc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.7 1996/09/20 23:17:01 niklas Exp $ +# $OpenBSD: GENERIC,v 1.8 1996/09/24 19:37:26 pefo Exp $ # # Generic configuration file for MIPS R4x00 ARC Systems # @@ -56,7 +56,7 @@ options INET # Internet protocols options MACHINE_NONCONTIG # Support noncontigous memory. # Specify storage configuration (its a joke..) -config bsd swap generic +config bsd root on sd0 # # Definition of system diff --git a/sys/arch/arc/conf/Makefile.arc b/sys/arch/arc/conf/Makefile.arc index ba646119b03..501d8261246 100644 --- a/sys/arch/arc/conf/Makefile.arc +++ b/sys/arch/arc/conf/Makefile.arc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.arc,v 1.4 1996/08/26 10:52:24 pefo Exp $ +# $OpenBSD: Makefile.arc,v 1.5 1996/09/24 19:37:26 pefo Exp $ # @(#)Makefile.arc 8.2 (Berkeley) 2/16/94 # @@ -114,7 +114,7 @@ clean:: lint: /tmp param.c @lint -hbxn -DGENERIC -Dvolatile= ${COPTS} ${PARAM} -UKGDB \ - ${ARC}/arc/Locore.c ${CFILES} ${ARC}/arc/swapgeneric.c \ + ${ARC}/arc/Locore.c ${CFILES} \ ioconf.c param.c symbols.sort: ${ARC}/arc/symbols.raw diff --git a/sys/arch/arc/dti/desktech.h b/sys/arch/arc/dti/desktech.h index 41b0f713f13..18076961c5a 100644 --- a/sys/arch/arc/dti/desktech.h +++ b/sys/arch/arc/dti/desktech.h @@ -1,4 +1,4 @@ -/* $OpenBSD: desktech.h,v 1.2 1996/09/14 15:58:23 pefo Exp $ */ +/* $OpenBSD: desktech.h,v 1.3 1996/09/24 19:37:27 pefo Exp $ */ /* * Copyright (c) 1996 Per Fogelstrom @@ -59,10 +59,10 @@ #define TYNE_P_ISA_MEM (0x0100000000LL) /* ISA Memory control */ #define TYNE_V_ISA_MEM 0xe1000000 -#define TYNE_S_ISA_MEM 0x01000000 +#define TYNE_S_ISA_MEM 0x00100000 #define TYNE_P_BOUNCE (0x0100800000LL) /* Dma bounce buffer */ #define TYNE_V_BOUNCE 0xe2000000 -#define TYNE_S_BOUNCE 0x00020000 +#define TYNE_S_BOUNCE 0x00100000 #endif /* _DESKTECH_H_ */ |