CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: andvar Date: Sun Apr 7 19:51:49 UTC 2024 Modified Files: src/sys/arch/evbmips/conf: README.evbmips Log Message: Remove extra whitespace after P-4032. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/conf/README.evbmips 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/evbmips/conf/README.evbmips diff -u src/sys/arch/evbmips/conf/README.evbmips:1.1 src/sys/arch/evbmips/conf/README.evbmips:1.2 --- src/sys/arch/evbmips/conf/README.evbmips:1.1 Sun Apr 7 19:39:24 2024 +++ src/sys/arch/evbmips/conf/README.evbmips Sun Apr 7 19:51:49 2024 @@ -1,4 +1,4 @@ -$NetBSD: README.evbmips,v 1.1 2024/04/07 19:39:24 andvar Exp $ +$NetBSD: README.evbmips,v 1.2 2024/04/07 19:51:49 andvar Exp $ The documentation is not final, more updates are coming. @@ -29,7 +29,7 @@ MIPSSIM64 2021/01/27 evbmips(n)64-el,eb MTX-1 2006/02/23 evbmips-el 4G Systems MTX-1 (MeshCube / AccessCube, Alchemy Au1500). OCTEON 2015/04/29 evbmips(n)64-eb Cavium Octeon and Octeon Plus SoC based devices like Ubiquiti Networks EdgeRouter Lite. OMSAL400 2006/02/23 evbmips-el Plat'Home OpenMicroServer (OMS-AL400, Alchemy Au1550). -P4032 2001/06/01 evbmips-el Algorithmics MIPS P-4032 evaluation board (QED RM4xxx). +P4032 2001/06/01 evbmips-el Algorithmics MIPS P-4032 evaluation board (QED RM4xxx). P5064 2001/05/28 evbmips-el Algorithmics MIPS P-5064 evaluation board (QED RM52xx). P5064-64 2009/12/14 evbmips(n)64-el P5064 64-bit kernel configuration. P6032 2001/06/22 evbmips-el Algorithmics MIPS P-6032 evaluation board.
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: andvar Date: Sun Apr 7 19:51:49 UTC 2024 Modified Files: src/sys/arch/evbmips/conf: README.evbmips Log Message: Remove extra whitespace after P-4032. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/conf/README.evbmips Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: andvar Date: Sun Apr 7 19:39:24 UTC 2024 Added Files: src/sys/arch/evbmips/conf: README.evbmips Log Message: Initial version of evbmips kernel configuration files documentation. The goal is to give a better understanding which hardware they represent and how to build them. Also not to lose this information over the years. Loosely based on a README.evbarm, however has additional notes on building targets. The file is not final, some discussion came up about the need of *32 kernel configs. simon is planning to review. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/evbmips/conf/README.evbmips Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/evbmips/conf/README.evbmips diff -u /dev/null src/sys/arch/evbmips/conf/README.evbmips:1.1 --- /dev/null Sun Apr 7 19:39:24 2024 +++ src/sys/arch/evbmips/conf/README.evbmips Sun Apr 7 19:39:24 2024 @@ -0,0 +1,64 @@ +$NetBSD: README.evbmips,v 1.1 2024/04/07 19:39:24 andvar Exp $ + +The documentation is not final, more updates are coming. + +config date targets boards +- +ADM5210 2007/03/20 evbmips-el Infineon ADM5120 (MIPS32 4Kc) based boards and routers, + including RouterBOARD 100 series. +ADM5210-NB 2007/03/20 evbmips-el ADM5120 netboot kernel. +ADM5210-USB 2007/03/20 evbmips-el ADM5120 netboot kernel with USB support. +AP30 2006/06/06 evbmips-el,eb Atheros AP30 development board (AR5312). +CI20 2014/11/22 evbmips-eb MIPS Creator CI20 (Ingenic JZ4780). +CPMBR1400 2011/07/28 evbmips-el CradlePoint MBR1400 Router (Ralink RT3883 MIPS74K). +DB120 2011/07/07 evbmips-eb Qualcomm Atheros AR9344 (MIPS74K) DB120 evaluation board. +DBAU1500 2006/02/08 evbmips-el,eb AMD Alchemy DBAu1500 evaluation board. +DBAU1550 2006/02/08 evbmips-el,eb AMD Alchemy DBAu1550 evaluation board. +GDIUM 2009/08/06 evbmips-el EMTEC Gdium netbook 32-bit kernel. +GDIUM64 2011/08/24 evbmips(n)64-el EMTEC Gdium netbook 64-bit kernel. +LINKITSMART7688 2016/10/05 evbmips-el Seeed Studio LinkIt Smart 7688 compact controller board (MediaTek MT7688). +LOONGSON 2011/08/27 evbmips64-el Loongson 2F/2E based devices (Lemote Fuloong, Yeelong). +MALTA 2002/03/07 evbmips-el,eb MIPS Malta evaluation board 4Kc (MIPS32) or 5Kc (MIPS64). +MALTA32 2009/12/14 evbmips64-el,eb MALTA N32 ABI kernel configuration. +MALTA32.MP 2009/12/14 evbmips64-el,eb MALTA N32 ABI MP kernel configuration. +MALTA64 2009/12/14 evbmips(n)64-el,eb MALTA 64-bit kernel configuration. +MALTA64.MP 2009/12/14 evbmips(n)64-el,eb MALTA MP 64-bit kernel configuration. +MERAKI 2006/09/26 evbmips-eb Meraki Mini (Atheros AR2315). +MIPSSIM 2021/01/27 evbmips-el,eb QEMU MIPS "mipssim" simulator. +MIPSSIM64 2021/01/27 evbmips(n)64-el,eb MIPSSIM 64-bit kernel. +MTX-1 2006/02/23 evbmips-el 4G Systems MTX-1 (MeshCube / AccessCube, Alchemy Au1500). +OCTEON 2015/04/29 evbmips(n)64-eb Cavium Octeon and Octeon Plus SoC based devices like Ubiquiti Networks EdgeRouter Lite. +OMSAL400 2006/02/23 evbmips-el Plat'Home OpenMicroServer (OMS-AL400, Alchemy Au1550). +P4032 2001/06/01 evbmips-el Algorithmics MIPS P-4032 evaluation board (QED RM4xxx). +P5064 2001/05/28 evbmips-el Algorithmics MIPS P-5064 evaluation board (QED RM52xx). +P5064-64 2009/12/14 evbmips(n)64-el P5064 64-bit kernel configuration. +P6032 2001/06/22 evbmips-el Algorithmics MIPS P-6032 evaluation board. +RB153 2007/03/20 evbmips-el MikroTik RouterBOARD 153 (Infineon ADM5120). +RB433UAH 2011/07/07 evbmips-eb MikroTik RouterBOARD 433(UAH) AR71xx (MIPS24K core). +SBMIPS 2002/03/06 evbmips-el,eb Broadcom/SiByte SB1250 evaluation board. +SBMIPS.MP 2011/02/20 evbmips-el,eb SBMIPS MP kernel configuration. +SBMIPS64 2009/12/14 evbmips(n)64-el,eb SBMIPS 64-bit kernel configuration. +SBMIPS64.MP 2011/02/20 evbmips(n)64-el,eb SBMIPS 64-bit MP kernel configuration. +WGT624V3 2007/02/18 evbmips-eb Netgear WGT624 v3 wireless router (example config). +XLSATX 2009/12/14RMI (NetLogic) XLS/XLR models (base for other XLSATX* kernel configs). +XLSATX32 2011/02/20 evbmips64-el,eb XLSATX N32 kernel configuration. +XLSATX64 2009/12/14 evbmips(n)64-el,eb XLSATX 64-bit kernel configuration. +XLSATX64.MP 2011/02/20 evbmips(n)64-el,eb XLSATX 64-bit MP kernel configuration. +ZYXELKX 2014/04/30 evbmips-el Zyxel Keenetic Extra router (MediaTek MT7620A). + +Configuration file notes: +* "INSALL_*" installation kernel configuration files. + (typically enables hooks for initializing the root memory-disk). +* "*.MP" configuration files with the multiprocessor support enabled. +* "*32" N32 ABI kernel configuration files + (can be built using evbmips64-* targets). +Building target notes: +* "*-el" represent targets for building little-endian
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: andvar Date: Sun Apr 7 19:39:24 UTC 2024 Added Files: src/sys/arch/evbmips/conf: README.evbmips Log Message: Initial version of evbmips kernel configuration files documentation. The goal is to give a better understanding which hardware they represent and how to build them. Also not to lose this information over the years. Loosely based on a README.evbarm, however has additional notes on building targets. The file is not final, some discussion came up about the need of *32 kernel configs. simon is planning to review. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/evbmips/conf/README.evbmips Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: andvar Date: Tue Mar 26 10:23:42 UTC 2024 Modified Files: src/sys/arch/evbmips/conf: ADM5120-NB Log Message: Revert accidental change for root file system in previous commit. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbmips/conf/ADM5120-NB 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/evbmips/conf/ADM5120-NB diff -u src/sys/arch/evbmips/conf/ADM5120-NB:1.33 src/sys/arch/evbmips/conf/ADM5120-NB:1.34 --- src/sys/arch/evbmips/conf/ADM5120-NB:1.33 Tue Mar 26 10:16:47 2024 +++ src/sys/arch/evbmips/conf/ADM5120-NB Tue Mar 26 10:23:42 2024 @@ -1,11 +1,11 @@ -# $NetBSD: ADM5120-NB,v 1.33 2024/03/26 10:16:47 andvar Exp $ +# $NetBSD: ADM5120-NB,v 1.34 2024/03/26 10:23:42 andvar Exp $ # # Kernel config for the ADM5120 based boards and routers, # including the RouterBOARD 100 series. include "arch/evbmips/conf/std.adm5120" -#ident "GENERIC-$Revision: 1.33 $" +#ident "GENERIC-$Revision: 1.34 $" maxusers 32 @@ -101,7 +101,7 @@ options INET # Internet protocols options NFS_BOOT_DHCP # Pretty much only one device to use for the root file system. -config netbsd root on ? type ? +config netbsd-admsw0 root on admsw0 type nfs mainbus0 at root
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: andvar Date: Tue Mar 26 10:23:42 UTC 2024 Modified Files: src/sys/arch/evbmips/conf: ADM5120-NB Log Message: Revert accidental change for root file system in previous commit. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbmips/conf/ADM5120-NB Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: andvar Date: Tue Mar 26 10:16:47 UTC 2024 Modified Files: src/sys/arch/evbmips/conf: ADM5120-NB Log Message: Remove netgraph options which are not supported and have no effect in NetBSD. While here, reposition extio to reduce diff between ADM5120 and ADM5120-NB. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbmips/conf/ADM5120-NB 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/evbmips/conf/ADM5120-NB diff -u src/sys/arch/evbmips/conf/ADM5120-NB:1.32 src/sys/arch/evbmips/conf/ADM5120-NB:1.33 --- src/sys/arch/evbmips/conf/ADM5120-NB:1.32 Mon Jan 29 18:27:11 2024 +++ src/sys/arch/evbmips/conf/ADM5120-NB Tue Mar 26 10:16:47 2024 @@ -1,11 +1,11 @@ -# $NetBSD: ADM5120-NB,v 1.32 2024/01/29 18:27:11 christos Exp $ +# $NetBSD: ADM5120-NB,v 1.33 2024/03/26 10:16:47 andvar Exp $ # # Kernel config for the ADM5120 based boards and routers, # including the RouterBOARD 100 series. include "arch/evbmips/conf/std.adm5120" -#ident "GENERIC-$Revision: 1.32 $" +#ident "GENERIC-$Revision: 1.33 $" maxusers 32 @@ -77,30 +77,6 @@ options BUFQ_PRIOCSCAN # Networking options options GATEWAY # IP packet forwarding options INET # Internet protocols -options NETGRAPH # Netgraph -options NETGRAPH_ASYNC -options NETGRAPH_BPF -options NETGRAPH_CISCO -options NETGRAPH_ECHO -options NETGRAPH_EIFACE -options NETGRAPH_ETF -options NETGRAPH_ETHER -options NETGRAPH_FRAME_RELAY -options NETGRAPH_HOLE -options NETGRAPH_HUB -options NETGRAPH_IFACE -options NETGRAPH_KSOCKET -options NETGRAPH_L2TP -options NETGRAPH_LMI -options NETGRAPH_ONE2MANY -options NETGRAPH_PPP -options NETGRAPH_PPPOE -options NETGRAPH_PPTPGRE -options NETGRAPH_RFC1490 -options NETGRAPH_TEE -options NETGRAPH_UI -options NETGRAPH_VJC -options NETGRAPH_VLAN #options INET6 # IPV6 #options IPSEC # IP security #options IPSEC_DEBUG # debug for IP security @@ -125,7 +101,7 @@ options NETGRAPH_VLAN options NFS_BOOT_DHCP # Pretty much only one device to use for the root file system. -config netbsd-admsw0 root on admsw0 type nfs +config netbsd root on ? type ? mainbus0 at root @@ -151,9 +127,8 @@ pseudo-device pty# pseudo-terminals pseudo-device ksyms obio* at mainbus? -extio* at mainbus? gpio* at mainbus? - +extio* at mainbus? uart* at obio? addr ? admsw* at obio? addr ? #admflash* at obio? addr ?
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: andvar Date: Tue Mar 26 10:16:47 UTC 2024 Modified Files: src/sys/arch/evbmips/conf: ADM5120-NB Log Message: Remove netgraph options which are not supported and have no effect in NetBSD. While here, reposition extio to reduce diff between ADM5120 and ADM5120-NB. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbmips/conf/ADM5120-NB Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbmips/conf
Module Name:src
Committed By: christos
Date: Sun Feb 11 17:17:05 UTC 2024
Modified Files:
src/sys/arch/evbmips/conf: Makefile.evbmips.inc
Log Message:
put quotes back
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbmips/conf/Makefile.evbmips.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/evbmips/conf/Makefile.evbmips.inc
diff -u src/sys/arch/evbmips/conf/Makefile.evbmips.inc:1.8 src/sys/arch/evbmips/conf/Makefile.evbmips.inc:1.9
--- src/sys/arch/evbmips/conf/Makefile.evbmips.inc:1.8 Sun Feb 11 12:13:02 2024
+++ src/sys/arch/evbmips/conf/Makefile.evbmips.inc Sun Feb 11 12:17:05 2024
@@ -40,7 +40,7 @@ MKUBOOTIMAGEARGS+= -e $(TEXTADDR)
.endif
MKUBOOTIMAGEARGS+= -n "$(MACHINE) ${_OSRELEASE} ($(KERNEL_BUILD:T))"
.if ${MKREPRO_TIMESTAMP:Uno} != "no"
-MKUBOOTIMAGEARGS+= -t ${MKREPRO_TIMESTAMP}
+MKUBOOTIMAGEARGS+= -t "${MKREPRO_TIMESTAMP}"
.endif
.if ${NEED_UBOOTIMAGE:Mgz} == "gz"
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: christos Date: Sun Feb 11 17:17:05 UTC 2024 Modified Files: src/sys/arch/evbmips/conf: Makefile.evbmips.inc Log Message: put quotes back To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbmips/conf/Makefile.evbmips.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbmips/conf
Module Name:src
Committed By: christos
Date: Sun Feb 11 17:13:02 UTC 2024
Modified Files:
src/sys/arch/evbmips/conf: Makefile.evbmips.inc
Log Message:
PR/57923: Jan-Benedict Glaw: Use $MKREPRO_TIMESTAMP for mkubootimage
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbmips/conf/Makefile.evbmips.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/evbmips/conf/Makefile.evbmips.inc
diff -u src/sys/arch/evbmips/conf/Makefile.evbmips.inc:1.7 src/sys/arch/evbmips/conf/Makefile.evbmips.inc:1.8
--- src/sys/arch/evbmips/conf/Makefile.evbmips.inc:1.7 Fri Jun 26 17:56:31 2015
+++ src/sys/arch/evbmips/conf/Makefile.evbmips.inc Sun Feb 11 12:13:02 2024
@@ -39,6 +39,9 @@ MKUBOOTIMAGEARGS+= -E $(TEXTADDR)
MKUBOOTIMAGEARGS+= -e $(TEXTADDR)
.endif
MKUBOOTIMAGEARGS+= -n "$(MACHINE) ${_OSRELEASE} ($(KERNEL_BUILD:T))"
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MKUBOOTIMAGEARGS+= -t ${MKREPRO_TIMESTAMP}
+.endif
.if ${NEED_UBOOTIMAGE:Mgz} == "gz"
MKUBOOTIMAGEARGS+= -C gz
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: christos Date: Sun Feb 11 17:13:02 UTC 2024 Modified Files: src/sys/arch/evbmips/conf: Makefile.evbmips.inc Log Message: PR/57923: Jan-Benedict Glaw: Use $MKREPRO_TIMESTAMP for mkubootimage To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbmips/conf/Makefile.evbmips.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: simonb Date: Fri Nov 3 00:24:20 UTC 2023 Modified Files: src/sys/arch/evbmips/conf: INSTALL_OMSAL400 Log Message: All other install kernels use a 6MB RAM disk. Stop with the teeny frequent bumps and jump straight to the size everything is using. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbmips/conf/INSTALL_OMSAL400 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/evbmips/conf/INSTALL_OMSAL400 diff -u src/sys/arch/evbmips/conf/INSTALL_OMSAL400:1.4 src/sys/arch/evbmips/conf/INSTALL_OMSAL400:1.5 --- src/sys/arch/evbmips/conf/INSTALL_OMSAL400:1.4 Tue Oct 10 10:36:42 2023 +++ src/sys/arch/evbmips/conf/INSTALL_OMSAL400 Fri Nov 3 00:24:20 2023 @@ -1,8 +1,8 @@ -# $NetBSD: INSTALL_OMSAL400,v 1.4 2023/10/10 10:36:42 martin Exp $ +# $NetBSD: INSTALL_OMSAL400,v 1.5 2023/11/03 00:24:20 simonb Exp $ include "arch/evbmips/conf/OMSAL400" -#ident "INSTALL_OMSAL400-$Revision: 1.4 $" +#ident "INSTALL_OMSAL400-$Revision: 1.5 $" # Enable the hooks used for initializing the root memory-disk. # The ramdisk size must be kept in sync manually with the size of @@ -11,5 +11,5 @@ pseudo-device md# memory disk device options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # force root on memory disk options MEMORY_DISK_SERVER=0 # no userspace memory disk -options MEMORY_DISK_ROOT_SIZE=8350 # size of memory disk, in blocks +options MEMORY_DISK_ROOT_SIZE=12288 # size of memory disk, in blocks options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: simonb Date: Fri Nov 3 00:24:20 UTC 2023 Modified Files: src/sys/arch/evbmips/conf: INSTALL_OMSAL400 Log Message: All other install kernels use a 6MB RAM disk. Stop with the teeny frequent bumps and jump straight to the size everything is using. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbmips/conf/INSTALL_OMSAL400 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: he Date: Tue Oct 10 16:23:56 UTC 2023 Modified Files: src/sys/arch/evbmips/conf: INSTALL_CI20 Log Message: INSTALL_CI20: bump ramdisk image size since contents grew a bit recently. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/conf/INSTALL_CI20 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/evbmips/conf/INSTALL_CI20 diff -u src/sys/arch/evbmips/conf/INSTALL_CI20:1.2 src/sys/arch/evbmips/conf/INSTALL_CI20:1.3 --- src/sys/arch/evbmips/conf/INSTALL_CI20:1.2 Fri Jun 9 21:33:16 2023 +++ src/sys/arch/evbmips/conf/INSTALL_CI20 Tue Oct 10 16:23:56 2023 @@ -1,8 +1,8 @@ -# $NetBSD: INSTALL_CI20,v 1.2 2023/06/09 21:33:16 gutteridge Exp $ +# $NetBSD: INSTALL_CI20,v 1.3 2023/10/10 16:23:56 he Exp $ include "arch/evbmips/conf/CI20" -#ident "INSTALL_CI20-$Revision: 1.2 $" +#ident "INSTALL_CI20-$Revision: 1.3 $" # Enable the hooks used for initializing the root memory-disk. # The ramdisk size must be kept in sync manually with the size of @@ -11,4 +11,4 @@ pseudo-device md# memory disk device options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # force root on memory disk options MEMORY_DISK_SERVER=0 # no userspace memory disk -options MEMORY_DISK_ROOT_SIZE=12288 # size of memory disk, in blocks +options MEMORY_DISK_ROOT_SIZE=12416 # size of memory disk, in blocks
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: he Date: Tue Oct 10 16:23:56 UTC 2023 Modified Files: src/sys/arch/evbmips/conf: INSTALL_CI20 Log Message: INSTALL_CI20: bump ramdisk image size since contents grew a bit recently. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/conf/INSTALL_CI20 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: martin Date: Tue Oct 10 10:36:42 UTC 2023 Modified Files: src/sys/arch/evbmips/conf: INSTALL_OMSAL400 Log Message: Make more room for ramdisk image (which recently grew a bit) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbmips/conf/INSTALL_OMSAL400 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/evbmips/conf/INSTALL_OMSAL400 diff -u src/sys/arch/evbmips/conf/INSTALL_OMSAL400:1.3 src/sys/arch/evbmips/conf/INSTALL_OMSAL400:1.4 --- src/sys/arch/evbmips/conf/INSTALL_OMSAL400:1.3 Fri Jun 9 21:33:16 2023 +++ src/sys/arch/evbmips/conf/INSTALL_OMSAL400 Tue Oct 10 10:36:42 2023 @@ -1,8 +1,8 @@ -# $NetBSD: INSTALL_OMSAL400,v 1.3 2023/06/09 21:33:16 gutteridge Exp $ +# $NetBSD: INSTALL_OMSAL400,v 1.4 2023/10/10 10:36:42 martin Exp $ include "arch/evbmips/conf/OMSAL400" -#ident "INSTALL_OMSAL400-$Revision: 1.3 $" +#ident "INSTALL_OMSAL400-$Revision: 1.4 $" # Enable the hooks used for initializing the root memory-disk. # The ramdisk size must be kept in sync manually with the size of @@ -11,5 +11,5 @@ pseudo-device md# memory disk device options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # force root on memory disk options MEMORY_DISK_SERVER=0 # no userspace memory disk -options MEMORY_DISK_ROOT_SIZE=8192 # size of memory disk, in blocks +options MEMORY_DISK_ROOT_SIZE=8350 # size of memory disk, in blocks options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: martin Date: Tue Oct 10 10:36:42 UTC 2023 Modified Files: src/sys/arch/evbmips/conf: INSTALL_OMSAL400 Log Message: Make more room for ramdisk image (which recently grew a bit) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbmips/conf/INSTALL_OMSAL400 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: gutteridge Date: Fri Jun 9 21:33:16 UTC 2023 Modified Files: src/sys/arch/evbmips/conf: INSTALL_CI20 INSTALL_CPMBR1400 INSTALL_LOONGSON INSTALL_MALTA INSTALL_MALTA32 INSTALL_MALTA64 INSTALL_OCTEON INSTALL_OMSAL400 INSTALL_XLSATX32 INSTALL_XLSATX64 INSTALL_ZYXELKX Log Message: INSTALL_*: correct a path in a comment To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/conf/INSTALL_CI20 \ src/sys/arch/evbmips/conf/INSTALL_LOONGSON \ src/sys/arch/evbmips/conf/INSTALL_ZYXELKX cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/conf/INSTALL_CPMBR1400 \ src/sys/arch/evbmips/conf/INSTALL_MALTA \ src/sys/arch/evbmips/conf/INSTALL_MALTA64 \ src/sys/arch/evbmips/conf/INSTALL_OCTEON \ src/sys/arch/evbmips/conf/INSTALL_OMSAL400 cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbmips/conf/INSTALL_MALTA32 \ src/sys/arch/evbmips/conf/INSTALL_XLSATX32 \ src/sys/arch/evbmips/conf/INSTALL_XLSATX64 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/evbmips/conf/INSTALL_CI20 diff -u src/sys/arch/evbmips/conf/INSTALL_CI20:1.1 src/sys/arch/evbmips/conf/INSTALL_CI20:1.2 --- src/sys/arch/evbmips/conf/INSTALL_CI20:1.1 Mon Apr 6 14:18:09 2015 +++ src/sys/arch/evbmips/conf/INSTALL_CI20 Fri Jun 9 21:33:16 2023 @@ -1,12 +1,12 @@ -# $NetBSD: INSTALL_CI20,v 1.1 2015/04/06 14:18:09 joerg Exp $ +# $NetBSD: INSTALL_CI20,v 1.2 2023/06/09 21:33:16 gutteridge Exp $ include "arch/evbmips/conf/CI20" -#ident "INSTALL_CI20-$Revision: 1.1 $" +#ident "INSTALL_CI20-$Revision: 1.2 $" # Enable the hooks used for initializing the root memory-disk. # The ramdisk size must be kept in sync manually with the size of -# the `ramdisk' image (which is built in distrib/evbmips/ramdisk/ramdisk). +# the `ramdisk' image (which is built in distrib/evbmips/instkernel/ramdisk). pseudo-device md# memory disk device options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # force root on memory disk Index: src/sys/arch/evbmips/conf/INSTALL_LOONGSON diff -u src/sys/arch/evbmips/conf/INSTALL_LOONGSON:1.1 src/sys/arch/evbmips/conf/INSTALL_LOONGSON:1.2 --- src/sys/arch/evbmips/conf/INSTALL_LOONGSON:1.1 Mon Aug 29 18:32:18 2011 +++ src/sys/arch/evbmips/conf/INSTALL_LOONGSON Fri Jun 9 21:33:16 2023 @@ -1,12 +1,12 @@ -# $NetBSD: INSTALL_LOONGSON,v 1.1 2011/08/29 18:32:18 bouyer Exp $ +# $NetBSD: INSTALL_LOONGSON,v 1.2 2023/06/09 21:33:16 gutteridge Exp $ include "arch/evbmips/conf/LOONGSON" -#ident "INSTALL_LOONGSON-$Revision: 1.1 $" +#ident "INSTALL_LOONGSON-$Revision: 1.2 $" # Enable the hooks used for initializing the root memory-disk. # The ramdisk size must be kept in sync manually with the size of -# the `ramdisk' image (which is built in distrib/evbmips/ramdisk/ramdisk). +# the `ramdisk' image (which is built in distrib/evbmips/instkernel/ramdisk). pseudo-device md# memory disk device options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # force root on memory disk Index: src/sys/arch/evbmips/conf/INSTALL_ZYXELKX diff -u src/sys/arch/evbmips/conf/INSTALL_ZYXELKX:1.1 src/sys/arch/evbmips/conf/INSTALL_ZYXELKX:1.2 --- src/sys/arch/evbmips/conf/INSTALL_ZYXELKX:1.1 Wed Apr 30 01:01:04 2014 +++ src/sys/arch/evbmips/conf/INSTALL_ZYXELKX Fri Jun 9 21:33:16 2023 @@ -1,12 +1,12 @@ -# $NetBSD: INSTALL_ZYXELKX,v 1.1 2014/04/30 01:01:04 matt Exp $ +# $NetBSD: INSTALL_ZYXELKX,v 1.2 2023/06/09 21:33:16 gutteridge Exp $ include "arch/evbmips/conf/ZYXELKX" -#ident "INSTALL_ZYXELKX-$Revision: 1.1 $" +#ident "INSTALL_ZYXELKX-$Revision: 1.2 $" # Enable the hooks used for initializing the root memory-disk. # The ramdisk size must be kept in sync manually with the size of -# the `ramdisk' image (which is built in distrib/evbmips/ramdisk/ramdisk). +# the `ramdisk' image (which is built in distrib/evbmips/instkernel/ramdisk). pseudo-device md# memory disk device options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # force root on memory disk Index: src/sys/arch/evbmips/conf/INSTALL_CPMBR1400 diff -u src/sys/arch/evbmips/conf/INSTALL_CPMBR1400:1.2 src/sys/arch/evbmips/conf/INSTALL_CPMBR1400:1.3 --- src/sys/arch/evbmips/conf/INSTALL_CPMBR1400:1.2 Thu Jul 28 15:50:13 2011 +++ src/sys/arch/evbmips/conf/INSTALL_CPMBR1400 Fri Jun 9 21:33:16 2023 @@ -1,12 +1,12 @@ -# $NetBSD: INSTALL_CPMBR1400,v 1.2 2011/07/28 15:50:13 matt Exp $ +# $NetBSD: INSTALL_CPMBR1400,v 1.3 2023/06/09 21:33:16 gutteridge Exp $ include "arch/evbmips/conf/CPMBR1400" -#ident "INSTALL_MALTA-$Revision: 1.2 $" +#ident "INSTALL_MALTA-$Revision: 1.3 $" # Enable the hooks used for initializing the root memory-disk. # The ramdisk size must be kept in sync manually with the size of -# the `ramdisk' image (which is built in
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: gutteridge Date: Fri Jun 9 21:33:16 UTC 2023 Modified Files: src/sys/arch/evbmips/conf: INSTALL_CI20 INSTALL_CPMBR1400 INSTALL_LOONGSON INSTALL_MALTA INSTALL_MALTA32 INSTALL_MALTA64 INSTALL_OCTEON INSTALL_OMSAL400 INSTALL_XLSATX32 INSTALL_XLSATX64 INSTALL_ZYXELKX Log Message: INSTALL_*: correct a path in a comment To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/conf/INSTALL_CI20 \ src/sys/arch/evbmips/conf/INSTALL_LOONGSON \ src/sys/arch/evbmips/conf/INSTALL_ZYXELKX cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/conf/INSTALL_CPMBR1400 \ src/sys/arch/evbmips/conf/INSTALL_MALTA \ src/sys/arch/evbmips/conf/INSTALL_MALTA64 \ src/sys/arch/evbmips/conf/INSTALL_OCTEON \ src/sys/arch/evbmips/conf/INSTALL_OMSAL400 cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbmips/conf/INSTALL_MALTA32 \ src/sys/arch/evbmips/conf/INSTALL_XLSATX32 \ src/sys/arch/evbmips/conf/INSTALL_XLSATX64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: he Date: Sun Nov 27 14:54:25 UTC 2022 Modified Files: src/sys/arch/evbmips/conf: MIPSSIM Log Message: Bump MSGBUFSIZE to 32k; 4k just about overflows "by default" with qemu and mipssim-virtio machine type. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbmips/conf/MIPSSIM 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/evbmips/conf/MIPSSIM diff -u src/sys/arch/evbmips/conf/MIPSSIM:1.7 src/sys/arch/evbmips/conf/MIPSSIM:1.8 --- src/sys/arch/evbmips/conf/MIPSSIM:1.7 Tue Nov 15 14:49:14 2022 +++ src/sys/arch/evbmips/conf/MIPSSIM Sun Nov 27 14:54:25 2022 @@ -1,4 +1,4 @@ -# $NetBSD: MIPSSIM,v 1.7 2022/11/15 14:49:14 simonb Exp $ +# $NetBSD: MIPSSIM,v 1.8 2022/11/27 14:54:25 he Exp $ # # Kernel config for the QEMU MIPS "mipssim" simulator # @@ -8,7 +8,7 @@ include "arch/evbmips/conf/std.mipssim" -#ident "GENERIC-$Revision: 1.7 $" +#ident "GENERIC-$Revision: 1.8 $" maxusers 32 @@ -25,6 +25,8 @@ options TCP_CSUM_COUNTERS options UDP_CSUM_COUNTERS options TCP_OUTPUT_COUNTERS +options MSGBUFSIZE=32768 # need a bit more than 4K for virtio qemu + options NTP # network time protocol # Debugging options
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: he Date: Sun Nov 27 14:54:25 UTC 2022 Modified Files: src/sys/arch/evbmips/conf: MIPSSIM Log Message: Bump MSGBUFSIZE to 32k; 4k just about overflows "by default" with qemu and mipssim-virtio machine type. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbmips/conf/MIPSSIM Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: simonb Date: Tue Nov 15 14:49:14 UTC 2022 Modified Files: src/sys/arch/evbmips/conf: MIPSSIM Log Message: Enable CD9660; noticed by he@. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbmips/conf/MIPSSIM 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/evbmips/conf/MIPSSIM diff -u src/sys/arch/evbmips/conf/MIPSSIM:1.6 src/sys/arch/evbmips/conf/MIPSSIM:1.7 --- src/sys/arch/evbmips/conf/MIPSSIM:1.6 Sun Aug 7 02:52:25 2022 +++ src/sys/arch/evbmips/conf/MIPSSIM Tue Nov 15 14:49:14 2022 @@ -1,4 +1,4 @@ -# $NetBSD: MIPSSIM,v 1.6 2022/08/07 02:52:25 simonb Exp $ +# $NetBSD: MIPSSIM,v 1.7 2022/11/15 14:49:14 simonb Exp $ # # Kernel config for the QEMU MIPS "mipssim" simulator # @@ -8,7 +8,7 @@ include "arch/evbmips/conf/std.mipssim" -#ident "GENERIC-$Revision: 1.6 $" +#ident "GENERIC-$Revision: 1.7 $" maxusers 32 @@ -61,7 +61,7 @@ file-system FDESC # user file descripto #file-system UMAPFS # uid/gid remapping filesystem #file-system LFS # Log-based filesystem (still experimental) file-system PROCFS # /proc -#file-system CD9660 # ISO 9660 + Rock Ridge file system +file-system CD9660 # ISO 9660 + Rock Ridge file system file-system UNION # union file system #file-system MSDOSFS # MS-DOS FAT filesystem(s). #file-system CODA # Coda File System; also needs vcoda (below)
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: simonb Date: Tue Nov 15 14:49:14 UTC 2022 Modified Files: src/sys/arch/evbmips/conf: MIPSSIM Log Message: Enable CD9660; noticed by he@. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbmips/conf/MIPSSIM Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: simonb Date: Tue Nov 16 06:46:41 UTC 2021 Modified Files: src/sys/arch/evbmips/conf: MIPSSIM Log Message: Use 50Hz ticks so that time works accurately on hosts with 100Hz ticks. Note: The 20Kc CPU isn't handled correctly by QEMU, use the 5Kc CPU for a 64-bit guest for accurate time. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbmips/conf/MIPSSIM 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/evbmips/conf/MIPSSIM diff -u src/sys/arch/evbmips/conf/MIPSSIM:1.4 src/sys/arch/evbmips/conf/MIPSSIM:1.5 --- src/sys/arch/evbmips/conf/MIPSSIM:1.4 Tue Jun 15 16:43:48 2021 +++ src/sys/arch/evbmips/conf/MIPSSIM Tue Nov 16 06:46:41 2021 @@ -1,4 +1,4 @@ -# $NetBSD: MIPSSIM,v 1.4 2021/06/15 16:43:48 nia Exp $ +# $NetBSD: MIPSSIM,v 1.5 2021/11/16 06:46:41 simonb Exp $ # # Kernel config for the QEMU MIPS "mipssim" simulator # @@ -8,7 +8,7 @@ include "arch/evbmips/conf/std.mipssim" -#ident "GENERIC-$Revision: 1.4 $" +#ident "GENERIC-$Revision: 1.5 $" maxusers 32 @@ -16,7 +16,7 @@ options MIPS32 options MIPS32R2 options NOFPU # No FPU options FPEMUL # emulate FPU insn -#options HZ=512 # for profiling +options HZ=50 # half usual host speed #options LOCKDEBUG options SOSEND_COUNTERS
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: simonb Date: Tue Nov 16 06:46:41 UTC 2021 Modified Files: src/sys/arch/evbmips/conf: MIPSSIM Log Message: Use 50Hz ticks so that time works accurately on hosts with 100Hz ticks. Note: The 20Kc CPU isn't handled correctly by QEMU, use the 5Kc CPU for a 64-bit guest for accurate time. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbmips/conf/MIPSSIM Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/arch/evbmips/conf
> On Dec 30, 2018, at 4:34 PM, Sevan Janiyan wrote: > > On 30/12/2018 16:16, Jason Thorpe wrote: >> Maybe create a std.evmips that the various std. files can >> include to get options that you want for everything? > > Noted, I was thinking about the pull up to the 8 branch and making that > as easy as possible. I don't have anything else further at the moment, > should I go ahead any way? I would say pull this up to -8, and then make another cleanup pass. > > > Sevan -- thorpej
Re: CVS commit: src/sys/arch/evbmips/conf
On 30/12/2018 16:16, Jason Thorpe wrote: > Maybe create a std.evmips that the various std. files can > include to get options that you want for everything? Noted, I was thinking about the pull up to the 8 branch and making that as easy as possible. I don't have anything else further at the moment, should I go ahead any way? Sevan
Re: CVS commit: src/sys/arch/evbmips/conf
> On Dec 30, 2018, at 6:51 AM, Sevan Janiyan wrote: > > Modified Files: > src/sys/arch/evbmips/conf: ADM5120 ADM5120-NB ADM5120-USB ALCHEMY AP30 > CI20 CPMBR1400 DB120 ERLITE GDIUM LINKITSMART7688 LOONGSON MALTA > MERAKI RB153 RB433UAH SBMIPS WGT624V3 XLSATX ZYXELKX Maybe create a std.evmips that the various std. files can include to get options that you want for everything? -- thorpej
Re: CVS commit: src/sys/arch/evbmips/conf
On Tue, Aug 08, 2017 at 12:22:21PM +, Maya Rashish wrote: > This only need to be performed on kernel code, because only there we can have > accesses not translated/limited by TLB. For user code, it is impossible to > generate accesses to unwanted physical address. So it is safe. > > Also, to prevent addresses generated by user mode code to be used by the > kernel, we add a few empty jumps to flush the BTB upon entrance to kernel." Currently we do not do the empty jumps. the code claims it is flushing the BTB but it's hard to tell as the docs are in Chinese. Linux does this: /* * Clear BTB (branch target buffer), forbid RAS (return address * stack) to workaround the Out-of-order Issue in Loongson2F * via its diagnostic register. */ movek0, ra jal 1f nop 1: jal 1f nop 1: jal 1f nop 1: jal 1f nop 1: movera, k0 li k0, 3 mtc0k0, $22 I've changed the code be effectively: li k0, 3 mtc0 k0 $22 Also not sure if it's necessary to do on user_return...
Re: CVS commit: src/sys/arch/evbmips/conf
On Jul 30, 2012, at 6:50 AM, KIYOHARA Takashi wrote: Module Name: src Committed By: kiyohara Date: Mon Jul 30 13:50:06 UTC 2012 Modified Files: src/sys/arch/evbmips/conf: ALCHEMY MALTA Log Message: Enable INET6. Avoid build failed when enable ipf and disable INET6. The problem is in IPF. Please on't add hacks to fix it.
Re: CVS commit: src/sys/arch/evbmips/conf
On Mon, 30 Jul 2012, KIYOHARA Takashi wrote:
Module Name:src
Committed By: kiyohara
Date: Mon Jul 30 13:50:06 UTC 2012
Modified Files:
src/sys/arch/evbmips/conf: ALCHEMY MALTA
Log Message:
Enable INET6. Avoid build failed when enable ipf and disable INET6.
While this might be a stop-gap measure to get the build working, the
right action is to fix ipf so it builds without INET6.
I have previously provided patches (attached again here) to fix this,
and those fixes have been sent upstream (to darrenr@). As was already
pointed out, my patches should not be committed as-is due to my use of
variable initialization in the declaration... :)
-
| Paul Goyette | PGP Key fingerprint: | E-mail addresses: |
| Customer Service | FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com|
| Network Engineer | 0786 F758 55DE 53BA 7731 | pgoyette at juniper.net |
| Kernel Developer | | pgoyette at netbsd.org |
-Index: ip_ftp_pxy.c
===
RCS file: /cvsroot/src/sys/external/bsd/ipf/netinet/ip_ftp_pxy.c,v
retrieving revision 1.3
diff -u -p -r1.3 ip_ftp_pxy.c
--- ip_ftp_pxy.c22 Jul 2012 14:27:51 - 1.3
+++ ip_ftp_pxy.c25 Jul 2012 02:40:57 -
@@ -834,7 +834,7 @@ ipf_p_ftp_pasvreply(ipf_ftp_softc_t *sof
ipnat_t *ipn;
fr_info_t fi;
ftpside_t *f;
- nat_t *nat2;
+ nat_t *nat2 = NULL;
mb_t *m;
softc = fin-fin_main_soft;
@@ -1669,8 +1669,10 @@ ipf_p_ftp_eprt(ipf_ftp_softc_t *softf, f
if (f-ftps_rptr[5] == f-ftps_rptr[7]) {
if (f-ftps_rptr[6] == '1' nat-nat_v[0] == 4)
return ipf_p_ftp_eprt4(softf, fin, ip, nat, ftp, dlen);
+#ifdef USE_INET6
if (f-ftps_rptr[6] == '2' nat-nat_v[0] == 6)
return ipf_p_ftp_eprt6(softf, fin, ip, nat, ftp, dlen);
+#endif
}
return 0;
}
@@ -1902,7 +1904,7 @@ ipf_p_ftp_epsv(ipf_ftp_softc_t *softf, f
newbuf, s);
}
-
+#ifdef USE_INET6
int
ipf_p_ftp_eprt6(ipf_ftp_softc_t *softf, fr_info_t *fin, ip_t *ip,
nat_t *nat, ftpinfo_t *ftp, int dlen)
@@ -2107,3 +2109,4 @@ ipf_p_ftp_eprt6(ipf_ftp_softc_t *softf,
f-ftps_cmd = FTPXY_C_EPRT;
return ipf_p_ftp_addport(softf, fin, ip, nat, ftp, dlen, port, inc);
}
+#endif /* USE_INET6 */
Index: ip_nat.c
===
RCS file: /cvsroot/src/sys/external/bsd/ipf/netinet/ip_nat.c,v
retrieving revision 1.5
diff -u -p -r1.5 ip_nat.c
--- ip_nat.c22 Jul 2012 16:40:40 - 1.5
+++ ip_nat.c25 Jul 2012 02:40:57 -
@@ -2531,9 +2531,11 @@ ipf_nat_delrule(ipf_main_softc_t *softc,
case 4 :
ipf_nat_delrdr(softn, np);
break;
+#ifdef USE_INET6
case 6 :
ipf_nat6_delrdr(softn, np);
break;
+#endif
}
}
if (np-in_redir (NAT_MAPBLK|NAT_MAP)) {
@@ -2542,9 +2544,11 @@ ipf_nat_delrule(ipf_main_softc_t *softc,
case 4 :
ipf_nat_delmap(softn, np);
break;
+#ifdef USE_INET6
case 6 :
ipf_nat6_delmap(softn, np);
break;
+#endif
}
}
}
@@ -7969,18 +7973,6 @@ ipf_nat_rehash(ipf_main_softc_t *softc,
}
softn-ipf_nat_stats.ns_side[1].ns_bucketlen = bucketlens[1];
- if (softn-ipf_nat_stats.ns_side6[0].ns_bucketlen != NULL) {
- KFREES(softn-ipf_nat_stats.ns_side6[0].ns_bucketlen,
- softn-ipf_nat_table_sz * sizeof(u_int));
- }
- softn-ipf_nat_stats.ns_side6[0].ns_bucketlen = bucketlens[0];
-
- if (softn-ipf_nat_stats.ns_side6[1].ns_bucketlen != NULL) {
- KFREES(softn-ipf_nat_stats.ns_side6[1].ns_bucketlen,
- softn-ipf_nat_table_sz * sizeof(u_int));
- }
- softn-ipf_nat_stats.ns_side6[1].ns_bucketlen = bucketlens[1];
-
softn-ipf_nat_maxbucket = maxbucket;
softn-ipf_nat_table_sz = newsize;
/*
@@ -7990,8 +7982,6 @@ ipf_nat_rehash(ipf_main_softc_t *softc,
*/
softn-ipf_nat_stats.ns_side[0].ns_inuse = 0;
softn-ipf_nat_stats.ns_side[1].ns_inuse = 0;
- softn-ipf_nat_stats.ns_side6[0].ns_inuse = 0;
- softn-ipf_nat_stats.ns_side6[1].ns_inuse = 0;
for (nat = softn-ipf_nat_instances; nat != NULL; nat = nat-nat_next) {
nat-nat_hnext[0] = NULL;
Index: ip_rcmd_pxy.c
Re: CVS commit: src/sys/arch/evbmips/conf
Hi! From: Paul Goyette p...@whooppee.com Date: Mon, 30 Jul 2012 07:01:10 -0700 (PDT) On Mon, 30 Jul 2012, KIYOHARA Takashi wrote: Module Name:src Committed By: kiyohara Date: Mon Jul 30 13:50:06 UTC 2012 Modified Files: src/sys/arch/evbmips/conf: ALCHEMY MALTA Log Message: Enable INET6. Avoid build failed when enable ipf and disable INET6. While this might be a stop-gap measure to get the build working, the right action is to fix ipf so it builds without INET6. I have previously provided patches (attached again here) to fix this, and those fixes have been sent upstream (to darrenr@). As was already pointed out, my patches should not be committed as-is due to my use of variable initialization in the declaration... :) I am waiting for a fix of darrenr@, backout my add-hoc fix. What is OK? # Also please fix evbarm... Thanks, -- kiyohara OPENBLOCKS_A6 comming soon. :) And Psion series 5mx(EPOC32).
Re: CVS commit: src/sys/arch/evbmips/conf
On Jul 30, 2012, at 7:01 AM, Paul Goyette wrote: On Mon, 30 Jul 2012, KIYOHARA Takashi wrote: Module Name: src Committed By:kiyohara Date:Mon Jul 30 13:50:06 UTC 2012 Modified Files: src/sys/arch/evbmips/conf: ALCHEMY MALTA Log Message: Enable INET6. Avoid build failed when enable ipf and disable INET6. While this might be a stop-gap measure to get the build working, the right action is to fix ipf so it builds without INET6. I have previously provided patches (attached again here) to fix this, and those fixes have been sent upstream (to darrenr@). As was already pointed out, my patches should not be committed as-is due to my use of variable initialization in the declaration... :) Uh, that's perfectly acceptable these days.
