Date: Mon, 27 Aug 2012 21:59:53 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r239759 - head/sys/mips/conf Message-ID: <201208272159.q7RLxr4B064025@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adrian Date: Mon Aug 27 21:59:52 2012 New Revision: 239759 URL: http://svn.freebsd.org/changeset/base/239759 Log: Convert AP93 to use the new AR724X_BASE configuration file. Modified: head/sys/mips/conf/AP93 head/sys/mips/conf/AP93.hints Modified: head/sys/mips/conf/AP93 ============================================================================== --- head/sys/mips/conf/AP93 Mon Aug 27 21:53:01 2012 (r239758) +++ head/sys/mips/conf/AP93 Mon Aug 27 21:59:52 2012 (r239759) @@ -1,136 +1,44 @@ # -# AP93 -- Kernel configuration file for FreeBSD/mips for Atheros AP93 reference -# board (AR7240) +# Specific board setup for the Atheros AP91 reference board. # -# $FreeBSD$ +# The AP93 has the following hardware: # +# + AR7240 CPU SoC +# + AR9280 Wifi +# + Integrated switch (XXX speed?) +# + 16MB flash +# + 64MB RAM +# + uboot environment -ident AP93 +# $FreeBSD$ -# XXX The default load address in the Uboot environment is 0x80010000 -makeoptions KERNLOADADDR=0x80050000 -options HZ=1000 +include "AR724X_BASE" +ident "AP93" +hints "AP93.hints" -# The AP93 has 64mb of RAM; hard-code that options AR71XX_REALMEM=64*1024*1024 -# It's UBOOT, not Redboot - without this, things will hang at startup options AR71XX_ENV_UBOOT -makeoptions MODULES_OVERRIDE="ath ath_pci ath_ahb bridgestp if_bridge if_gif if_gre random wlan wlan_acl wlan_amrr wlan_ccmp wlan_rssadapt wlan_tkip wlan_wep wlan_xauth usb ar71xx" - -hints "AP93.hints" -include "../atheros/std.ar71xx" - -makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -makeoptions MODULES_OVERRIDE="" +# For DOS - enable if required +options MSDOSFS -options DDB -options KDB - -options SCHED_4BSD #4BSD scheduler -options INET #InterNETworking -# Can't do IPv6 - it just doesn't fit. -# options INET6 -# options NFSCL #Network Filesystem Client -options PSEUDOFS #Pseudo-filesystem framework -options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions -options ALQ - -# Debugging for use in -current -options DEADLKRES -options INVARIANTS -options INVARIANT_SUPPORT -options WITNESS -options WITNESS_SKIPSPIN -options FFS #Berkeley Fast Filesystem - -# Support uncompress lzma rootfs +# uncompress - to boot read-only lzma natively from flash device geom_uncompress options GEOM_UNCOMPRESS options ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\" -# PCI bus -device pci -device ar724x_pci -# Enable the AR71xx EEPROM PCI(e) workaround -options AR71XX_ATH_EEPROM - -# NVRAM U-Boot Environment -> Kernel environment -device nvram2env - -# Wireless NIC cards -options IEEE80211_DEBUG -options IEEE80211_SUPPORT_MESH -options IEEE80211_SUPPORT_TDMA -options IEEE80211_ALQ - -device wlan # 802.11 support -device wlan_wep # 802.11 WEP support -device wlan_ccmp # 802.11 CCMP support -device wlan_tkip # 802.11 TKIP support -device wlan_xauth # 802.11 hostap support - -device ath # Atheros pci/cardbus NIC's -device ath_pci # PCI/PCIe bus glue -options ATH_DEBUG -options ATH_ENABLE_11N -options ATH_DIAGAPI -device firmware -options ATH_EEPROM_FIRMWARE - -device ath_hal -options AH_SUPPORT_AR5416 -options AH_DEBUG -options AH_DEBUG_ALQ - -device ath_rate_sample - -device mii -device arge -device miiproxy -options ARGE_DEBUG -options ARGE_MDIO -device etherswitch -device arswitch +# Used for the static uboot partition map +device geom_map -# USB devices - (todo: does AR7240 have OHCI, or just EHCI?) +# Options needed for the EEPROM based calibration/PCI configuration data. +options AR71XX_ATH_EEPROM # Fetch EEPROM/PCI config from flash +options ATH_EEPROM_FIRMWARE # Use EEPROM from flash +device firmware # Used by the above + +# Options required for miiproxy and mdiobus +options ARGE_MDIO # Export an MDIO bus separate from arge +device miiproxy # MDIO bus <-> MII PHY rendezvous -#device usb -options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order -options USB_DEBUG -options USB_HOST_ALIGN=32 -#device ehci - -# Mass storage -#device scbus -#device umass -#device da - -# Read MSDOS formatted disks -#options MSDOSFS - -# GPIO Bus -#device gpio -#device gpioled - -# SPI and flash -device spibus -device ar71xx_spi -device mx25l - -# The flash is statically partitioned; add in that -device geom_map - -device ar71xx_wdog - -# Serial -device uart - -# Network twiddling -device loop -device ether -device md -device bpf -device random -device if_bridge +device etherswitch +device arswitch Modified: head/sys/mips/conf/AP93.hints ============================================================================== --- head/sys/mips/conf/AP93.hints Mon Aug 27 21:53:01 2012 (r239758) +++ head/sys/mips/conf/AP93.hints Mon Aug 27 21:59:52 2012 (r239759) @@ -1,15 +1,5 @@ # $FreeBSD$ -hint.apb.0.at="nexus0" -hint.apb.0.irq=4 - -# uart0 -hint.uart.0.at="apb0" -# see atheros/uart_cpu_ar71xx.c why +3 -hint.uart.0.maddr=0x18020003 -hint.uart.0.msize=0x18 -hint.uart.0.irq=3 - # arge0 MDIO bus hint.argemdio.0.at="nexus0" hint.argemdio.0.maddr=0x19000000 @@ -21,21 +11,12 @@ hint.argemdio.0.order=0 # arge0: MII; dedicated PHY 4 on switch, connected via internal switch # MDIO bus. -hint.arge.0.at="nexus0" -hint.arge.0.maddr=0x19000000 -hint.arge.0.msize=0x1000 -hint.arge.0.irq=2 # hint.arge.0.eeprommac=0x83fe9ff0 hint.arge.0.phymask=0x10 # PHY 4 # hint.arge.0.miimode=2 # MII hint.arge.0.mdio=mdioproxy1 # Hanging off the arswitch MDIO bus # arge1: connected to the LAN switch MAC, at 1000BaseTX / GMII. -hint.arge.1.at="nexus0" -hint.arge.1.maddr=0x1A000000 -hint.arge.1.msize=0x1000 -hint.arge.1.irq=3 - hint.arge.1.phymask=0x0 # hint.arge.1.miimode=1 # GMII hint.arge.1.media=1000 # Force to 1000BaseTX/full @@ -54,25 +35,6 @@ hint.arswitch.0.is_gmii=0 # No, not GMII hint.pcib.0.bus.0.0.0.ath_fixup_addr=0x1fff1000 hint.pcib.0.bus.0.0.0.ath_fixup_size=4096 -# ehci - note the 0x100 offset for the AR913x/AR724x -hint.ehci.0.at="nexus0" -hint.ehci.0.maddr=0x1b000100 -hint.ehci.0.msize=0x00ffff00 -hint.ehci.0.irq=1 - -# pci -hint.pcib.0.at="nexus0" -hint.pcib.0.irq=0 - -# ath -hint.ath.0.eeprom_firmware="pcib.0.bus.0.0.0.eeprom_firmware" - -# GPIO -hint.gpio.0.at="apb0" -hint.gpio.0.maddr=0x18040000 -hint.gpio.0.msize=0x1000 -hint.gpio.0.irq=2 - # Signal leds hint.gpioled.0.at="gpiobus0" hint.gpioled.0.name="sig1" @@ -87,18 +49,6 @@ hint.gpioled.3.at="gpiobus0" hint.gpioled.3.name="sig4" hint.gpioled.3.pins=0x0080 # pin 7 -# SPI controller/bus -hint.spi.0.at="nexus0" -hint.spi.0.maddr=0x1f000000 -hint.spi.0.msize=0x10 - -# SPI flash -hint.mx25l.0.at="spibus0" -hint.mx25l.0.cs=0 - -# Watchdog -hint.ar71xx_wdog.0.at="nexus0" - # nvram mapping - XXX ? hint.nvram.0.base=0x1f030000 hint.nvram.0.maxsize=0x2000
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208272159.q7RLxr4B064025>