Date: Thu, 21 Apr 2016 07:40:03 +0000 (UTC) From: Stanislav Galabov <sgalabov@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298397 - in head/sys/mips: conf mediatek Message-ID: <201604210740.u3L7e3L4077723@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sgalabov Date: Thu Apr 21 07:40:03 2016 New Revision: 298397 URL: https://svnweb.freebsd.org/changeset/base/298397 Log: 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 Added: head/sys/mips/mediatek/files.mediatek (contents, props changed) head/sys/mips/mediatek/std.mediatek (contents, props changed) Deleted: head/sys/mips/conf/MEDIATEK head/sys/mips/conf/MEDIATEK_BASE Modified: head/sys/mips/conf/MT7620A_FDT head/sys/mips/conf/MT7620N_FDT head/sys/mips/conf/MT7621_FDT head/sys/mips/conf/MT7628_FDT head/sys/mips/conf/RT3050_FDT head/sys/mips/conf/RT3352_FDT head/sys/mips/conf/RT3883_FDT head/sys/mips/conf/RT5350_FDT Modified: head/sys/mips/conf/MT7620A_FDT ============================================================================== --- head/sys/mips/conf/MT7620A_FDT Thu Apr 21 07:36:11 2016 (r298396) +++ head/sys/mips/conf/MT7620A_FDT Thu Apr 21 07:40:03 2016 (r298397) @@ -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 Modified: head/sys/mips/conf/MT7620N_FDT ============================================================================== --- head/sys/mips/conf/MT7620N_FDT Thu Apr 21 07:36:11 2016 (r298396) +++ head/sys/mips/conf/MT7620N_FDT Thu Apr 21 07:40:03 2016 (r298397) @@ -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 Modified: head/sys/mips/conf/MT7621_FDT ============================================================================== --- head/sys/mips/conf/MT7621_FDT Thu Apr 21 07:36:11 2016 (r298396) +++ head/sys/mips/conf/MT7621_FDT Thu Apr 21 07:40:03 2016 (r298397) @@ -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 Modified: head/sys/mips/conf/MT7628_FDT ============================================================================== --- head/sys/mips/conf/MT7628_FDT Thu Apr 21 07:36:11 2016 (r298396) +++ head/sys/mips/conf/MT7628_FDT Thu Apr 21 07:40:03 2016 (r298397) @@ -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 Modified: head/sys/mips/conf/RT3050_FDT ============================================================================== --- head/sys/mips/conf/RT3050_FDT Thu Apr 21 07:36:11 2016 (r298396) +++ head/sys/mips/conf/RT3050_FDT Thu Apr 21 07:40:03 2016 (r298397) @@ -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 Modified: head/sys/mips/conf/RT3352_FDT ============================================================================== --- head/sys/mips/conf/RT3352_FDT Thu Apr 21 07:36:11 2016 (r298396) +++ head/sys/mips/conf/RT3352_FDT Thu Apr 21 07:40:03 2016 (r298397) @@ -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 Modified: head/sys/mips/conf/RT3883_FDT ============================================================================== --- head/sys/mips/conf/RT3883_FDT Thu Apr 21 07:36:11 2016 (r298396) +++ head/sys/mips/conf/RT3883_FDT Thu Apr 21 07:40:03 2016 (r298397) @@ -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 Modified: head/sys/mips/conf/RT5350_FDT ============================================================================== --- head/sys/mips/conf/RT5350_FDT Thu Apr 21 07:36:11 2016 (r298396) +++ head/sys/mips/conf/RT5350_FDT Thu Apr 21 07:40:03 2016 (r298397) @@ -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 Added: head/sys/mips/mediatek/files.mediatek ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/mips/mediatek/files.mediatek Thu Apr 21 07:40:03 2016 (r298397) @@ -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 Added: head/sys/mips/mediatek/std.mediatek ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/mips/mediatek/std.mediatek Thu Apr 21 07:40:03 2016 (r298397) @@ -0,0 +1,84 @@ +# +# std.mtk -- Base kernel configuration file for FreeBSD/MIPS Mediatek/Ralink +# SoCs. +# +# This includes all the required drivers for the SoCs. +# +# $FreeBSD$ +# + +# Include the standard file list for Mediatek SoCs. +files "../mediatek/files.mediatek" + +# Building a mips/mipsel kernel +machine mips mipsel + +# Little-endian machine +makeoptions MIPS_LITTLE_ENDIAN=defined + +# Default kernel load address +makeoptions KERNLOADADDR=0x80001000 + +# Mediatek/Ralink SoC support depends on FDT (with static DTB for the moment) +options FDT +options FDT_DTB_STATIC + +# We rely on INTRNG code +options INTRNG +options MIPS_NIRQ=256 + +# We rely on NEW_PCIB code +options NEW_PCIB + +# Build kernel with gdb(1) debug symbols +makeoptions DEBUG=-g + +# Support for DDB and KDB +options DDB +options KDB + +# Debugging for use in -current +options INVARIANTS +options INVARIANT_SUPPORT +options WITNESS +options WITNESS_SKIPSPIN +options DEBUG_REDZONE +options DEBUG_MEMGUARD + +# For small memory footprints +options VM_KMEM_SIZE_SCALE=1 + +# General options, including scheduler, etc. +options SCHED_ULE # ULE scheduler +options INET # InterNETworking +#options INET6 # IPv6 +options PSEUDOFS # Pseude-filesystem framework +options FFS # Berkeley Fast Filesystem +#options SOFTUPDATES # Enable FFS soft updates support +#options UFS_ACL # Support for access control lists +#options UFS_DIRHASH # Improve big directory performance +#options MSDOSFS # Enable support for MSDOS filesystems +options _KPOSIX_PRIORITY_SCHEDULING # Posix P1003_1B real-time ext. + +# +# Standard drivers section +# +# The drivers in the following section are required in order to successfully +# compile the kernel. +# + +# FDT clock and pinctrl framework +device fdt_clock +device fdt_pinctrl + +# UART support +device uart + +# random support +device random + +# loop device support +device loop + +# ether device support +device ether
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604210740.u3L7e3L4077723>