Module Name: src
Committed By: nisimura
Date: Mon Mar 16 08:17:58 UTC 2020
Modified Files:
src/sys/arch/evbarm/conf: GENERIC64 files.generic64
Log Message:
include files.sociox for generic64
To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 src/sys/arch/evbarm/conf/GENERIC64
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/conf/files.generic64
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/evbarm/conf/GENERIC64
diff -u src/sys/arch/evbarm/conf/GENERIC64:1.140 src/sys/arch/evbarm/conf/GENERIC64:1.141
--- src/sys/arch/evbarm/conf/GENERIC64:1.140 Sat Feb 22 18:57:50 2020
+++ src/sys/arch/evbarm/conf/GENERIC64 Mon Mar 16 08:17:57 2020
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC64,v 1.140 2020/02/22 18:57:50 jmcneill Exp $
+# $NetBSD: GENERIC64,v 1.141 2020/03/16 08:17:57 nisimura Exp $
#
# GENERIC ARM (aarch64) kernel
#
@@ -325,6 +325,7 @@ pci* at ppb?
awge* at fdt? # DesignWare Gigabit Ethernet
emac* at fdt? # Allwinner Gigabit Ethernet (EMAC)
enet* at fdt? # IMX FEC
+scx* at fdt? # SocioNext Gigabit Ethernet
aq* at pci? dev ? function ? # Aquantia AQC 10 gigabit
ena* at pci? dev ? function ? # Amazon.com Elastic Network Adapter
genet* at acpi? # Broadcom GENET v5
@@ -521,7 +522,7 @@ options FONT_BOLD8x16
options FONT_BOLD16x32
# GPU
-#nouveau* at fdt? # NVIDIA GPU
+nouveau* at fdt? # NVIDIA GPU
# Backlight
pwmbacklight* at fdt? # PWM Backlight controls
Index: src/sys/arch/evbarm/conf/files.generic64
diff -u src/sys/arch/evbarm/conf/files.generic64:1.15 src/sys/arch/evbarm/conf/files.generic64:1.16
--- src/sys/arch/evbarm/conf/files.generic64:1.15 Wed Jan 15 01:09:57 2020
+++ src/sys/arch/evbarm/conf/files.generic64 Mon Mar 16 08:17:58 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.generic64,v 1.15 2020/01/15 01:09:57 jmcneill Exp $
+# $NetBSD: files.generic64,v 1.16 2020/03/16 08:17:58 nisimura Exp $
#
# A generic (aarch64) kernel configuration info
#
@@ -18,6 +18,7 @@ include "arch/arm/nvidia/files.tegra"
include "arch/arm/rockchip/files.rockchip"
include "arch/arm/sunxi/files.sunxi"
include "arch/arm/virt/files.virt"
+include "arch/arm/sociox/files.sociox"
#
# Stack-less Just-In-Time compiler
