diff options
Diffstat (limited to 'mpm/python/usrp_mpm/periph_manager')
| -rw-r--r-- | mpm/python/usrp_mpm/periph_manager/base.py | 15 | ||||
| -rw-r--r-- | mpm/python/usrp_mpm/periph_manager/n310.py | 16 |
2 files changed, 14 insertions, 17 deletions
diff --git a/mpm/python/usrp_mpm/periph_manager/base.py b/mpm/python/usrp_mpm/periph_manager/base.py index 4d58b0933..87544e451 100644 --- a/mpm/python/usrp_mpm/periph_manager/base.py +++ b/mpm/python/usrp_mpm/periph_manager/base.py @@ -237,20 +237,6 @@ class PeriphManagerBase(object): """ Initialize all the daughterboards """ - def _init_dboards_overlay(db_class): - """ - Load the required overlays for this dboard. - """ - requested_overlays = db_class.list_required_dt_overlays( - dboard_eeprom_md, - 'XG', # FIXME don't hardcode - {}, # FIXME don't hardcode - ) - self.log.trace("Dboard requires device tree overlays: {}".format( - requested_overlays - )) - for overlay in requested_overlays: - dtoverlay.apply_overlay_safe(overlay) # Go, go, go! override_dboard_pids = override_dboard_pids or [] dboard_eeprom_addrs = self.dboard_eeprom_addr \ @@ -295,7 +281,6 @@ class PeriphManagerBase(object): if db_class is None: self.log.warning("Could not identify daughterboard class for PID {:04X}!".format(db_pid)) continue - _init_dboards_overlay(db_class) if len(self.dboard_spimaster_addrs) > dboard_idx: spi_nodes = sorted(get_spidev_nodes(self.dboard_spimaster_addrs[dboard_idx])) self.log.debug("Found spidev nodes: {0}".format(spi_nodes)) diff --git a/mpm/python/usrp_mpm/periph_manager/n310.py b/mpm/python/usrp_mpm/periph_manager/n310.py index 912b7678b..7adbc85f0 100644 --- a/mpm/python/usrp_mpm/periph_manager/n310.py +++ b/mpm/python/usrp_mpm/periph_manager/n310.py @@ -475,14 +475,26 @@ class n310(PeriphManagerBase): updateable_components = { 'fpga': { 'callback': "update_fpga", - 'path': '/lib/firmware/n310.bin', + 'path': '/lib/firmware/n3xx.bin', }, 'dts': { 'callback': "update_dts", - 'path': '/lib/firmware/n310.dts', + 'path': '/lib/firmware/n3xx.dts', }, } + @staticmethod + def list_required_dt_overlays(eeprom_md, device_args): + """ + Lists device tree overlays that need to be applied before this class can + be used. List of strings. + Are applied in order. + + eeprom_md -- Dictionary of info read out from the mboard EEPROM + device_args -- Arbitrary dictionary of info, typically user-defined + """ + return ['n3xx'] + def __init__(self, args): super(n310, self).__init__(args) self._device_initialized = False |