QCA955x / AP135 platform tidyups.

* Change mips24k -> mips74k for hwpmc, but leave it disabled for now.
* don't build pci by default.
* build pci and qca955x_pci for AP135, as theres a PCIe NIC.
* don't build a hwpmc module, it doesn't really work out well
  for the mips boards at the moment.
* add ipfw and DEFAULT_TO_ACCEPT.
This commit is contained in:
adrian 2015-05-19 05:41:00 +00:00
parent 831d31e595
commit ff4271fbcf
2 changed files with 12 additions and 10 deletions

View File

@ -50,7 +50,12 @@ options GEOM_UNCOMPRESS
# Used for the static uboot partition map
device geom_map
# yes, this board has a PCI connected atheros device
# yes, this board has a PCIe connected atheros device
# add ath_pci so it can at least attach things when there's a
# ath(4) in there, rather than the 11ac chip we don't support.
device pci
device qca955x_pci
device ath_pci
options AR71XX_ATH_EEPROM
device firmware # Used by the above
@ -58,3 +63,6 @@ options ATH_EEPROM_FIRMWARE
# Boot off of the rootfs, as defined in the geom_map setup.
options ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
# Default to accept
options IPFIREWALL_DEFAULT_TO_ACCEPT

View File

@ -27,7 +27,7 @@ hints "QCA955X_BASE.hints"
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
# makeoptions MODULES_OVERRIDE="random gpio ar71xx if_gif if_gre if_bridge bridgestp usb wlan wlan_xauth wlan_acl wlan_wep wlan_tkip wlan_ccmp wlan_rssadapt wlan_amrr ath ath_ahb hwpmc"
makeoptions MODULES_OVERRIDE="if_vlan ipfw if_gre if_gif if_bridge bridgestp hwpmc"
makeoptions MODULES_OVERRIDE="if_vlan ipfw if_gre if_gif if_bridge bridgestp"
options DDB
options KDB
@ -53,10 +53,10 @@ options NBUF=128
# Limit UMTX hash size
# options UMTX_NUM_CHAINS=64
# PMC
# PMC - fow now there's no hwpmc module for mips74k
#options HWPMC_HOOKS
#device hwpmc
#device hwpmc_mips24k
#device hwpmc_mips74k
# options NFS_LEGACYRPC
# Debugging for use in -current
@ -109,12 +109,6 @@ options USB_DEBUG
options USB_HOST_ALIGN=32 # AR71XX (MIPS in general?) requires this
device ehci
device pci
# XXX TODO: need to write a qca955x_pci bridge
# .. since it now handles >1 PCIe bus and the reset
# registers may have changed a bit.
# device ar724x_pci
device scbus
device umass
device da