From owner-svn-src-all@freebsd.org Thu Jul 6 04:06:26 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EEF02D9D2D8; Thu, 6 Jul 2017 04:06:26 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BD9E37E7B0; Thu, 6 Jul 2017 04:06:26 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6646PWW081143; Thu, 6 Jul 2017 04:06:25 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6646PFh081141; Thu, 6 Jul 2017 04:06:25 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201707060406.v6646PFh081141@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Thu, 6 Jul 2017 04:06:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r320700 - head/sys/mips/conf X-SVN-Group: head X-SVN-Commit-Author: adrian X-SVN-Commit-Paths: head/sys/mips/conf X-SVN-Commit-Revision: 320700 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jul 2017 04:06:27 -0000 Author: adrian Date: Thu Jul 6 04:06:25 2017 New Revision: 320700 URL: https://svnweb.freebsd.org/changeset/base/320700 Log: [ar71xx] Start migrating the AR934x based boards over to the new world order. This unifies the PCI hints with the AHB/NOR hint syntax. Tested: * DIR825C1, AR9344 SoC / 2x2 2G + AR9580 PCI 2x2 5G Modified: head/sys/mips/conf/AR934X_BASE.hints head/sys/mips/conf/std.AR934X Modified: head/sys/mips/conf/AR934X_BASE.hints ============================================================================== --- head/sys/mips/conf/AR934X_BASE.hints Thu Jul 6 04:03:21 2017 (r320699) +++ head/sys/mips/conf/AR934X_BASE.hints Thu Jul 6 04:06:25 2017 (r320700) @@ -9,6 +9,10 @@ hint.apb.0.at="nexus0" hint.apb.0.irq=4 +# ART calibration data mapping device +hint.ar71xx_caldata.0.at="nexus0" +hint.ar71xx_caldata.0.order=0 + # uart0 hint.uart.0.at="apb0" # NB: This isn't an ns8250 UART @@ -46,6 +50,13 @@ hint.ath.0.device_id=0x0031 # Set this to define where the ath calibration data # should be fetched from in physical memory. # hint.ath.0.eepromaddr=0x1fff1000 + +# Where the ART is - last 64k in the first 8MB of flash +#hint.ar71xx_caldata.0.map.0.ath_fixup_addr=0x1fff0000 +#hint.ar71xx_caldata.0.map.0.ath_fixup_size=16384 + +# And now tell the ath(4) driver where to look! +#hint.ath.0.eeprom_firmware="ar71xx_caldata.0.map.0.eeprom_firmware" # SPI flash hint.spi.0.at="nexus0" Modified: head/sys/mips/conf/std.AR934X ============================================================================== --- head/sys/mips/conf/std.AR934X Thu Jul 6 04:03:21 2017 (r320699) +++ head/sys/mips/conf/std.AR934X Thu Jul 6 04:06:25 2017 (r320700) @@ -51,7 +51,16 @@ options NO_FFS_SNAPSHOT # We don't require snapshot include "std.AR_MIPS_BASE" makeoptions MODULES_OVERRIDE+="hwpmc_mips24k" +# EEPROM caldata for AHB connected device +options AR71XX_ATH_EEPROM +device ar71xx_caldata +device firmware + +# Support AR9340 support in AR9300 HAL options AH_SUPPORT_AR9340 + +# Support EEPROM caldata in AHB devices +options ATH_EEPROM_FIRMWARE device pci device ar724x_pci