Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename the evbmips ERLITE kernel to OCTEON now that it supports more

Browse Source 
than just the EdgeRouter Lite.
This commit is contained in:
simonb 2020-07-15 12:15:30 +00:00
parent 544c59d00e
commit bc6a081a98
5 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
distrib/evbmips/instkernel/instkernel/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.6 2015/05/09 02:12:29 matt Exp $
# $NetBSD: Makefile,v 1.7 2020/07/15 12:15:30 simonb Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@ -20,7 +20,7 @@ MDSETTARGETS+= INSTALL_XLSATX64 ${RAMDISK} -
.if ${MACHINE_ARCH} == "mips64el"
MDSETTARGETS+= INSTALL_LOONGSON ${RAMDISK} -
.else
MDSETTARGETS+= INSTALL_ERLITE ${RAMDISK} -
MDSETTARGETS+= INSTALL_OCTEON ${RAMDISK} -
.endif
.else

6
doc/CHANGES
View File

@ -1,4 +1,4 @@
# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2714 $>
# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2715 $>
#
#
# [Note: This file does not mention every change made to the NetBSD source tree.
@ -251,3 +251,7 @@ Changes from NetBSD 9.0 to NetBSD 10.0:
ciss(4): Add support for PERFORMANT mode, and enable MSI/MSI-X
for adapters supporting it [jdolecek 20200714]
ciss(4): Match new HP Smart Array adapters [jdolecek 20200714]
evbmips: Renamed kernel config files:
ERLITE -> OCTEON
INSTALL_ERLITE -> INSTALL_OCTEON
[simonb 20200715]

6
etc/etc.evbmips/Makefile.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.22 2017/08/15 10:11:31 mrg Exp $
# $NetBSD: Makefile.inc,v 1.23 2020/07/15 12:15:30 simonb Exp $
#
# etc.evbmips/Makefile.inc -- evbmips-specific etc Makefile targets
#
@ -26,8 +26,8 @@ KERNEL_SETS+= LOONGSON
BUILD_KERNELS+= INSTALL_LOONGSON
KERNEL_SETS+= GDIUM64
. else
KERNEL_SETS+= ERLITE
BUILD_KERNELS+= INSTALL_ERLITE
KERNEL_SETS+= OCTEON
BUILD_KERNELS+= INSTALL_OCTEON
. endif
.else
KERNEL_SETS= ALCHEMY DB120 DBAU1500 DBAU1550 MALTA RB433UAH

6
sys/arch/evbmips/conf/INSTALL_ERLITE → sys/arch/evbmips/conf/INSTALL_OCTEON
View File

@ -1,8 +1,8 @@
# $NetBSD: INSTALL_ERLITE,v 1.2 2015/05/18 01:53:21 matt Exp $
# $NetBSD: INSTALL_OCTEON,v 1.1 2020/07/15 12:15:30 simonb Exp $
include "arch/evbmips/conf/ERLITE"
include "arch/evbmips/conf/OCTEON"
#ident "INSTALL_ERLITE-$Revision: 1.2 $"
#ident "INSTALL_ERLITE-$Revision: 1.1 $"
# Enable the hooks used for initializing the root memory-disk.
# The ramdisk size must be kept in sync manually with the size of

6
sys/arch/evbmips/conf/ERLITE → sys/arch/evbmips/conf/OCTEON
View File

@ -1,11 +1,11 @@
# $NetBSD: ERLITE,v 1.27 2020/06/23 05:18:02 simonb Exp $
# $NetBSD: OCTEON,v 1.1 2020/07/15 12:15:30 simonb Exp $
include "arch/mips/conf/std.octeon"
include "arch/evbmips/conf/files.octeon"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "ERLITE-$Revision: 1.27 $"
#ident "ERLITE-$Revision: 1.1 $"
maxusers 32
@ -177,4 +177,4 @@ pseudo-device drvctl # driver control
include "dev/veriexec.config"
cinclude "arch/evbmips/conf/ERLITE.local"
cinclude "arch/evbmips/conf/OCTEON.local"