From owner-svn-src-head@freebsd.org Sun Jul 23 07:10:42 2017 Return-Path: Delivered-To: svn-src-head@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 69519C7E4F7; Sun, 23 Jul 2017 07:10:42 +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 2C69476B00; Sun, 23 Jul 2017 07:10:42 +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 v6N7AfT5061077; Sun, 23 Jul 2017 07:10:41 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6N7Af4T061075; Sun, 23 Jul 2017 07:10:41 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201707230710.v6N7Af4T061075@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Sun, 23 Jul 2017 07:10:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r321380 - 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: 321380 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.23 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: Sun, 23 Jul 2017 07:10:42 -0000 Author: adrian Date: Sun Jul 23 07:10:41 2017 New Revision: 321380 URL: https://svnweb.freebsd.org/changeset/base/321380 Log: [ar933x] make carambola2 work again! * Add in the hints needed for AR933x ath(4) support - this is the nicer way that allows ath to be a module; * ATH_EEPROM_FIRMWARE is also required for all AR933x chipsets. Tested: * Carambola2, AR933x Modified: head/sys/mips/conf/CARAMBOLA2.hints head/sys/mips/conf/std.AR933X Modified: head/sys/mips/conf/CARAMBOLA2.hints ============================================================================== --- head/sys/mips/conf/CARAMBOLA2.hints Sun Jul 23 07:02:10 2017 (r321379) +++ head/sys/mips/conf/CARAMBOLA2.hints Sun Jul 23 07:10:41 2017 (r321380) @@ -31,10 +31,16 @@ hint.arge.1.media=1000 hint.arge.1.fduplex=1 hint.arge.1.eeprommac=0x1fff0006 -# Where the ART is - last 64k in the flash -# 0x9fff1000 ? -hint.ath.0.eepromaddr=0x1fff0000 -hint.ath.0.eepromsize=16384 + +# ART calibration data mapping +hint.ar71xx_caldata.0.at="nexus0" +hint.ar71xx_caldata.0.order=0 +# 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 16MB flash layout: # Modified: head/sys/mips/conf/std.AR933X ============================================================================== --- head/sys/mips/conf/std.AR933X Sun Jul 23 07:02:10 2017 (r321379) +++ head/sys/mips/conf/std.AR933X Sun Jul 23 07:10:41 2017 (r321380) @@ -57,7 +57,10 @@ include "std.AR_MIPS_BASE" makeoptions MODULES_OVERRIDE+="hwpmc_mips24k" +# AR9330 support - everything shipping uses EEPROM for calibration data, +# so always include this. option AH_SUPPORT_AR9330 # Chipset support +option ATH_EEPROM_FIRMWARE # Use EEPROM from flash device usb device ehci