CVS commit: src/sys/arch/cats/conf
Module Name:src Committed By: thorpej Date: Sun Jan 19 17:26:57 UTC 2020 Modified Files: src/sys/arch/cats/conf: INSTALL Log Message: Remove commented out "de* at pci? ..." (this is the only kernel config in the tree with any reference to that driver). To generate a diff of this commit: cvs rdiff -u -r1.111 -r1.112 src/sys/arch/cats/conf/INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/cats/conf/INSTALL diff -u src/sys/arch/cats/conf/INSTALL:1.111 src/sys/arch/cats/conf/INSTALL:1.112 --- src/sys/arch/cats/conf/INSTALL:1.111 Sun Jan 19 06:55:23 2020 +++ src/sys/arch/cats/conf/INSTALL Sun Jan 19 17:26:57 2020 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.111 2020/01/19 06:55:23 thorpej Exp $ +# $NetBSD: INSTALL,v 1.112 2020/01/19 17:26:57 thorpej Exp $ # # CATSINST -- CHALTECH CATS Install kernel # @@ -241,7 +241,6 @@ ne* at pci? dev ? function ? # NE2000 co #ntwoc* at pci? dev ? function ? # Riscom/N2 PCI Sync Serial sip* at pci? dev ? function ? # SiS 900 Ethernet #tl* at pci? dev ? function ? # ThunderLAN-based Ethernet -#de* at pci? dev ? function ? # DECchip 21x4x and clones tlp* at pci? dev ? function ? # DECchip 21x4x and clones vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet rtk* at pci? dev ? function ? # Realtek 8129/8139
CVS commit: src/sys/arch/cats/cats
Module Name:src
Committed By: skrll
Date: Fri Apr 26 07:32:41 UTC 2019
Modified Files:
src/sys/arch/cats/cats: cats_machdep.c
Log Message:
The free block after the kernel from arm32_bootmem_init doesn't
account for bt_memavail. Adjust for this.
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/cats/cats/cats_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/cats/cats/cats_machdep.c
diff -u src/sys/arch/cats/cats/cats_machdep.c:1.86 src/sys/arch/cats/cats/cats_machdep.c:1.87
--- src/sys/arch/cats/cats/cats_machdep.c:1.86 Tue Aug 15 08:52:41 2017
+++ src/sys/arch/cats/cats/cats_machdep.c Fri Apr 26 07:32:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cats_machdep.c,v 1.86 2017/08/15 08:52:41 maya Exp $ */
+/* $NetBSD: cats_machdep.c,v 1.87 2019/04/26 07:32:40 skrll Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.86 2017/08/15 08:52:41 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.87 2019/04/26 07:32:40 skrll Exp $");
#include "opt_ddb.h"
#include "opt_modular.h"
@@ -333,6 +333,24 @@ initarm(void *arm_bootargs)
arm32_bootmem_init(ebsabootinfo.bt_memstart, ram_size,
ebsabootinfo.bt_memstart);
+ /*
+ * The free block after the kernel from arm32_bootmem_init doesn't
+ * account for bt_memavail. Adjust for this.
+ */
+ extern struct bootmem_info bootmem_info;
+ struct bootmem_info * const bmi = _info;
+
+ pv_addr_t *pv0 = >bmi_freeblocks[0];
+ KASSERTMSG(pv0->pv_pa == bmi->bmi_kernelend,
+ "pv_pa %#lx kernelend %#lx", pv0->pv_pa, bmi->bmi_kernelend);
+
+ pv0->pv_pa = ebsabootinfo.bt_memavail;
+ pv0->pv_va = KERN_PHYSTOV(pv0->pv_pa);
+ pv0->pv_size = bmi->bmi_end - pv0->pv_pa;
+
+ printf("First freeblock adjusted to: %lx -> %lx\n", pv0->pv_pa,
+ pv0->pv_pa + pv0->pv_size - 1);
+
arm32_kernel_vm_init(KERNEL_VM_BASE, ARM_VECTORS_LOW, 0, cats_devmap,
mapallmem_p);
@@ -364,9 +382,6 @@ initarm(void *arm_bootargs)
ebsabootinfo.bt_pargp, VM_PROT_READ, PTE_CACHE);
}
- extern struct bootmem_info bootmem_info;
- struct bootmem_info * const bmi = _info;
-
printf("Doing freeblocks: %d\n", bmi->bmi_nfreeblocks);
for (size_t i = 0; i < bmi->bmi_nfreeblocks; i++) {
CVS commit: src/sys/arch/cats/conf
Module Name:src
Committed By: christos
Date: Mon Dec 31 13:30:17 UTC 2018
Modified Files:
src/sys/arch/cats/conf: Makefile.cats.inc
Log Message:
Switch to elf2aout for new binutils
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/cats/conf/Makefile.cats.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/cats/conf/Makefile.cats.inc
diff -u src/sys/arch/cats/conf/Makefile.cats.inc:1.35 src/sys/arch/cats/conf/Makefile.cats.inc:1.36
--- src/sys/arch/cats/conf/Makefile.cats.inc:1.35 Mon Aug 24 10:04:24 2015
+++ src/sys/arch/cats/conf/Makefile.cats.inc Mon Dec 31 08:30:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cats.inc,v 1.35 2015/08/24 14:04:24 uebayasi Exp $
+# $NetBSD: Makefile.cats.inc,v 1.36 2018/12/31 13:30:17 christos Exp $
MACHINE_ARCH?= arm
CPPFLAGS+= -D${MACHINE}
@@ -27,9 +27,14 @@ ${KERNLDSCRIPT}: \
OBJDUMP=${OBJDUMP} ${HOST_SH} $S/conf/mkldscript.sh \
${SYSTEM_OBJ} ; \
cat ${ARM}/conf/kern.ldscript.tail ) > $@
-
+.if ${HAVE_BINUTILS} == 227
SYSTEM_LD_TAIL_EXTRA+=; \
echo "${OBJCOPY} ${OBJCOPY_ELF2AOUT_FLAGS} $@ $@.aout"; \
${OBJCOPY} ${OBJCOPY_ELF2AOUT_FLAGS} $@ $@.aout
+.else
+SYSTEM_LD_TAIL_EXTRA+=; \
+ echo "${ARM_ELF2AOUT} $@ $@.aout"; \
+ ${ARM_ELF2AOUT} $@ $@.aout
+.endif
.endif
CVS commit: src/sys/arch/cats/cats
Module Name:src Committed By: maya Date: Tue Aug 15 08:52:41 UTC 2017 Modified Files: src/sys/arch/cats/cats: cats_machdep.c Log Message: remove unnecessary include. no aout code here! To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 src/sys/arch/cats/cats/cats_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/cats/cats/cats_machdep.c diff -u src/sys/arch/cats/cats/cats_machdep.c:1.85 src/sys/arch/cats/cats/cats_machdep.c:1.86 --- src/sys/arch/cats/cats/cats_machdep.c:1.85 Tue Aug 15 08:47:39 2017 +++ src/sys/arch/cats/cats/cats_machdep.c Tue Aug 15 08:52:41 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: cats_machdep.c,v 1.85 2017/08/15 08:47:39 maya Exp $ */ +/* $NetBSD: cats_machdep.c,v 1.86 2017/08/15 08:52:41 maya Exp $ */ /* * Copyright (c) 1997,1998 Mark Brinicombe. @@ -40,7 +40,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.85 2017/08/15 08:47:39 maya Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.86 2017/08/15 08:52:41 maya Exp $"); #include "opt_ddb.h" #include "opt_modular.h" @@ -53,7 +53,6 @@ __KERNEL_RCSID(0, "$NetBSD: cats_machdep #include #include #include -#include #include #include #include
CVS commit: src/sys/arch/cats/cats
Module Name:src
Committed By: maya
Date: Tue Aug 15 08:47:39 UTC 2017
Modified Files:
src/sys/arch/cats/cats: cats_machdep.c
Log Message:
Remove dead code. it isn't possible to do non-__ELF__ builds
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/cats/cats/cats_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/cats/cats/cats_machdep.c
diff -u src/sys/arch/cats/cats/cats_machdep.c:1.84 src/sys/arch/cats/cats/cats_machdep.c:1.85
--- src/sys/arch/cats/cats/cats_machdep.c:1.84 Tue Jun 13 15:24:05 2017
+++ src/sys/arch/cats/cats/cats_machdep.c Tue Aug 15 08:47:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cats_machdep.c,v 1.84 2017/06/13 15:24:05 skrll Exp $ */
+/* $NetBSD: cats_machdep.c,v 1.85 2017/08/15 08:47:39 maya Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.84 2017/06/13 15:24:05 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.85 2017/08/15 08:47:39 maya Exp $");
#include "opt_ddb.h"
#include "opt_modular.h"
@@ -467,18 +467,6 @@ initarm(void *arm_bootargs)
fcomcndetach();
#endif
-
-#if NKSYMS || defined(DDB) || defined(MODULAR)
-#ifndef __ELF__ /* XXX */
- {
- extern int end;
- extern int *esym;
-
- ksyms_addsyms_elf(*(int *), ((int *)) + 1, esym);
- }
-#endif /* __ELF__ */
-#endif
-
#ifdef DDB
db_machine_init();
if (boothowto & RB_KDB)
CVS commit: src/sys/arch/cats/conf
Module Name:src Committed By: skrll Date: Sat Jul 8 15:14:49 UTC 2017 Removed Files: src/sys/arch/cats/conf: kern.ldscript Log Message: Remove unused script To generate a diff of this commit: cvs rdiff -u -r1.5 -r0 src/sys/arch/cats/conf/kern.ldscript Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/cats/conf
Module Name:src Committed By: skrll Date: Sun Jun 25 10:06:27 UTC 2017 Modified Files: src/sys/arch/cats/conf: GENERIC Log Message: Comment out a bunch of thing so that a GENERIC kernel boots on my cats with cyclone firmware To generate a diff of this commit: cvs rdiff -u -r1.161 -r1.162 src/sys/arch/cats/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/cats/conf/GENERIC diff -u src/sys/arch/cats/conf/GENERIC:1.161 src/sys/arch/cats/conf/GENERIC:1.162 --- src/sys/arch/cats/conf/GENERIC:1.161 Tue Dec 13 20:42:16 2016 +++ src/sys/arch/cats/conf/GENERIC Sun Jun 25 10:06:27 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.161 2016/12/13 20:42:16 christos Exp $ +# $NetBSD: GENERIC,v 1.162 2017/06/25 10:06:27 skrll Exp $ # # GENERIC machine description file # @@ -53,22 +53,22 @@ makeoptions CPUFLAGS="-march=armv4 -mtun # File systems file-system FFS # UFS -file-system LFS # log-structured file system +#file-system LFS # log-structured file system file-system MFS # memory file system file-system NFS # Network file system -file-system ADOSFS # AmigaDOS-compatible file system -file-system EXT2FS # second extended file system (linux) +#file-system ADOSFS # AmigaDOS-compatible file system +#file-system EXT2FS # second extended file system (linux) file-system CD9660 # ISO 9660 + Rock Ridge file system file-system MSDOSFS # MS-DOS file system file-system FDESC # /dev/fd file-system KERNFS # /kern file-system NULLFS # loopback file system -file-system OVERLAY # overlay filesystem +#file-system OVERLAY # overlay filesystem file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs) file-system PROCFS # /proc file-system UMAPFS # NULLFS + uid and gid remapping file-system UNION # union file system -file-system CODA # Coda File System; also needs vcode (below) +#file-system CODA # Coda File System; also needs vcode (below) file-system PTYFS # /dev/pts/N support file-system TMPFS # Efficient memory file-system #file-system UDF # experimental - OSTA UDF CD/DVD file-system @@ -92,7 +92,7 @@ options INET6 # IPV6 #options IPSEC_DEBUG # debug for IP security #options MROUTING # IP multicast routing #options PIM # Protocol Independent Multicast -options NETATALK # AppleTalk networking +#options NETATALK # AppleTalk networking options PPP_BSDCOMP # BSD-Compress compression support for PPP options PPP_DEFLATE # Deflate compression support for PPP options PPP_FILTER # Active filter support for PPP (requires bpf) @@ -154,7 +154,7 @@ options SYSVSHM # System V-like memory # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) -options IRQSTATS # manage IRQ statistics +#options IRQSTATS # manage IRQ statistics options SCSIVERBOSE # Verbose SCSI errors options PCIVERBOSE # Verbose PCI descriptions options MIIVERBOSE # verbose PHY autoconfig messages @@ -221,8 +221,8 @@ ppb* at pci? dev ? function ? # PCI-PCI # Cryptographic Devices # PCI cryptographic devices -hifn* at pci? dev ? function ? # Hifn 7755/7811/795x -ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x +#hifn* at pci? dev ? function ? # Hifn 7755/7811/795x +#ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x # PCI serial interfaces @@ -233,29 +233,29 @@ ubsec* at pci? dev ? function ? # Broadc #lpt* at puc? port ? # || ports on "universal" comm boards # PCI SCSI Controllers and Buses -adv* at pci? dev ? function ? # AdvanSys 1200[A,B], ULTRA SCSI -scsibus* at adv? +#adv* at pci? dev ? function ? # AdvanSys 1200[A,B], ULTRA SCSI +#scsibus* at adv? #adw* at pci? dev ? function ? # AdvanSys 9xxUW SCSI #scsibus* at adw? -ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI controllers -scsibus* at ahc? +#ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI controllers +#scsibus* at ahc? #bha* at pci? dev ? function ? # BusLogic 9xx SCSI #scsibus* at bha? -iha* at pci? dev ? function ? # Initio INIC-940/950 SCSI -scsibus* at iha? +#iha* at pci? dev ? function ? # Initio INIC-940/950 SCSI +#scsibus* at iha? #isp* at pci? dev ? function ? # Qlogic ISP 10x0 SCSI controllers #scsibus* at isp? -pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI -scsibus* at pcscp? -siop* at pci? dev ? function ? # NCR 53c8xx SCSI -scsibus* at siop? -esiop* at pci? dev ? function ? # NCR 53c875 SCSI and newer -scsibus* at esiop? +#pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI +#scsibus* at pcscp? +#siop* at pci? dev ? function ? # NCR 53c8xx SCSI +#scsibus* at siop? +#esiop* at pci? dev ? function ? # NCR 53c875 SCSI and newer +#scsibus* at esiop? # SCSI devices -sd* at scsibus? target ? lun ? # SCSI disk drives -st* at scsibus? target ? lun ? # SCSI tape drives -cd* at scsibus? target ? lun ? # SCSI CD-ROM drives +#sd* at scsibus? target ? lun ? # SCSI disk
CVS commit: src/sys/arch/cats/cats
Module Name:src Committed By: skrll Date: Tue Jun 13 15:24:05 UTC 2017 Modified Files: src/sys/arch/cats/cats: cats_machdep.c Log Message: Now that bus_space can use devmap - use it for early console To generate a diff of this commit: cvs rdiff -u -r1.83 -r1.84 src/sys/arch/cats/cats/cats_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/cats/cats/cats_machdep.c diff -u src/sys/arch/cats/cats/cats_machdep.c:1.83 src/sys/arch/cats/cats/cats_machdep.c:1.84 --- src/sys/arch/cats/cats/cats_machdep.c:1.83 Sun Mar 19 12:46:21 2017 +++ src/sys/arch/cats/cats/cats_machdep.c Tue Jun 13 15:24:05 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: cats_machdep.c,v 1.83 2017/03/19 12:46:21 skrll Exp $ */ +/* $NetBSD: cats_machdep.c,v 1.84 2017/06/13 15:24:05 skrll Exp $ */ /* * Copyright (c) 1997,1998 Mark Brinicombe. @@ -40,7 +40,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.83 2017/03/19 12:46:21 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.84 2017/06/13 15:24:05 skrll Exp $"); #include "opt_ddb.h" #include "opt_modular.h" @@ -266,7 +266,7 @@ initarm(void *arm_bootargs) pmap_devmap_bootstrap((vaddr_t)ebsabootinfo.bt_l1, cats_devmap); #ifdef FCOM_INIT_ARM - fcomcnattach(DC21285_ARMCSR_BASE, comcnspeed, comcnmode); + fcomcnattach(DC21285_ARMCSR_VBASE, comcnspeed, comcnmode); #endif /* Talk to the user */
CVS commit: src/sys/arch/cats/cats
Module Name:src
Committed By: skrll
Date: Sun Mar 19 12:46:21 UTC 2017
Modified Files:
src/sys/arch/cats/cats: cats_machdep.c
Log Message:
Support __HAVE_MM_MD_DIRECT_MAPPED_PHYS
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/cats/cats/cats_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/cats/cats/cats_machdep.c
diff -u src/sys/arch/cats/cats/cats_machdep.c:1.82 src/sys/arch/cats/cats/cats_machdep.c:1.83
--- src/sys/arch/cats/cats/cats_machdep.c:1.82 Fri Apr 4 07:33:53 2014
+++ src/sys/arch/cats/cats/cats_machdep.c Sun Mar 19 12:46:21 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cats_machdep.c,v 1.82 2014/04/04 07:33:53 skrll Exp $ */
+/* $NetBSD: cats_machdep.c,v 1.83 2017/03/19 12:46:21 skrll Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.82 2014/04/04 07:33:53 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.83 2017/03/19 12:46:21 skrll Exp $");
#include "opt_ddb.h"
#include "opt_modular.h"
@@ -301,12 +301,41 @@ initarm(void *arm_bootargs)
*/
process_kernel_args(ebsabootinfo.bt_args);
- arm32_bootmem_init(ebsabootinfo.bt_memstart,
- ebsabootinfo.bt_memend - ebsabootinfo.bt_memstart,
+ psize_t ram_size = ebsabootinfo.bt_memend - ebsabootinfo.bt_memstart;
+ /*
+ * If MEMSIZE specified less than what we really have, limit ourselves
+ * to that.
+ */
+#ifdef MEMSIZE
+ if (ram_size == 0 || ram_size > (unsigned)MEMSIZE * 1024 * 1024)
+ ram_size = (unsigned)MEMSIZE * 1024 * 1024;
+ DPRINTF("ram_size = 0x%x\n", (int)ram_size);
+#else
+ KASSERTMSG(ram_size > 0, "RAM size unknown and MEMSIZE undefined");
+#endif
+
+#ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS
+ const bool mapallmem_p = true;
+
+#ifndef PMAP_NEED_ALLOC_POOLPAGE
+ if (ram_size > KERNEL_VM_BASE - KERNEL_BASE) {
+ printf("%s: dropping RAM size from %luMB to %uMB\n",
+ __func__, (unsigned long) (ram_size >> 20),
+ (KERNEL_VM_BASE - KERNEL_BASE) >> 20);
+ ram_size = KERNEL_VM_BASE - KERNEL_BASE;
+}
+#endif
+#else
+const bool mapallmem_p = false;
+#endif
+
+ printf("ram_size = 0x%08lx\n", ram_size);
+
+ arm32_bootmem_init(ebsabootinfo.bt_memstart, ram_size,
ebsabootinfo.bt_memstart);
arm32_kernel_vm_init(KERNEL_VM_BASE, ARM_VECTORS_LOW, 0, cats_devmap,
- false);
+ mapallmem_p);
printf("init subsystems: patch ");
CVS commit: src/sys/arch/cats/conf
Module Name:src
Committed By: uebayasi
Date: Thu Aug 20 06:20:19 UTC 2015
Modified Files:
src/sys/arch/cats/conf: Makefile.cats.inc
Log Message:
Use variables where appropriate.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/cats/conf/Makefile.cats.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/cats/conf/Makefile.cats.inc
diff -u src/sys/arch/cats/conf/Makefile.cats.inc:1.33 src/sys/arch/cats/conf/Makefile.cats.inc:1.34
--- src/sys/arch/cats/conf/Makefile.cats.inc:1.33 Wed Aug 19 04:53:03 2015
+++ src/sys/arch/cats/conf/Makefile.cats.inc Thu Aug 20 06:20:19 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cats.inc,v 1.33 2015/08/19 04:53:03 uebayasi Exp $
+# $NetBSD: Makefile.cats.inc,v 1.34 2015/08/20 06:20:19 uebayasi Exp $
MACHINE_ARCH?= arm
CPPFLAGS+= -D${MACHINE}
@@ -18,7 +18,7 @@ LOADADDRESS= 0xF020
KERNLDSCRIPT= ldscript
EXTRA_CLEAN+= ${KERNLDSCRIPT}
-ldscript: \
+${KERNLDSCRIPT}: \
${ARM}/conf/kern.ldscript.head \
${ARM}/conf/kern.ldscript.tail \
$S/conf/mkldscript.sh \
@@ -26,7 +26,7 @@ ldscript: \
( cat ${ARM}/conf/kern.ldscript.head ; \
OBJDUMP=${OBJDUMP} ${HOST_SH} $S/conf/mkldscript.sh \
${SYSTEM_OBJ} ; \
- cat ${ARM}/conf/kern.ldscript.tail ) ldscript
+ cat ${ARM}/conf/kern.ldscript.tail ) $@
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${OBJCOPY} ${OBJCOPY_ELF2AOUT_FLAGS} $@ $@.aout; \
CVS commit: src/sys/arch/cats/conf
Module Name:src
Committed By: uebayasi
Date: Fri Aug 21 03:42:29 UTC 2015
Modified Files:
src/sys/arch/cats/conf: ldscript.elf
Log Message:
Simplify this by deciding load address at one place.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/cats/conf/ldscript.elf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/cats/conf/ldscript.elf
diff -u src/sys/arch/cats/conf/ldscript.elf:1.4 src/sys/arch/cats/conf/ldscript.elf:1.5
--- src/sys/arch/cats/conf/ldscript.elf:1.4 Thu Aug 20 07:00:48 2015
+++ src/sys/arch/cats/conf/ldscript.elf Fri Aug 21 03:42:29 2015
@@ -1,28 +1,24 @@
-/* $NetBSD: ldscript.elf,v 1.4 2015/08/20 07:00:48 uebayasi Exp $ */
+/* $NetBSD: ldscript.elf,v 1.5 2015/08/21 03:42:29 uebayasi Exp $ */
OUTPUT_ARCH(arm)
ENTRY(KERNEL_BASE_phys)
SECTIONS
{
- KERNEL_BASE_phys = 0xF000;
- KERNEL_BASE_virt = 0xF000;
-
/* Kernel start: */
- .start (KERNEL_BASE_phys) :
+ .start :
{
*(.start)
- } =0
+ }
/* Read-only sections, merged into text segment: */
- .text (KERNEL_BASE_virt + SIZEOF(.start)) :
- AT (LOADADDR(.start) + SIZEOF(.start))
+ .text :
{
*(.text)
*(.text.*)
*(.stub)
*(.glue_7t) *(.glue_7)
*(.rodata) *(.rodata.*)
- } =0
+ }
PROVIDE (__etext = .);
PROVIDE (_etext = .);
PROVIDE (etext = .);
@@ -30,14 +26,12 @@ SECTIONS
boundary. */
. = ALIGN(0x8000);
.data:
- AT (LOADADDR(.text) + (ADDR(.data) - ADDR(.text)))
{
__data_start = . ;
*(.data)
*(.data.*)
}
.sdata :
- AT (LOADADDR(.data) + (ADDR(.sdata) - ADDR(.data)))
{
*(.sdata)
*(.sdata.*)
@@ -73,3 +67,19 @@ SECTIONS
_bss_end__ = . ; __bss_end__ = . ; __end__ = . ;
PROVIDE (end = .);
}
+SECTIONS
+{
+ KERNEL_BASE_phys = 0xF000;
+ KERNEL_BASE_virt = 0xF000;
+
+ .start (KERNEL_BASE_phys) :
+ {
+*(.start)
+ } =0
+
+ .text (KERNEL_BASE_virt + SIZEOF(.start)) :
+ AT (LOADADDR(.start) + SIZEOF(.start))
+ {
+*(.text)
+ } =0
+}
CVS commit: src/sys/arch/cats/conf
Module Name:src
Committed By: uebayasi
Date: Wed Aug 19 04:15:22 UTC 2015
Modified Files:
src/sys/arch/cats/conf: Makefile.cats.inc
Log Message:
Define the rule to generate the dynamic `ldscript', depending on
${SYSTEM_OBJS} properly. Don't forget cleaning the generated `ldscript'.
One less ${SYSTEM_LD_HEAD_EXTRA} use as a bonus.
No binary changes in ldscript/kernel files are observed.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/cats/conf/Makefile.cats.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/cats/conf/Makefile.cats.inc
diff -u src/sys/arch/cats/conf/Makefile.cats.inc:1.31 src/sys/arch/cats/conf/Makefile.cats.inc:1.32
--- src/sys/arch/cats/conf/Makefile.cats.inc:1.31 Tue Nov 25 12:02:20 2014
+++ src/sys/arch/cats/conf/Makefile.cats.inc Wed Aug 19 04:15:22 2015
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.cats.inc,v 1.31 2014/11/25 12:02:20 skrll Exp $
+# $NetBSD: Makefile.cats.inc,v 1.32 2015/08/19 04:15:22 uebayasi Exp $
MACHINE_ARCH?= arm
CPPFLAGS+= -D${MACHINE}
.if defined(ABLEELF) (${ABLEELF} == 1)
# use a standard ELF format, adjusted to align areas
-LINKSCRIPT= -T ${THISARM}/conf/ldscript.elf
+KERNLDSCRIPT= ${THISARM}/conf/ldscript.elf
.else
# Need to convert the kernel from ELF to a.out so that the firmware
@@ -16,16 +16,22 @@ CFLAGS+= -fno-unwind-tables
LINKSCRIPT= -T ldscript
LOADADDRESS= 0xF020
-SYSTEM_LD_HEAD_EXTRA+=; \
+KERNLDSCRIPT= ldscript
+EXTRA_CLEAN+= ${KERNLDSCRIPT}
+
+ldscript: \
+${ARM}/conf/kern.ldscript.head \
+${ARM}/conf/kern.ldscript.tail \
+$S/conf/mkldscript.sh \
+${SYSTEM_OBJ}
( cat ${ARM}/conf/kern.ldscript.head ; \
OBJDUMP=${OBJDUMP} ${HOST_SH} $S/conf/mkldscript.sh \
${SYSTEM_OBJ} ; \
cat ${ARM}/conf/kern.ldscript.tail ) ldscript
-KERNLDSCRIPT= ${ARM}/conf/kern.ldscript.head \
- $S/conf/mkldscript.sh \
- ${ARM}/conf/kern.ldscript.tail
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${OBJCOPY} ${OBJCOPY_ELF2AOUT_FLAGS} $@ $@.aout; \
${OBJCOPY} ${OBJCOPY_ELF2AOUT_FLAGS} $@ $@.aout
.endif
+
+LINKSCRIPT= -T ${KERNLDSCRIPT}
CVS commit: src/sys/arch/cats/conf
Module Name:src
Committed By: uebayasi
Date: Wed Aug 19 04:53:04 UTC 2015
Modified Files:
src/sys/arch/cats/conf: Makefile.cats.inc
Log Message:
Tweak previous.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/cats/conf/Makefile.cats.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/cats/conf/Makefile.cats.inc
diff -u src/sys/arch/cats/conf/Makefile.cats.inc:1.32 src/sys/arch/cats/conf/Makefile.cats.inc:1.33
--- src/sys/arch/cats/conf/Makefile.cats.inc:1.32 Wed Aug 19 04:15:22 2015
+++ src/sys/arch/cats/conf/Makefile.cats.inc Wed Aug 19 04:53:03 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cats.inc,v 1.32 2015/08/19 04:15:22 uebayasi Exp $
+# $NetBSD: Makefile.cats.inc,v 1.33 2015/08/19 04:53:03 uebayasi Exp $
MACHINE_ARCH?= arm
CPPFLAGS+= -D${MACHINE}
@@ -13,7 +13,6 @@ KERNLDSCRIPT= ${THISARM}/conf/ldscript.e
CFLAGS+= -fno-unwind-tables
-LINKSCRIPT= -T ldscript
LOADADDRESS= 0xF020
KERNLDSCRIPT= ldscript
CVS commit: src/sys/arch/cats/conf
Module Name:src
Committed By: skrll
Date: Tue Nov 25 12:02:20 UTC 2014
Modified Files:
src/sys/arch/cats/conf: Makefile.cats.inc
Log Message:
Explicitly set LOADADDRESS, the linker script hack is overriden by
command line arguments now.
Hi uebs!
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/cats/conf/Makefile.cats.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/cats/conf/Makefile.cats.inc
diff -u src/sys/arch/cats/conf/Makefile.cats.inc:1.30 src/sys/arch/cats/conf/Makefile.cats.inc:1.31
--- src/sys/arch/cats/conf/Makefile.cats.inc:1.30 Sun Nov 16 12:02:55 2014
+++ src/sys/arch/cats/conf/Makefile.cats.inc Tue Nov 25 12:02:20 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cats.inc,v 1.30 2014/11/16 12:02:55 uebayasi Exp $
+# $NetBSD: Makefile.cats.inc,v 1.31 2014/11/25 12:02:20 skrll Exp $
MACHINE_ARCH?= arm
CPPFLAGS+= -D${MACHINE}
@@ -14,6 +14,7 @@ LINKSCRIPT= -T ${THISARM}/conf/ldscript.
CFLAGS+= -fno-unwind-tables
LINKSCRIPT= -T ldscript
+LOADADDRESS= 0xF020
SYSTEM_LD_HEAD_EXTRA+=; \
( cat ${ARM}/conf/kern.ldscript.head ; \
CVS commit: src/sys/arch/cats/conf
Module Name:src
Committed By: uebayasi
Date: Sat Nov 15 14:02:19 UTC 2014
Modified Files:
src/sys/arch/cats/conf: Makefile.cats.inc
Log Message:
Use LINKSCRIPT.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/cats/conf/Makefile.cats.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/cats/conf/Makefile.cats.inc
diff -u src/sys/arch/cats/conf/Makefile.cats.inc:1.28 src/sys/arch/cats/conf/Makefile.cats.inc:1.29
--- src/sys/arch/cats/conf/Makefile.cats.inc:1.28 Thu Nov 13 15:03:06 2014
+++ src/sys/arch/cats/conf/Makefile.cats.inc Sat Nov 15 14:02:19 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.cats.inc,v 1.28 2014/11/13 15:03:06 uebayasi Exp $
+# $NetBSD: Makefile.cats.inc,v 1.29 2014/11/15 14:02:19 uebayasi Exp $
MACHINE_ARCH?= arm
CPPFLAGS+= -D${MACHINE}
.if defined(ABLEELF) (${ABLEELF} == 1)
# use a standard ELF format, adjusted to align areas
-LINKFLAGS= -T ${THISARM}/conf/ldscript.elf
+LINKSCRIPT= -T ${THISARM}/conf/ldscript.elf
.else
# Need to convert the kernel from ELF to a.out so that the firmware
@@ -13,7 +13,7 @@ LINKFLAGS= -T ${THISARM}/conf/ldscript.e
CFLAGS+= -fno-unwind-tables
-LINKFLAGS= -T ldscript
+LINKSCRIPT= -T ldscript
SYSTEM_LD_HEAD_EXTRA+=; \
( cat ${ARM}/conf/kern.ldscript.head ; \
CVS commit: src/sys/arch/cats
Module Name:src
Committed By: skrll
Date: Fri Apr 4 06:04:54 UTC 2014
Modified Files:
src/sys/arch/cats/cats: cats_machdep.c
src/sys/arch/cats/conf: files.cats
Log Message:
Revert previous - it wasn't complete.
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/cats/cats/cats_machdep.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/cats/conf/files.cats
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/cats/cats/cats_machdep.c
diff -u src/sys/arch/cats/cats/cats_machdep.c:1.79 src/sys/arch/cats/cats/cats_machdep.c:1.80
--- src/sys/arch/cats/cats/cats_machdep.c:1.79 Wed Apr 2 17:36:05 2014
+++ src/sys/arch/cats/cats/cats_machdep.c Fri Apr 4 06:04:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cats_machdep.c,v 1.79 2014/04/02 17:36:05 skrll Exp $ */
+/* $NetBSD: cats_machdep.c,v 1.80 2014/04/04 06:04:54 skrll Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cats_machdep.c,v 1.79 2014/04/02 17:36:05 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: cats_machdep.c,v 1.80 2014/04/04 06:04:54 skrll Exp $);
#include opt_ddb.h
#include opt_modular.h
@@ -74,8 +74,6 @@ __KERNEL_RCSID(0, $NetBSD: cats_machdep
#include arm/locore.h
#include arm/undefined.h
#include arm/arm32/machdep.h
-
-#include machine/pmap.h
#include machine/cyclone_boot.h
#include arm/footbridge/dc21285mem.h
@@ -118,11 +116,30 @@ static char bootargs[MAX_BOOT_STRING + 1
char *boot_args = NULL;
char *boot_file = NULL;
+vm_offset_t physical_start;
+vm_offset_t physical_freestart;
+vm_offset_t physical_freeend;
+vm_offset_t physical_end;
+u_int free_pages;
+vm_offset_t pagetables_start;
+
+vm_offset_t msgbufphys;
#ifdef PMAP_DEBUG
extern int pmap_debug_level;
#endif
+#define KERNEL_PT_SYS 0 /* L2 table for mapping zero page */
+#define KERNEL_PT_KERNEL 1 /* L2 table for mapping kernel */
+#define KERNEL_PT_KERNEL_NUM 2
+
+/* now this could move into something more generic */
+ /* L2 tables for mapping kernel VM */
+#define KERNEL_PT_VMDATA (KERNEL_PT_KERNEL + KERNEL_PT_KERNEL_NUM)
+#define KERNEL_PT_VMDATA_NUM 4 /* 16MB kernel VM !*/
+#define NUM_KERNEL_PTS (KERNEL_PT_VMDATA + KERNEL_PT_VMDATA_NUM)
+
+pv_addr_t kernel_pt_table[NUM_KERNEL_PTS];
/* Prototypes */
@@ -173,7 +190,88 @@ extern void configure(void);
int comcnspeed = CONSPEED;
int comcnmode = CONMODE;
-static const struct pmap_devmap cats_devmap[] = {
+
+/*
+ * void cpu_reboot(int howto, char *bootstr)
+ *
+ * Reboots the system
+ *
+ * Deal with any syncing, unmounting, dumping and shutdown hooks,
+ * then reset the CPU.
+ */
+
+void
+cpu_reboot(int howto, char *bootstr)
+{
+#ifdef DIAGNOSTIC
+ /* info */
+ printf(boot: howto=%08x curlwp=%p\n, howto, curlwp);
+#endif
+
+ /*
+ * If we are still cold then hit the air brakes
+ * and crash to earth fast
+ */
+ if (cold) {
+ doshutdownhooks();
+ pmf_system_shutdown(boothowto);
+ printf(The operating system has halted.\n);
+ printf(Please press any key to reboot.\n\n);
+ cngetc();
+ printf(rebooting...\n);
+ cpu_reset();
+ /*NOTREACHED*/
+ }
+
+ /* Disable console buffering */
+/* cnpollc(1);*/
+
+ /*
+ * If RB_NOSYNC was not specified sync the discs.
+ * Note: Unless cold is set to 1 here, syslogd will die during the unmount.
+ * It looks like syslogd is getting woken up only to find that it cannot
+ * page part of the binary in as the filesystem has been unmounted.
+ */
+ if (!(howto RB_NOSYNC))
+ bootsync();
+
+ /* Say NO to interrupts */
+ splhigh();
+
+ /* Do a dump if requested. */
+ if ((howto (RB_DUMP | RB_HALT)) == RB_DUMP)
+ dumpsys();
+
+ /* Run any shutdown hooks */
+ doshutdownhooks();
+
+ pmf_system_shutdown(boothowto);
+
+ /* Make sure IRQ's are disabled */
+ IRQdisable;
+
+ if (howto RB_HALT) {
+ printf(The operating system has halted.\n);
+ printf(Please press any key to reboot.\n\n);
+ cngetc();
+ }
+
+ printf(rebooting...\n);
+ cpu_reset();
+ /*NOTREACHED*/
+}
+
+/*
+ * Mapping table for core kernel memory. This memory is mapped at init
+ * time with section mappings.
+ */
+struct l1_sec_map {
+ vm_offset_t va;
+ vm_offset_t pa;
+ vm_size_t size;
+ vm_prot_t prot;
+ int cache;
+} l1_sec_table[] = {
/* Map 1MB for CSR space */
{ DC21285_ARMCSR_VBASE, DC21285_ARMCSR_BASE,
DC21285_ARMCSR_VSIZE, VM_PROT_READ|VM_PROT_WRITE,
@@ -212,14 +310,6 @@ static const struct pmap_devmap cats_dev
{ 0, 0, 0, 0, 0 }
};
-#define MAX_PHYSMEM 4
-static struct boot_physmem cats_physmem[MAX_PHYSMEM];
-int ncats_physmem = 0;
-
-extern struct bus_space footbridge_pci_io_bs_tag;
-extern struct bus_space footbridge_pci_mem_bs_tag;
-void footbridge_pci_bs_tag_init(void);
-
/*
* u_int initarm(struct ebsaboot *bootinfo)
*
@@ -238,6 +328,9 @@ u_int
initarm(void *arm_bootargs)
{
struct ebsaboot *bootinfo = arm_bootargs;
+ int loop;
+ int loop1;
+
CVS commit: src/sys/arch/cats/cats
Module Name:src Committed By: skrll Date: Fri Apr 4 06:25:00 UTC 2014 Modified Files: src/sys/arch/cats/cats: cats_machdep.c Log Message: whitespace. To generate a diff of this commit: cvs rdiff -u -r1.80 -r1.81 src/sys/arch/cats/cats/cats_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/cats/cats/cats_machdep.c diff -u src/sys/arch/cats/cats/cats_machdep.c:1.80 src/sys/arch/cats/cats/cats_machdep.c:1.81 --- src/sys/arch/cats/cats/cats_machdep.c:1.80 Fri Apr 4 06:04:54 2014 +++ src/sys/arch/cats/cats/cats_machdep.c Fri Apr 4 06:25:00 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: cats_machdep.c,v 1.80 2014/04/04 06:04:54 skrll Exp $ */ +/* $NetBSD: cats_machdep.c,v 1.81 2014/04/04 06:25:00 skrll Exp $ */ /* * Copyright (c) 1997,1998 Mark Brinicombe. @@ -40,7 +40,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cats_machdep.c,v 1.80 2014/04/04 06:04:54 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: cats_machdep.c,v 1.81 2014/04/04 06:25:00 skrll Exp $); #include opt_ddb.h #include opt_modular.h @@ -359,7 +359,7 @@ initarm(void *arm_bootargs) * and not have to worry about things moving. */ #ifdef FCOM_INIT_ARM - fcomcnattach(DC21285_ARMCSR_BASE, comcnspeed, comcnmode); + fcomcnattach(DC21285_ARMCSR_BASE, comcnspeed, comcnmode); #endif /* Talk to the user */
CVS commit: src/sys/arch/cats
Module Name:src
Committed By: skrll
Date: Fri Apr 4 07:33:53 UTC 2014
Modified Files:
src/sys/arch/cats/cats: cats_machdep.c
src/sys/arch/cats/conf: files.cats
Log Message:
Convert cats to the new world order, i.e. arm32_{bootmem,kernel_vm}_init.
Make VERBOSE_INIT_ARM work while I'm here.
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/cats/cats/cats_machdep.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/cats/conf/files.cats
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/cats/cats/cats_machdep.c
diff -u src/sys/arch/cats/cats/cats_machdep.c:1.81 src/sys/arch/cats/cats/cats_machdep.c:1.82
--- src/sys/arch/cats/cats/cats_machdep.c:1.81 Fri Apr 4 06:25:00 2014
+++ src/sys/arch/cats/cats/cats_machdep.c Fri Apr 4 07:33:53 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cats_machdep.c,v 1.81 2014/04/04 06:25:00 skrll Exp $ */
+/* $NetBSD: cats_machdep.c,v 1.82 2014/04/04 07:33:53 skrll Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cats_machdep.c,v 1.81 2014/04/04 06:25:00 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: cats_machdep.c,v 1.82 2014/04/04 07:33:53 skrll Exp $);
#include opt_ddb.h
#include opt_modular.h
@@ -74,7 +74,7 @@ __KERNEL_RCSID(0, $NetBSD: cats_machdep
#include arm/locore.h
#include arm/undefined.h
#include arm/arm32/machdep.h
-
+
#include machine/cyclone_boot.h
#include arm/footbridge/dc21285mem.h
#include arm/footbridge/dc21285reg.h
@@ -116,30 +116,11 @@ static char bootargs[MAX_BOOT_STRING + 1
char *boot_args = NULL;
char *boot_file = NULL;
-vm_offset_t physical_start;
-vm_offset_t physical_freestart;
-vm_offset_t physical_freeend;
-vm_offset_t physical_end;
-u_int free_pages;
-vm_offset_t pagetables_start;
-
-vm_offset_t msgbufphys;
#ifdef PMAP_DEBUG
extern int pmap_debug_level;
#endif
-#define KERNEL_PT_SYS 0 /* L2 table for mapping zero page */
-#define KERNEL_PT_KERNEL 1 /* L2 table for mapping kernel */
-#define KERNEL_PT_KERNEL_NUM 2
-
-/* now this could move into something more generic */
- /* L2 tables for mapping kernel VM */
-#define KERNEL_PT_VMDATA (KERNEL_PT_KERNEL + KERNEL_PT_KERNEL_NUM)
-#define KERNEL_PT_VMDATA_NUM 4 /* 16MB kernel VM !*/
-#define NUM_KERNEL_PTS (KERNEL_PT_VMDATA + KERNEL_PT_VMDATA_NUM)
-
-pv_addr_t kernel_pt_table[NUM_KERNEL_PTS];
/* Prototypes */
@@ -190,88 +171,7 @@ extern void configure(void);
int comcnspeed = CONSPEED;
int comcnmode = CONMODE;
-
-/*
- * void cpu_reboot(int howto, char *bootstr)
- *
- * Reboots the system
- *
- * Deal with any syncing, unmounting, dumping and shutdown hooks,
- * then reset the CPU.
- */
-
-void
-cpu_reboot(int howto, char *bootstr)
-{
-#ifdef DIAGNOSTIC
- /* info */
- printf(boot: howto=%08x curlwp=%p\n, howto, curlwp);
-#endif
-
- /*
- * If we are still cold then hit the air brakes
- * and crash to earth fast
- */
- if (cold) {
- doshutdownhooks();
- pmf_system_shutdown(boothowto);
- printf(The operating system has halted.\n);
- printf(Please press any key to reboot.\n\n);
- cngetc();
- printf(rebooting...\n);
- cpu_reset();
- /*NOTREACHED*/
- }
-
- /* Disable console buffering */
-/* cnpollc(1);*/
-
- /*
- * If RB_NOSYNC was not specified sync the discs.
- * Note: Unless cold is set to 1 here, syslogd will die during the unmount.
- * It looks like syslogd is getting woken up only to find that it cannot
- * page part of the binary in as the filesystem has been unmounted.
- */
- if (!(howto RB_NOSYNC))
- bootsync();
-
- /* Say NO to interrupts */
- splhigh();
-
- /* Do a dump if requested. */
- if ((howto (RB_DUMP | RB_HALT)) == RB_DUMP)
- dumpsys();
-
- /* Run any shutdown hooks */
- doshutdownhooks();
-
- pmf_system_shutdown(boothowto);
-
- /* Make sure IRQ's are disabled */
- IRQdisable;
-
- if (howto RB_HALT) {
- printf(The operating system has halted.\n);
- printf(Please press any key to reboot.\n\n);
- cngetc();
- }
-
- printf(rebooting...\n);
- cpu_reset();
- /*NOTREACHED*/
-}
-
-/*
- * Mapping table for core kernel memory. This memory is mapped at init
- * time with section mappings.
- */
-struct l1_sec_map {
- vm_offset_t va;
- vm_offset_t pa;
- vm_size_t size;
- vm_prot_t prot;
- int cache;
-} l1_sec_table[] = {
+static const struct pmap_devmap cats_devmap[] = {
/* Map 1MB for CSR space */
{ DC21285_ARMCSR_VBASE, DC21285_ARMCSR_BASE,
DC21285_ARMCSR_VSIZE, VM_PROT_READ|VM_PROT_WRITE,
@@ -310,6 +210,14 @@ struct l1_sec_map {
{ 0, 0, 0, 0, 0 }
};
+#define MAX_PHYSMEM 4
+static struct boot_physmem cats_physmem[MAX_PHYSMEM];
+int ncats_physmem = 0;
+
+extern struct bus_space footbridge_pci_io_bs_tag;
+extern struct bus_space footbridge_pci_mem_bs_tag;
+void footbridge_pci_bs_tag_init(void);
+
/*
* u_int initarm(struct ebsaboot *bootinfo)
*
@@ -328,9 +236,6 @@ u_int
initarm(void *arm_bootargs)
{
CVS commit: src/sys/arch/cats/cats
Module Name:src
Committed By: matt
Date: Wed Apr 2 11:36:50 UTC 2014
Modified Files:
src/sys/arch/cats/cats: cats_machdep.c
Log Message:
Don't map ebsabootinfo.bt_vargp if it is the same address as the vector page
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/cats/cats/cats_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/cats/cats/cats_machdep.c
diff -u src/sys/arch/cats/cats/cats_machdep.c:1.77 src/sys/arch/cats/cats/cats_machdep.c:1.78
--- src/sys/arch/cats/cats/cats_machdep.c:1.77 Sun Aug 18 06:50:31 2013
+++ src/sys/arch/cats/cats/cats_machdep.c Wed Apr 2 11:36:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cats_machdep.c,v 1.77 2013/08/18 06:50:31 matt Exp $ */
+/* $NetBSD: cats_machdep.c,v 1.78 2014/04/02 11:36:50 matt Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cats_machdep.c,v 1.77 2013/08/18 06:50:31 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: cats_machdep.c,v 1.78 2014/04/02 11:36:50 matt Exp $);
#include opt_ddb.h
#include opt_modular.h
@@ -622,8 +622,10 @@ initarm(void *arm_bootargs)
#endif
/* Map the boot arguments page */
- pmap_map_entry(l1pagetable, ebsabootinfo.bt_vargp,
- ebsabootinfo.bt_pargp, VM_PROT_READ, PTE_CACHE);
+ if (ebsabootinfo.bt_vargp != vector_page) {
+ pmap_map_entry(l1pagetable, ebsabootinfo.bt_vargp,
+ ebsabootinfo.bt_pargp, VM_PROT_READ, PTE_CACHE);
+ }
/* Map the stack pages */
pmap_map_chunk(l1pagetable, irqstack.pv_va, irqstack.pv_pa,
CVS commit: src/sys/arch/cats
Module Name:src
Committed By: skrll
Date: Wed Apr 2 17:36:05 UTC 2014
Modified Files:
src/sys/arch/cats/cats: cats_machdep.c
src/sys/arch/cats/conf: files.cats
Log Message:
Convert cats to the new world order, i.e. arm32_{bootmem,kernel_vm}_init
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/cats/cats/cats_machdep.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/cats/conf/files.cats
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/cats/cats/cats_machdep.c
diff -u src/sys/arch/cats/cats/cats_machdep.c:1.78 src/sys/arch/cats/cats/cats_machdep.c:1.79
--- src/sys/arch/cats/cats/cats_machdep.c:1.78 Wed Apr 2 11:36:50 2014
+++ src/sys/arch/cats/cats/cats_machdep.c Wed Apr 2 17:36:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cats_machdep.c,v 1.78 2014/04/02 11:36:50 matt Exp $ */
+/* $NetBSD: cats_machdep.c,v 1.79 2014/04/02 17:36:05 skrll Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cats_machdep.c,v 1.78 2014/04/02 11:36:50 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: cats_machdep.c,v 1.79 2014/04/02 17:36:05 skrll Exp $);
#include opt_ddb.h
#include opt_modular.h
@@ -74,6 +74,8 @@ __KERNEL_RCSID(0, $NetBSD: cats_machdep
#include arm/locore.h
#include arm/undefined.h
#include arm/arm32/machdep.h
+
+#include machine/pmap.h
#include machine/cyclone_boot.h
#include arm/footbridge/dc21285mem.h
@@ -116,30 +118,11 @@ static char bootargs[MAX_BOOT_STRING + 1
char *boot_args = NULL;
char *boot_file = NULL;
-vm_offset_t physical_start;
-vm_offset_t physical_freestart;
-vm_offset_t physical_freeend;
-vm_offset_t physical_end;
-u_int free_pages;
-vm_offset_t pagetables_start;
-
-vm_offset_t msgbufphys;
#ifdef PMAP_DEBUG
extern int pmap_debug_level;
#endif
-#define KERNEL_PT_SYS 0 /* L2 table for mapping zero page */
-#define KERNEL_PT_KERNEL 1 /* L2 table for mapping kernel */
-#define KERNEL_PT_KERNEL_NUM 2
-
-/* now this could move into something more generic */
- /* L2 tables for mapping kernel VM */
-#define KERNEL_PT_VMDATA (KERNEL_PT_KERNEL + KERNEL_PT_KERNEL_NUM)
-#define KERNEL_PT_VMDATA_NUM 4 /* 16MB kernel VM !*/
-#define NUM_KERNEL_PTS (KERNEL_PT_VMDATA + KERNEL_PT_VMDATA_NUM)
-
-pv_addr_t kernel_pt_table[NUM_KERNEL_PTS];
/* Prototypes */
@@ -190,88 +173,7 @@ extern void configure(void);
int comcnspeed = CONSPEED;
int comcnmode = CONMODE;
-
-/*
- * void cpu_reboot(int howto, char *bootstr)
- *
- * Reboots the system
- *
- * Deal with any syncing, unmounting, dumping and shutdown hooks,
- * then reset the CPU.
- */
-
-void
-cpu_reboot(int howto, char *bootstr)
-{
-#ifdef DIAGNOSTIC
- /* info */
- printf(boot: howto=%08x curlwp=%p\n, howto, curlwp);
-#endif
-
- /*
- * If we are still cold then hit the air brakes
- * and crash to earth fast
- */
- if (cold) {
- doshutdownhooks();
- pmf_system_shutdown(boothowto);
- printf(The operating system has halted.\n);
- printf(Please press any key to reboot.\n\n);
- cngetc();
- printf(rebooting...\n);
- cpu_reset();
- /*NOTREACHED*/
- }
-
- /* Disable console buffering */
-/* cnpollc(1);*/
-
- /*
- * If RB_NOSYNC was not specified sync the discs.
- * Note: Unless cold is set to 1 here, syslogd will die during the unmount.
- * It looks like syslogd is getting woken up only to find that it cannot
- * page part of the binary in as the filesystem has been unmounted.
- */
- if (!(howto RB_NOSYNC))
- bootsync();
-
- /* Say NO to interrupts */
- splhigh();
-
- /* Do a dump if requested. */
- if ((howto (RB_DUMP | RB_HALT)) == RB_DUMP)
- dumpsys();
-
- /* Run any shutdown hooks */
- doshutdownhooks();
-
- pmf_system_shutdown(boothowto);
-
- /* Make sure IRQ's are disabled */
- IRQdisable;
-
- if (howto RB_HALT) {
- printf(The operating system has halted.\n);
- printf(Please press any key to reboot.\n\n);
- cngetc();
- }
-
- printf(rebooting...\n);
- cpu_reset();
- /*NOTREACHED*/
-}
-
-/*
- * Mapping table for core kernel memory. This memory is mapped at init
- * time with section mappings.
- */
-struct l1_sec_map {
- vm_offset_t va;
- vm_offset_t pa;
- vm_size_t size;
- vm_prot_t prot;
- int cache;
-} l1_sec_table[] = {
+static const struct pmap_devmap cats_devmap[] = {
/* Map 1MB for CSR space */
{ DC21285_ARMCSR_VBASE, DC21285_ARMCSR_BASE,
DC21285_ARMCSR_VSIZE, VM_PROT_READ|VM_PROT_WRITE,
@@ -310,6 +212,14 @@ struct l1_sec_map {
{ 0, 0, 0, 0, 0 }
};
+#define MAX_PHYSMEM 4
+static struct boot_physmem cats_physmem[MAX_PHYSMEM];
+int ncats_physmem = 0;
+
+extern struct bus_space footbridge_pci_io_bs_tag;
+extern struct bus_space footbridge_pci_mem_bs_tag;
+void footbridge_pci_bs_tag_init(void);
+
/*
* u_int initarm(struct ebsaboot *bootinfo)
*
@@ -328,9 +238,6 @@ u_int
initarm(void *arm_bootargs)
{
struct ebsaboot *bootinfo = arm_bootargs;
- int loop;
- int
CVS commit: src/sys/arch/cats/conf
Module Name:src Committed By: skrll Date: Sun Feb 23 13:15:12 UTC 2014 Modified Files: src/sys/arch/cats/conf: INSTALL Log Message: Bump MD size. Verified working. To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/sys/arch/cats/conf/INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/cats/conf/INSTALL diff -u src/sys/arch/cats/conf/INSTALL:1.90 src/sys/arch/cats/conf/INSTALL:1.91 --- src/sys/arch/cats/conf/INSTALL:1.90 Sun Jun 30 21:38:56 2013 +++ src/sys/arch/cats/conf/INSTALL Sun Feb 23 13:15:12 2014 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.90 2013/06/30 21:38:56 rmind Exp $ +# $NetBSD: INSTALL,v 1.91 2014/02/23 13:15:12 skrll Exp $ # # CATSINST -- CHALTECH CATS Install kernel # @@ -97,7 +97,7 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p # Device options options MEMORY_DISK_HOOKS # boottime setup of ramdisk -options MEMORY_DISK_ROOT_SIZE=4200 # Size in blocks +options MEMORY_DISK_ROOT_SIZE=4400 # Size in blocks options MEMORY_DISK_IS_ROOT # use memory disk as root options MEMORY_DISK_SERVER=0 # no userspace memory disk support options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
CVS commit: src/sys/arch/cats/conf
Module Name:src
Committed By: skrll
Date: Sat Aug 17 19:57:10 UTC 2013
Modified Files:
src/sys/arch/cats/conf: Makefile.cats.inc
Log Message:
Use -fno-unwind-tables when creating a.out kernels.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/cats/conf/Makefile.cats.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/cats/conf/Makefile.cats.inc
diff -u src/sys/arch/cats/conf/Makefile.cats.inc:1.26 src/sys/arch/cats/conf/Makefile.cats.inc:1.27
--- src/sys/arch/cats/conf/Makefile.cats.inc:1.26 Thu Jun 27 01:01:08 2013
+++ src/sys/arch/cats/conf/Makefile.cats.inc Sat Aug 17 19:57:09 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cats.inc,v 1.26 2013/06/27 01:01:08 matt Exp $
+# $NetBSD: Makefile.cats.inc,v 1.27 2013/08/17 19:57:09 skrll Exp $
MACHINE_ARCH?= arm
CPPFLAGS+= -D${MACHINE}
@@ -11,6 +11,8 @@ LINKFLAGS= -T ${THISARM}/conf/ldscript.e
# Need to convert the kernel from ELF to a.out so that the firmware
# can load it.
+CFLAGS+= -fno-unwind-tables
+
LINKFLAGS= -T ldscript
SYSTEM_LD_HEAD_EXTRA+=; \
CVS commit: src/sys/arch/cats/include
Module Name:src Committed By: matt Date: Sat Aug 17 20:21:38 UTC 2013 Modified Files: src/sys/arch/cats/include: types.h Log Message: #define __HAVE_FAST_SOFTINT To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/cats/include/types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/cats/include/types.h diff -u src/sys/arch/cats/include/types.h:1.12 src/sys/arch/cats/include/types.h:1.13 --- src/sys/arch/cats/include/types.h:1.12 Sun Jul 17 23:46:49 2011 +++ src/sys/arch/cats/include/types.h Sat Aug 17 20:21:38 2013 @@ -1,8 +1,9 @@ -/* $NetBSD: types.h,v 1.12 2011/07/17 23:46:49 dyoung Exp $ */ +/* $NetBSD: types.h,v 1.13 2013/08/17 20:21:38 matt Exp $ */ -#ifndef _ARM32_TYPES_H_ -#define _ARM32_TYPES_H_ +#ifndef _CATS_TYPES_H_ +#define _CATS_TYPES_H_ +#define __HAVE_FAST_SOFTINTS #include arm/arm32/types.h #define __HAVE_NEW_STYLE_BUS_H
CVS commit: src/sys/arch/cats/conf
Module Name:src
Committed By: matt
Date: Thu Jun 27 01:01:08 UTC 2013
Modified Files:
src/sys/arch/cats/conf: Makefile.cats.inc
Log Message:
Don't force MACHINE_ARCH to be arm
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/cats/conf/Makefile.cats.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/cats/conf/Makefile.cats.inc
diff -u src/sys/arch/cats/conf/Makefile.cats.inc:1.25 src/sys/arch/cats/conf/Makefile.cats.inc:1.26
--- src/sys/arch/cats/conf/Makefile.cats.inc:1.25 Sun Jul 10 04:37:56 2011
+++ src/sys/arch/cats/conf/Makefile.cats.inc Thu Jun 27 01:01:08 2013
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.cats.inc,v 1.25 2011/07/10 04:37:56 tsutsui Exp $
+# $NetBSD: Makefile.cats.inc,v 1.26 2013/06/27 01:01:08 matt Exp $
-MACHINE_ARCH= arm
+MACHINE_ARCH?= arm
CPPFLAGS+= -D${MACHINE}
.if defined(ABLEELF) (${ABLEELF} == 1)
CVS commit: src/sys/arch/cats/cats
Module Name:src
Committed By: matt
Date: Mon Feb 6 17:51:48 UTC 2012
Modified Files:
src/sys/arch/cats/cats: cats_machdep.c
Log Message:
Make this compile with VERBOSE_ARM_INIT.
If the AOUT magic is not ZMAGIC, assume kernel is ELF.
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/cats/cats/cats_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/cats/cats/cats_machdep.c
diff -u src/sys/arch/cats/cats/cats_machdep.c:1.71 src/sys/arch/cats/cats/cats_machdep.c:1.72
--- src/sys/arch/cats/cats/cats_machdep.c:1.71 Fri Jul 1 20:35:31 2011
+++ src/sys/arch/cats/cats/cats_machdep.c Mon Feb 6 17:51:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cats_machdep.c,v 1.71 2011/07/01 20:35:31 dyoung Exp $ */
+/* $NetBSD: cats_machdep.c,v 1.72 2012/02/06 17:51:47 matt Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -40,7 +40,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cats_machdep.c,v 1.71 2011/07/01 20:35:31 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: cats_machdep.c,v 1.72 2012/02/06 17:51:47 matt Exp $);
#include opt_ddb.h
#include opt_modular.h
@@ -385,7 +385,8 @@ initarm(void *arm_bootargs)
if (ebsabootinfo.bt_magic != BT_MAGIC_NUMBER_EBSA
ebsabootinfo.bt_magic != BT_MAGIC_NUMBER_CATS)
- panic(Incompatible magic number passed in boot args);
+ panic(Incompatible magic number %#x passed in boot args,
+ ebsabootinfo.bt_magic);
#ifdef VERBOSE_INIT_ARM
/* output the incoming bootinfo */
@@ -581,8 +582,11 @@ initarm(void *arm_bootargs)
#endif
/* Now we fill in the L2 pagetable for the kernel static code/data */
-#ifdef ABLEELF
- {
+ struct exec *kernexec = (struct exec *)KERNEL_TEXT_BASE;
+ if (N_GETMAGIC(kernexec[0]) != ZMAGIC) {
+ /*
+ * If it's not a.out, assume ELF.
+ */
extern char etext[], _end[];
size_t textsize = (uintptr_t) etext - KERNEL_BASE;
size_t totalsize = (uintptr_t) _end - KERNEL_BASE;
@@ -598,35 +602,27 @@ initarm(void *arm_bootargs)
(void) pmap_map_chunk(l1pagetable, KERNEL_BASE + logical,
physical_start + logical, totalsize - textsize,
VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
- }
-#else
- {
- struct exec *kernexec = (struct exec *)KERNEL_TEXT_BASE;
- if (N_GETMAGIC(kernexec[0]) != ZMAGIC)
- panic(Illegal kernel format);
- else {
- extern int end;
- u_int logical;
+ } else {
+ extern int end;
+ u_int logical;
- logical = pmap_map_chunk(l1pagetable, KERNEL_TEXT_BASE,
- physical_start, kernexec-a_text,
- VM_PROT_READ, PTE_CACHE);
- logical += pmap_map_chunk(l1pagetable,
- KERNEL_TEXT_BASE + logical,
- physical_start + logical, kernexec-a_data,
- VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
- logical += pmap_map_chunk(l1pagetable,
- KERNEL_TEXT_BASE + logical,
- physical_start + logical, kernexec-a_bss,
- VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
- logical += pmap_map_chunk(l1pagetable,
- KERNEL_TEXT_BASE + logical,
- physical_start + logical, kernexec-a_syms + sizeof(int)
- + *(u_int *)((int)end + kernexec-a_syms + sizeof(int)),
- VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
- }
+ logical = pmap_map_chunk(l1pagetable, KERNEL_TEXT_BASE,
+ physical_start, kernexec-a_text,
+ VM_PROT_READ, PTE_CACHE);
+ logical += pmap_map_chunk(l1pagetable,
+ KERNEL_TEXT_BASE + logical,
+ physical_start + logical, kernexec-a_data,
+ VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
+ logical += pmap_map_chunk(l1pagetable,
+ KERNEL_TEXT_BASE + logical,
+ physical_start + logical, kernexec-a_bss,
+ VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
+ logical += pmap_map_chunk(l1pagetable,
+ KERNEL_TEXT_BASE + logical,
+ physical_start + logical, kernexec-a_syms + sizeof(int)
+ + *(u_int *)((int)end + kernexec-a_syms + sizeof(int)),
+ VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
}
-#endif
/*
* PATCH PATCH ...
@@ -695,7 +691,7 @@ initarm(void *arm_bootargs)
*/
#ifdef VERBOSE_INIT_ARM
/* checking sttb address */
- printf(cpu_setttb address = %p\n, cpu_setttb);
+ printf(cpu_setttb address = %p\n, cpufuncs.cf_setttb);
printf(kernel_l1pt=0x%08x old = 0x%08x, phys = 0x%08x\n,
((uint*)kernel_l1pt.pv_va)[0xf00],
CVS commit: src/sys/arch/cats
Module Name:src Committed By: dyoung Date: Fri Jul 1 20:35:31 UTC 2011 Modified Files: src/sys/arch/cats/cats: cats_machdep.c src/sys/arch/cats/pci: pcib.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/arch/cats/cats/cats_machdep.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/cats/pci/pcib.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/cats/cats/cats_machdep.c diff -u src/sys/arch/cats/cats/cats_machdep.c:1.70 src/sys/arch/cats/cats/cats_machdep.c:1.71 --- src/sys/arch/cats/cats/cats_machdep.c:1.70 Thu Jun 30 20:09:21 2011 +++ src/sys/arch/cats/cats/cats_machdep.c Fri Jul 1 20:35:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cats_machdep.c,v 1.70 2011/06/30 20:09:21 wiz Exp $ */ +/* $NetBSD: cats_machdep.c,v 1.71 2011/07/01 20:35:31 dyoung Exp $ */ /* * Copyright (c) 1997,1998 Mark Brinicombe. @@ -40,7 +40,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cats_machdep.c,v 1.70 2011/06/30 20:09:21 wiz Exp $); +__KERNEL_RCSID(0, $NetBSD: cats_machdep.c,v 1.71 2011/07/01 20:35:31 dyoung Exp $); #include opt_ddb.h #include opt_modular.h @@ -68,7 +68,7 @@ #include machine/bootconfig.h #define _ARM32_BUS_DMA_PRIVATE -#include machine/bus.h +#include sys/bus.h #include machine/cpu.h #include machine/frame.h #include machine/intr.h Index: src/sys/arch/cats/pci/pcib.c diff -u src/sys/arch/cats/pci/pcib.c:1.14 src/sys/arch/cats/pci/pcib.c:1.15 --- src/sys/arch/cats/pci/pcib.c:1.14 Mon Jun 6 16:29:15 2011 +++ src/sys/arch/cats/pci/pcib.c Fri Jul 1 20:35:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pcib.c,v 1.14 2011/06/06 16:29:15 matt Exp $ */ +/* $NetBSD: pcib.c,v 1.15 2011/07/01 20:35:31 dyoung Exp $ */ /*- * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc. @@ -32,13 +32,13 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pcib.c,v 1.14 2011/06/06 16:29:15 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: pcib.c,v 1.15 2011/07/01 20:35:31 dyoung Exp $); #include sys/param.h #include sys/systm.h #include sys/device.h -#include machine/bus.h +#include sys/bus.h #include dev/isa/isavar.h
CVS commit: src/sys/arch/cats
Module Name:src
Committed By: dyoung
Date: Fri Apr 8 14:58:46 UTC 2011
Modified Files:
src/sys/arch/cats: Makefile
Log Message:
There's no isa/ under cats/; update Makefile to reflect that.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/cats/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/cats/Makefile
diff -u src/sys/arch/cats/Makefile:1.4 src/sys/arch/cats/Makefile:1.5
--- src/sys/arch/cats/Makefile:1.4 Mon Apr 4 19:44:37 2011
+++ src/sys/arch/cats/Makefile Fri Apr 8 14:58:46 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/04/04 19:44:37 dyoung Exp $
+# $NetBSD: Makefile,v 1.5 2011/04/08 14:58:46 dyoung Exp $
# Makefile for cats tags file and boot blocks
@@ -10,7 +10,7 @@
${SYSDIR}/arch/cats/pci/*.[ch]
# Directories in which to place tags links
-DCATS= isa include
+DCATS= include
.include ../../kern/Make.tags.inc
CVS commit: src/sys/arch/cats
Module Name:src
Committed By: dyoung
Date: Mon Apr 4 19:44:37 UTC 2011
Modified Files:
src/sys/arch/cats: Makefile
Log Message:
Fix target 'tags'.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/cats/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/cats/Makefile
diff -u src/sys/arch/cats/Makefile:1.3 src/sys/arch/cats/Makefile:1.4
--- src/sys/arch/cats/Makefile:1.3 Sat Oct 25 22:27:37 2008
+++ src/sys/arch/cats/Makefile Mon Apr 4 19:44:37 2011
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2008/10/25 22:27:37 apb Exp $
+# $NetBSD: Makefile,v 1.4 2011/04/04 19:44:37 dyoung Exp $
# Makefile for cats tags file and boot blocks
-TCATS= ../cats/tags
-SCATS= ../cats/cats/*.[ch] ../cats/include/*.h \
- ../cats/isa/*.[ch]
-ACATS= ../cats/cats/*.S
+# Find where ARM source files are for inclusion in tags
+.include ../arm/Makefile.inc
+
+TCATS= ${SYSDIR}/arch/cats/tags
+SCATS= ${SYSDIR}/arch/cats/cats/*.[ch] ${SYSDIR}/arch/cats/include/*.h \
+ ${SYSDIR}/arch/cats/pci/*.[ch]
# Directories in which to place tags links
DCATS= isa include
@@ -13,10 +15,12 @@
.include ../../kern/Make.tags.inc
tags:
- -ctags -wdtf ${TCATS} ${SCATS} ${COMM}
- egrep ^ENTRY(.*)|^ALTENTRY(.*) ${ACATS} | \
+ -rm -f ${TCATS}
+ -echo ${SCATS} ${SARM} | xargs ctags -wadtf ${TCATS}
+ -${FINDCOMM} | xargs ctags -wadtf ${TCATS}
+ egrep ^ENTRY(.*)|^ALTENTRY(.*) ${ACATS} ${AARM} | \
${TOOL_SED} -e \
- s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/; \
+ s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/; \
${TCATS}
sort -o ${TCATS} ${TCATS}
CVS commit: src/sys/arch/cats/include
Module Name:src Committed By: skrll Date: Wed Dec 1 06:47:17 UTC 2010 Modified Files: src/sys/arch/cats/include: param.h Log Message: Define PCI_MAGIC_IO_RANGE, so that Xorg drivers can mmap PCI IO space. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/cats/include/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/cats/include/param.h diff -u src/sys/arch/cats/include/param.h:1.7 src/sys/arch/cats/include/param.h:1.8 --- src/sys/arch/cats/include/param.h:1.7 Fri Jan 3 02:40:57 2003 +++ src/sys/arch/cats/include/param.h Wed Dec 1 06:47:16 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.7 2003/01/03 02:40:57 thorpej Exp $ */ +/* $NetBSD: param.h,v 1.8 2010/12/01 06:47:16 skrll Exp $ */ /* * Copyright (c) 1994,1995 Mark Brinicombe. @@ -51,4 +51,7 @@ #include arm/arm32/param.h +/* at this offset we mmap() the PCI IO range in display drivers */ +#define PCI_MAGIC_IO_RANGE 0x7c00 + #endif /* _CATS_PARAM_H_ */
CVS commit: src/sys/arch/cats/pci
Module Name:src
Committed By: skrll
Date: Thu Jan 14 10:32:49 UTC 2010
Modified Files:
src/sys/arch/cats/pci: pcib.c
Log Message:
s/PCI_PRODUCT_ALI_M1543/PCI_PRODUCT_ALI_M1533/ now that dsl@ has fixed
pcidevs.
Hi dsl!
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/cats/pci/pcib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/cats/pci/pcib.c
diff -u src/sys/arch/cats/pci/pcib.c:1.12 src/sys/arch/cats/pci/pcib.c:1.13
--- src/sys/arch/cats/pci/pcib.c:1.12 Sat Mar 14 21:04:08 2009
+++ src/sys/arch/cats/pci/pcib.c Thu Jan 14 10:32:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pcib.c,v 1.12 2009/03/14 21:04:08 dsl Exp $ */
+/* $NetBSD: pcib.c,v 1.13 2010/01/14 10:32:49 skrll Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pcib.c,v 1.12 2009/03/14 21:04:08 dsl Exp $);
+__KERNEL_RCSID(0, $NetBSD: pcib.c,v 1.13 2010/01/14 10:32:49 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -68,7 +68,7 @@
switch (PCI_VENDOR(pa-pa_id)) {
case PCI_VENDOR_ALI:
switch (PCI_PRODUCT(pa-pa_id)) {
- case PCI_PRODUCT_ALI_M1543:
+ case PCI_PRODUCT_ALI_M1533:
return (1);
}
break;
CVS commit: src/sys/arch/cats/cats
Module Name:src Committed By: he Date: Tue Aug 18 09:22:47 UTC 2009 Modified Files: src/sys/arch/cats/cats: cats_machdep.c Log Message: No longer rely on sys/exec.h including sys/exec_aout.h. Hi, m...@! To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/arch/cats/cats/cats_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/cats/cats/cats_machdep.c diff -u src/sys/arch/cats/cats/cats_machdep.c:1.65 src/sys/arch/cats/cats/cats_machdep.c:1.66 --- src/sys/arch/cats/cats/cats_machdep.c:1.65 Tue Aug 11 17:04:15 2009 +++ src/sys/arch/cats/cats/cats_machdep.c Tue Aug 18 09:22:47 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: cats_machdep.c,v 1.65 2009/08/11 17:04:15 matt Exp $ */ +/* $NetBSD: cats_machdep.c,v 1.66 2009/08/18 09:22:47 he Exp $ */ /* * Copyright (c) 1997,1998 Mark Brinicombe. @@ -40,7 +40,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cats_machdep.c,v 1.65 2009/08/11 17:04:15 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: cats_machdep.c,v 1.66 2009/08/18 09:22:47 he Exp $); #include opt_ddb.h #include opt_modular.h @@ -53,6 +53,7 @@ #include sys/systm.h #include sys/kernel.h #include sys/exec.h +#include sys/exec_aout.h #include sys/proc.h #include sys/msgbuf.h #include sys/reboot.h
