svn commit: r320700 - head/sys/mips/conf

[Adrian Chadd]

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