Rework Mediatek/Ralink configuration files

Only compile what each SoC needs and get rid of MEDIATEK generic config.

Approved by:	adrian (mentor)
Sponsored by:	Smartcom - Bulgaria AD
Differential Revision:	https://reviews.freebsd.org/D5996

11 files changed, 503 insertions, 184 deletions

diff --git a/sys/mips/conf/MEDIATEK b/sys/mips/conf/MEDIATEK
deleted file mode 100644
index 4cf8225..0000000
--- a/sys/mips/conf/MEDIATEK
+++ /dev/null
@@ -1,81 +0,0 @@
-#
-# MEDIATEK -- Kernel configuration file for FreeBSD/MIPS Mediatek/Ralink SoCs
-#
-# This includes all the configurable parts of the kernel. Please read through
-# the sections below and customize the options to fit your board if needed.
-#
-# $FreeBSD$
-#
-
-#NO_UNIVERSE
-
-# Don't build any modules by default
-makeoptions 	MODULES_OVERRIDE=""
-
-#
-# Default rootfs device configuration, should be changed to suit target board
-#
-options 	ROOTDEVNAME=\"ufs:md0.uzip\"
-
-#
-# Optional drivers section
-#
-# What follows is optional support drivers for the Mediatek SoCs.
-# The kernel can be compiled without them if size is a concern.
-# All optional drivers are built by default.
-#
-
-# Support geom_uzip(4) compressed disk images
-device 		geom_uzip
-options 	GEOM_UZIP
-
-# Support md(4) and md-based rootfs
-device 		md
-options 	MD_ROOT
-
-# SPI and SPI flash support
-device 		spibus
-device 		mx25l
-
-# GPIO and gpioled support
-device 		gpio
-device 		gpioled
-
-# PCI support
-device 		pci
-
-#
-# USB (ehci, ohci, xhci, otg) support. Unneeded drivers can be commented in
-# order to lower kernel size. See below for driver SoC support.
-#
-# For all SoCs that require USB support
-device 		usb
-# For RT3050, RT3052 and RT3350 SoCs
-device 		dwcotg
-# For RT3352, RT3662, RT3883, RT5350, MT7620, MT7628 and MT7688
-device 		ohci
-device 		ehci
-# For MT7621, or cases where the target board has a XHCI controller on PCI
-# (for example Asus RT-N65U)
-device 		xhci
-
-# USB umass(4) storage and da(4) support
-device 		umass
-device 		da
-
-# ahci(4) and ada(4) support, depends on PCI
-device 		ahci
-device 		ada
-
-# CAM support, required if either umass(4) or ahci(4) is enabled above
-device 		pass
-device 		scbus
-
-# Ethernet, BPS and bridge support
-device 		rt
-device 		bpf
-device 		if_bridge
-
-# Extres
-device 		ext_resources
-device 		clk
diff --git a/sys/mips/conf/MT7620A_FDT b/sys/mips/conf/MT7620A_FDT
index 8468304..46b3cff 100644
--- a/sys/mips/conf/MT7620A_FDT
+++ b/sys/mips/conf/MT7620A_FDT
@@ -1,8 +1,7 @@
 #
 # MT7620A_FDT -- Kernel configuration file for FreeBSD/MIPS MT7620A SoC
 #
-# This includes all the configurable parts of the kernel. Please read through
-# MEDIATEK kernel config and customize the options to fit your board if needed.
+# This includes all the configurable parts of the kernel.
 #
 # $FreeBSD$
 #
@@ -14,17 +13,65 @@
 #
 #makeoptions 	FDT_DTS_FILE=MT7620a.dts
 
-#
-# The user should never have to edit what's below this line.
-# If customizations are needed, they should be done to the MEDIATEK kernel
-# configuration.
-#
-
 # Start with a base configuration
-include 	MEDIATEK_BASE
+include 	"../mediatek/std.mediatek"
 
 ident 		MT7620A
 cpu 		CPU_MIPS24K
 
-# Include optional configuration (to be edited by the user if needed)
-include 	MEDIATEK
+# Don't build any modules by default
+makeoptions 	MODULES_OVERRIDE=""
+
+# Default rootfs device configuration, should be changed to suit target board
+options 	ROOTDEVNAME=\"ufs:md0.uzip\"
+
+# Support geom_uzip(4) compressed disk images
+device 		geom_uzip
+options 	GEOM_UZIP
+
+# Support md(4) and md-based rootfs
+device 		md
+options 	MD_ROOT
+
+# Interrupt controller support
+device 		mtk_intr_v1
+
+# UART device support
+nodevice 	uart_ns8250
+device 		uart_dev_mtk
+
+# SPI and SPI flash support
+device 		mtk_spi_v1
+device 		spibus
+device 		mx25l
+
+# GPIO and gpioled support
+device 		mtk_gpio_v1
+device 		gpio
+device 		gpioled
+
+# PCI support
+device 		pci
+
+# USB (ehci, ohci) support
+device 		usb
+device 		mtk_usb_phy
+device 		ehci
+device 		ohci
+
+# USB umass(4) storage and da(4) support
+device 		umass
+device 		da
+
+# CAM support, required if umass(4) is enabled above
+device 		pass
+device 		scbus
+
+# Ethernet, BPF and bridge support
+device 		rt
+device 		bpf
+device 		if_bridge
+
+# Extres
+device 		ext_resources
+device 		clk
diff --git a/sys/mips/conf/MT7620N_FDT b/sys/mips/conf/MT7620N_FDT
index 64222df..4330ecd 100644
--- a/sys/mips/conf/MT7620N_FDT
+++ b/sys/mips/conf/MT7620N_FDT
@@ -1,8 +1,7 @@
 #
 # MT7620N_FDT -- Kernel configuration file for FreeBSD/MIPS MT7620N SoC
 #
-# This includes all the configurable parts of the kernel. Please read through
-# MEDIATEK kernel config and customize the options to fit your board if needed.
+# This includes all the configurable parts of the kernel.
 #
 # $FreeBSD$
 #
@@ -14,17 +13,62 @@
 #
 #makeoptions 	FDT_DTS_FILE=WRTNODE.dts
 
-#
-# The user should never have to edit what's below this line.
-# If customizations are needed, they should be done to the MEDIATEK kernel
-# configuration.
-#
-
 # Start with a base configuration
-include 	MEDIATEK_BASE
+include 	"../mediatek/std.mediatek"
 
 ident 		MT7620N
 cpu 		CPU_MIPS24K
 
-# Include optional configuration (to be edited by the user if needed)
-include 	MEDIATEK
+# Don't build any modules by default
+makeoptions 	MODULES_OVERRIDE=""
+
+# Default rootfs device configuration, should be changed to suit target board
+options 	ROOTDEVNAME=\"ufs:md0.uzip\"
+
+# Support geom_uzip(4) compressed disk images
+device 		geom_uzip
+options 	GEOM_UZIP
+
+# Support md(4) and md-based rootfs
+device 		md
+options 	MD_ROOT
+
+# Interrupt controller support
+device 		mtk_intr_v1
+
+# UART device support
+nodevice 	uart_ns8250
+device 		uart_dev_mtk
+
+# SPI and SPI flash support
+device 		mtk_spi_v1
+device 		spibus
+device 		mx25l
+
+# GPIO and gpioled support
+device 		mtk_gpio_v1
+device 		gpio
+device 		gpioled
+
+# USB (ehci, ohci) support
+device 		usb
+device 		mtk_usb_phy
+device 		ehci
+device 		ohci
+
+# USB umass(4) storage and da(4) support
+device 		umass
+device 		da
+
+# CAM support, required if umass(4) is enabled above
+device 		pass
+device 		scbus
+
+# Ethernet, BPF and bridge support
+device 		rt
+device 		bpf
+device 		if_bridge
+
+# Extres
+device 		ext_resources
+device 		clk
diff --git a/sys/mips/conf/MT7621_FDT b/sys/mips/conf/MT7621_FDT
index a80c953..848df05 100644
--- a/sys/mips/conf/MT7621_FDT
+++ b/sys/mips/conf/MT7621_FDT
@@ -1,8 +1,7 @@
 #
 # MT7621_FDT -- Kernel configuration file for FreeBSD/MIPS MT7621 SoC
 #
-# This includes all the configurable parts of the kernel. Please read through
-# MEDIATEK kernel config and customize the options to fit your board if needed.
+# This includes all the configurable parts of the kernel.
 #
 # $FreeBSD$
 #
@@ -12,19 +11,63 @@
 #
 # FDT_DTS_FILE should be modified to suit the target board type.
 #
-#makeoptions 	FDT_DTS_FILE=ZBT-WG2626.dts
-
-#
-# The user should never have to edit what's below this line.
-# If customizations are needed, they should be done to the MEDIATEK kernel
-# configuration.
-#
+#makeoptions 	FDT_DTS_FILE=WITI.dts
 
 # Start with a base configuration
-include 	MEDIATEK_BASE
+include 	"../mediatek/std.mediatek"
 
 ident 		MT7621
 cpu 		CPU_MIPS1004K
 
-# Include optional configuration (to be edited by the user if needed)
-include 	MEDIATEK
+# Don't build any modules by default
+makeoptions 	MODULES_OVERRIDE=""
+
+# Default rootfs device configuration, should be changed to suit target board
+options 	ROOTDEVNAME=\"ufs:md0.uzip\"
+
+# Support geom_uzip(4) compressed disk images
+device 		geom_uzip
+options 	GEOM_UZIP
+
+# Support md(4) and md-based rootfs
+device 		md
+options 	MD_ROOT
+
+# Interrupt controller support
+device 		mtk_intr_gic
+
+# UART device support is compiled in when uart_ns8250 is selected (default)
+
+# SPI and SPI flash support
+device 		mtk_spi_v2
+device 		spibus
+device 		mx25l
+
+# GPIO and gpioled support
+device 		mtk_gpio_v2
+device 		gpio
+device 		gpioled
+
+# PCI support
+device 		pci
+
+# USB (ehci, ohci) support
+device 		usb
+device 		xhci
+
+# USB umass(4) storage and da(4) support
+device 		umass
+device 		da
+
+# CAM support, required if umass(4) is enabled above
+device 		pass
+device 		scbus
+
+# Ethernet, BPF and bridge support
+device 		rt
+device 		bpf
+device 		if_bridge
+
+# Extres
+device 		ext_resources
+device 		clk
diff --git a/sys/mips/conf/MT7628_FDT b/sys/mips/conf/MT7628_FDT
index bbffa65..f7dfc14 100644
--- a/sys/mips/conf/MT7628_FDT
+++ b/sys/mips/conf/MT7628_FDT
@@ -1,8 +1,8 @@
 #
-# MT7628_FDT -- Kernel configuration file for FreeBSD/MIPS MT7628/MT7688 SoCs
+# MT7628_FDT -- Kernel configuration file for FreeBSD/MIPS MT7628 and MT7688
+# SoCs
 #
-# This includes all the configurable parts of the kernel. Please read through
-# MEDIATEK kernel config and customize the options to fit your board if needed.
+# This includes all the configurable parts of the kernel.
 #
 # $FreeBSD$
 #
@@ -12,19 +12,65 @@
 #
 # FDT_DTS_FILE should be modified to suit the target board type.
 #
-#makeoptions 	FDT_DTS_FILE=MT7628.dts
-
-#
-# The user should never have to edit what's below this line.
-# If customizations are needed, they should be done to the MEDIATEK kernel
-# configuration.
-#
+#makeoptions 	FDT_DTS_FILE=LINKIT7688.dts
 
 # Start with a base configuration
-include 	MEDIATEK_BASE
+include 	"../mediatek/std.mediatek"
 
 ident 		MT7628
 cpu 		CPU_MIPS24K
 
-# Include optional configuration (to be edited by the user if needed)
-include 	MEDIATEK
+# Don't build any modules by default
+makeoptions 	MODULES_OVERRIDE=""
+
+# Default rootfs device configuration, should be changed to suit target board
+options 	ROOTDEVNAME=\"ufs:md0.uzip\"
+
+# Support geom_uzip(4) compressed disk images
+device 		geom_uzip
+options 	GEOM_UZIP
+
+# Support md(4) and md-based rootfs
+device 		md
+options 	MD_ROOT
+
+# Interrupt controller support
+device 		mtk_intr_v2
+
+# UART device support is compiled in when uart_ns8250 is selected (default)
+
+# SPI and SPI flash support
+device 		mtk_spi_v2
+device 		spibus
+device 		mx25l
+
+# GPIO and gpioled support
+device 		mtk_gpio_v2
+device 		gpio
+device 		gpioled
+
+# PCI support
+device 		pci
+
+# USB (ehci, ohci) support
+device 		usb
+device 		mtk_usb_phy
+device 		ehci
+device 		ohci
+
+# USB umass(4) storage and da(4) support
+device 		umass
+device 		da
+
+# CAM support, required if umass(4) is enabled above
+device 		pass
+device 		scbus
+
+# Ethernet, BPF and bridge support
+device 		rt
+device 		bpf
+device 		if_bridge
+
+# Extres
+device 		ext_resources
+device 		clk
diff --git a/sys/mips/conf/RT3050_FDT b/sys/mips/conf/RT3050_FDT
index 435020f..b49fe59 100644
--- a/sys/mips/conf/RT3050_FDT
+++ b/sys/mips/conf/RT3050_FDT
@@ -1,9 +1,8 @@
 #
-# RT3050_FDT -- Kernel configuration file for FreeBSD/MIPS RT3050/RT3052/RT3350
-# SoCs
+# RT3050_FDT -- Kernel configuration file for FreeBSD/MIPS RT3050, RT3052 and
+# RT3350 SoCs
 #
-# This includes all the configurable parts of the kernel. Please read through
-# MEDIATEK kernel config and customize the options to fit your board if needed.
+# This includes all the configurable parts of the kernel.
 #
 # $FreeBSD$
 #
@@ -15,17 +14,65 @@
 #
 #makeoptions 	FDT_DTS_FILE=DIR-600-B1.dts
 
-#
-# The user should never have to edit what's below this line.
-# If customizations are needed, they should be done to the MEDIATEK kernel
-# configuration.
-#
-
 # Start with a base configuration
-include 	MEDIATEK_BASE
+include 	"../mediatek/std.mediatek"
 
 ident 		RT3050
 cpu 		CPU_MIPS24K
 
-# Include optional configuration (to be edited by the user if needed)
-include 	MEDIATEK
+# Don't build any modules by default
+makeoptions 	MODULES_OVERRIDE=""
+
+# Default rootfs device configuration, should be changed to suit target board
+options 	ROOTDEVNAME=\"ufs:md0.uzip\"
+
+# Support geom_uzip(4) compressed disk images
+device 		geom_uzip
+options 	GEOM_UZIP
+
+# Support md(4) and md-based rootfs
+device 		md
+options 	MD_ROOT
+
+# Interrupt controller support
+device 		mtk_intr_v1
+
+# UART device support
+nodevice 	uart_ns8250
+device 		uart_dev_mtk
+
+# SPI and SPI flash support
+device 		mtk_spi_v1
+device 		spibus
+device 		mx25l
+
+# CFI support
+device 		cfi
+device 		cfid
+
+# GPIO and gpioled support
+device 		mtk_gpio_v1
+device 		gpio
+device 		gpioled
+
+# USB (dwcotg) support
+device 		usb
+device 		mtk_usb_phy
+device 		dwcotg
+
+# USB umass(4) storage and da(4) support
+device 		umass
+device 		da
+
+# CAM support, required if umass(4) is enabled above
+device 		pass
+device 		scbus
+
+# Ethernet, BPF and bridge support
+device 		rt
+device 		bpf
+device 		if_bridge
+
+# Extres
+device 		ext_resources
+device 		clk
diff --git a/sys/mips/conf/RT3352_FDT b/sys/mips/conf/RT3352_FDT
index ec33b9c..99b1702 100644
--- a/sys/mips/conf/RT3352_FDT
+++ b/sys/mips/conf/RT3352_FDT
@@ -1,8 +1,7 @@
 #
 # RT3352_FDT -- Kernel configuration file for FreeBSD/MIPS RT3352 SoC
 #
-# This includes all the configurable parts of the kernel. Please read through
-# MEDIATEK kernel config and customize the options to fit your board if needed.
+# This includes all the configurable parts of the kernel.
 #
 # $FreeBSD$
 #
@@ -14,17 +13,62 @@
 #
 #makeoptions 	FDT_DTS_FILE=DIR-615-H1.dts
 
-#
-# The user should never have to edit what's below this line.
-# If customizations are needed, they should be done to the MEDIATEK kernel
-# configuration.
-#
-
 # Start with a base configuration
-include 	MEDIATEK_BASE
+include 	"../mediatek/std.mediatek"
 
 ident 		RT3352
 cpu 		CPU_MIPS24K
 
-# Include optional configuration (to be edited by the user if needed)
-include 	MEDIATEK
+# Don't build any modules by default
+makeoptions 	MODULES_OVERRIDE=""
+
+# Default rootfs device configuration, should be changed to suit target board
+options 	ROOTDEVNAME=\"ufs:md0.uzip\"
+
+# Support geom_uzip(4) compressed disk images
+device 		geom_uzip
+options 	GEOM_UZIP
+
+# Support md(4) and md-based rootfs
+device 		md
+options 	MD_ROOT
+
+# Interrupt controller support
+device 		mtk_intr_v1
+
+# UART device support
+nodevice 	uart_ns8250
+device 		uart_dev_mtk
+
+# SPI and SPI flash support
+device 		mtk_spi_v1
+device 		spibus
+device 		mx25l
+
+# GPIO and gpioled support
+device 		mtk_gpio_v1
+device 		gpio
+device 		gpioled
+
+# USB (ehci, ohci) support
+device 		usb
+device 		mtk_usb_phy
+device 		ehci
+device 		ohci
+
+# USB umass(4) storage and da(4) support
+device 		umass
+device 		da
+
+# CAM support, required if umass(4) is enabled above
+device 		pass
+device 		scbus
+
+# Ethernet, BPF and bridge support
+device 		rt
+device 		bpf
+device 		if_bridge
+
+# Extres
+device 		ext_resources
+device 		clk
diff --git a/sys/mips/conf/RT3883_FDT b/sys/mips/conf/RT3883_FDT
index 6229e2c..df1597b 100644
--- a/sys/mips/conf/RT3883_FDT
+++ b/sys/mips/conf/RT3883_FDT
@@ -1,8 +1,8 @@
 #
-# RT3883_FDT -- Kernel configuration file for FreeBSD/MIPS RT3662/RT3883 SoCs
+# RT3883_FDT -- Kernel configuration file for FreeBSD/MIPS RT3662 and RT3883
+# SoCs
 #
-# This includes all the configurable parts of the kernel. Please read through
-# MEDIATEK kernel config and customize the options to fit your board if needed.
+# This includes all the configurable parts of the kernel.
 #
 # $FreeBSD$
 #
@@ -14,17 +14,65 @@
 #
 #makeoptions 	FDT_DTS_FILE=DIR-645.dts
 
-#
-# The user should never have to edit what's below this line.
-# If customizations are needed, they should be done to the MEDIATEK kernel
-# configuration.
-#
-
 # Start with a base configuration
-include 	MEDIATEK_BASE
+include 	"../mediatek/std.mediatek"
 
 ident 		RT3883
 cpu 		CPU_MIPS74K
 
-# Include optional configuration (to be edited by the user if needed)
-include 	MEDIATEK
+# Don't build any modules by default
+makeoptions 	MODULES_OVERRIDE=""
+
+# Default rootfs device configuration, should be changed to suit target board
+options 	ROOTDEVNAME=\"ufs:md0.uzip\"
+
+# Support geom_uzip(4) compressed disk images
+device 		geom_uzip
+options 	GEOM_UZIP
+
+# Support md(4) and md-based rootfs
+device 		md
+options 	MD_ROOT
+
+# Interrupt controller support
+device 		mtk_intr_v1
+
+# UART device support
+nodevice 	uart_ns8250
+device 		uart_dev_mtk
+
+# SPI and SPI flash support
+device 		mtk_spi_v1
+device 		spibus
+device 		mx25l
+
+# CFI support
+#device 		cfi
+#device 		cfid
+
+# GPIO and gpioled support
+device 		mtk_gpio_v1
+device 		gpio
+device 		gpioled
+
+# USB (dwcotg) support
+device 		usb
+device 		mtk_usb_phy
+device 		dwcotg
+
+# USB umass(4) storage and da(4) support
+device 		umass
+device 		da
+
+# CAM support, required if umass(4) is enabled above
+device 		pass
+device 		scbus
+
+# Ethernet, BPF and bridge support
+device 		rt
+device 		bpf
+device 		if_bridge
+
+# Extres
+device 		ext_resources
+device 		clk
diff --git a/sys/mips/conf/RT5350_FDT b/sys/mips/conf/RT5350_FDT
index 827bdd3..ad1f8bb 100644
--- a/sys/mips/conf/RT5350_FDT
+++ b/sys/mips/conf/RT5350_FDT
@@ -1,8 +1,7 @@
 #
 # RT5350_FDT -- Kernel configuration file for FreeBSD/MIPS RT5350 SoC
 #
-# This includes all the configurable parts of the kernel. Please read through
-# MEDIATEK kernel config and customize the options to fit your board if needed.
+# This includes all the configurable parts of the kernel.
 #
 # $FreeBSD$
 #
@@ -12,19 +11,64 @@
 #
 # FDT_DTS_FILE should be modified to suit the target board type.
 #
-#makeoptions 	FDT_DTS_FILE=DIR-300-B7.dts
-
-#
-# The user should never have to edit what's below this line.
-# If customizations are needed, they should be done to the MEDIATEK kernel
-# configuration.
-#
+#makeoptions 	FDT_DTS_FILE=DIR-610-A1.dts
 
 # Start with a base configuration
-include 	MEDIATEK_BASE
+include 	"../mediatek/std.mediatek"
 
 ident 		RT5350
 cpu 		CPU_MIPS24K
 
-# Include optional configuration (to be edited by the user if needed)
-include 	MEDIATEK
+# Don't build any modules by default
+makeoptions 	MODULES_OVERRIDE=""
+
+# Default rootfs device configuration, should be changed to suit target board
+options 	ROOTDEVNAME=\"ufs:md0.uzip\"
+
+# Support geom_uzip(4) compressed disk images
+device 		geom_uzip
+options 	GEOM_UZIP
+
+# Support md(4) and md-based rootfs
+device 		md
+options 	MD_ROOT
+
+# Interrupt controller support
+device 		mtk_intr_v1
+
+# UART device support
+nodevice 	uart_ns8250
+device 		uart_dev_mtk
+
+# SPI and SPI flash support
+device 		mtk_spi_v1
+device 		spibus
+device 		mx25l
+
+# GPIO and gpioled support
+device 		mtk_gpio_v1
+device 		gpio
+device 		gpioled
+
+# USB (ehci, ohci) support
+device 		usb
+device 		mtk_usb_phy
+device 		ehci
+device 		ohci
+
+# USB umass(4) storage and da(4) support
+device 		umass
+device 		da
+
+# CAM support, required if umass(4) is enabled above
+device 		pass
+device 		scbus
+
+# Ethernet, BPF and bridge support
+device 		rt
+device 		bpf
+device 		if_bridge
+
+# Extres
+device 		ext_resources
+device 		clk
diff --git a/sys/mips/mediatek/files.mediatek b/sys/mips/mediatek/files.mediatek
new file mode 100644
index 0000000..1345920
--- /dev/null
+++ b/sys/mips/mediatek/files.mediatek
@@ -0,0 +1,42 @@
+# $FreeBSD$
+
+mips/mediatek/mtk_machdep.c 		standard
+mips/mediatek/mtk_sysctl.c 		standard
+mips/mediatek/mtk_soc.c 		standard
+mips/mediatek/mtk_reset.c 		standard
+mips/mediatek/mtk_clock.c 		standard
+mips/mediatek/mtk_pinctrl.c 		standard
+mips/mediatek/palmbus.c			standard
+mips/mediatek/mtk_intr_v1.c 		optional mtk_intr_v1
+mips/mediatek/mtk_intr_v2.c 		optional mtk_intr_v2
+mips/mediatek/mtk_intr_gic.c 		optional mtk_intr_gic
+mips/mediatek/uart_dev_mtk.c 		optional uart uart_dev_mtk
+mips/mediatek/uart_dev_mtk_ns8250.c 	optional uart uart_ns8250
+mips/mediatek/mtk_spi_v1.c 		optional spibus mtk_spi_v1
+mips/mediatek/mtk_spi_v2.c 		optional spibus mtk_spi_v2
+mips/mediatek/mtk_usb_phy.c 		optional usb mtk_usb_phy
+mips/mediatek/mtk_xhci.c 		optional usb xhci
+mips/mediatek/mtk_ohci.c 		optional usb ohci
+mips/mediatek/mtk_ehci.c 		optional usb ehci
+mips/mediatek/mtk_dotg.c 		optional usb dwcotg
+mips/mediatek/mtk_pcie.c 		optional pci
+mips/mediatek/mtk_gpio_v1.c 		optional gpio mtk_gpio_v1
+mips/mediatek/mtk_gpio_v2.c 		optional gpio mtk_gpio_v2
+#mips/mediatek/mtk_mmc.c 		optional mmc
+
+# Ralink/Mediatek Ethernet driver
+dev/rt/if_rt.c 				optional rt
+
+# Hack to reuse ARM intrng code
+kern/subr_intr.c 			standard
+kern/pic_if.m 				standard
+
+# Intrng compatible MIPS32 interrupt controller
+mips/mips/mips_pic.c 			standard
+
+# Standard MIPS ticker
+mips/mips/tick.c 			standard
+
+# Temporary Reset if
+mips/mediatek/fdt_reset.c 		standard
+mips/mediatek/fdt_reset_if.m 		standard
diff --git a/sys/mips/conf/MEDIATEK_BASE b/sys/mips/mediatek/std.mediatek
index 13bb9a6..df7a876 100644
--- a/sys/mips/conf/MEDIATEK_BASE
+++ b/sys/mips/mediatek/std.mediatek
@@ -1,19 +1,14 @@
 #
-# MEDIATEK_BASE -- Base kernel configuration file for FreeBSD/MIPS
-# Mediatek/Ralink SoCs.
+# std.mtk -- Base kernel configuration file for FreeBSD/MIPS Mediatek/Ralink
+# SoCs.
 #
 # This includes all the required drivers for the SoCs.
-# Ususally, users should not build this kernel configuration. It is provided
-# only as a minimum base, from which customizations can be made. Please look
-# at MEDIATEK kernel configuration for customization details.
 #
 # $FreeBSD$
 #
 
-#NO_UNIVERSE
-
 # Include the standard file list for Mediatek SoCs.
-files 		"../mediatek/files.mtk"
+files 		"../mediatek/files.mediatek"
 
 # Building a mips/mipsel kernel
 machine 	mips mipsel