From owner-svn-src-head@freebsd.org Thu Feb 1 22:00:39 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DE55EECD87F; Thu, 1 Feb 2018 22:00:38 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 94B396A074; Thu, 1 Feb 2018 22:00:38 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8FCBE12D60; Thu, 1 Feb 2018 22:00:38 +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 w11M0chS000946; Thu, 1 Feb 2018 22:00:38 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w11M0cIi000944; Thu, 1 Feb 2018 22:00:38 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201802012200.w11M0cIi000944@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Thu, 1 Feb 2018 22:00:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r328756 - 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: 328756 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Feb 2018 22:00:39 -0000 Author: adrian Date: Thu Feb 1 22:00:38 2018 New Revision: 328756 URL: https://svnweb.freebsd.org/changeset/base/328756 Log: [atheros] teach these two boards about the new hints location as well. Modified: head/sys/mips/conf/AP135.hints head/sys/mips/conf/AP143.hints Modified: head/sys/mips/conf/AP135.hints ============================================================================== --- head/sys/mips/conf/AP135.hints Thu Feb 1 22:00:05 2018 (r328755) +++ head/sys/mips/conf/AP135.hints Thu Feb 1 22:00:38 2018 (r328756) @@ -106,22 +106,12 @@ hint.arge.1.pll_1000=0x03000101 # MAC for arge1 is the second 6 bytes of the ART hint.arge.1.eeprommac=0x1fff0006 -# ath0: Where the ART is - last 64k in the flash -hint.ath.0.eepromaddr=0x1fff0000 -hint.ath.0.eepromsize=16384 +# 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 -# ath1: it's different; it's a PCIe attached device, so -# we instead need to teach the PCIe bridge code about it -# (ie, the 'early pci fixup' stuff that programs the PCIe -# host registers on the NIC) and then we teach ath where -# to find it. - -# ath1 hint - pcie slot 0 -# hint.pcib.0.bus.0.0.0.ath_fixup_addr=0x1fff4000 -# hint.pcib.0.bus.0.0.0.ath_fixup_size=16384 - -# ath0 - eeprom comes from here -# hint.ath.1.eeprom_firmware="pcib.0.bus.0.0.0.eeprom_firmware" +# And now tell the ath(4) driver where to look! +hint.ath.0.eeprom_firmware="ar71xx_caldata.0.map.0.eeprom_firmware" # flash layout: # Modified: head/sys/mips/conf/AP143.hints ============================================================================== --- head/sys/mips/conf/AP143.hints Thu Feb 1 22:00:05 2018 (r328755) +++ head/sys/mips/conf/AP143.hints Thu Feb 1 22:00:38 2018 (r328756) @@ -24,9 +24,12 @@ hint.arge.1.phymask=0x0 # No directly mapped PHYs hint.arge.1.media=1000 hint.arge.1.fduplex=1 -# ath0: Where the ART is - last 64k in the flash -hint.ath.0.eepromaddr=0x1fff0000 -hint.ath.0.eepromsize=16384 +# 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" # The AP121 4MB flash layout: #