From 1f6ca76bc0274cd6f454eb90ba77394a3ac32020 Mon Sep 17 00:00:00 2001 From: Adrian Chadd Date: Thu, 6 Jul 2017 04:06:25 +0000 Subject: [PATCH] [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 --- sys/mips/conf/AR934X_BASE.hints | 11 +++++++++++ sys/mips/conf/std.AR934X | 9 +++++++++ 2 files changed, 20 insertions(+) diff --git a/sys/mips/conf/AR934X_BASE.hints b/sys/mips/conf/AR934X_BASE.hints index 6dae4a6076c..aa45331695b 100644 --- a/sys/mips/conf/AR934X_BASE.hints +++ b/sys/mips/conf/AR934X_BASE.hints @@ -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 @@ -47,6 +51,13 @@ hint.ath.0.device_id=0x0031 # 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" hint.spi.0.maddr=0x1f000000 diff --git a/sys/mips/conf/std.AR934X b/sys/mips/conf/std.AR934X index eab4b84c7c5..89700557817 100644 --- a/sys/mips/conf/std.AR934X +++ b/sys/mips/conf/std.AR934X @@ -51,8 +51,17 @@ options NO_FFS_SNAPSHOT # We don't require snapshot support 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 device uart_ar71xx