Merge pull request #67 from pmundt/xilinx-pynq

Add support for Xilinx PYNQ dev boards (Z1 and Z2)

Author: makermelissa

adafruit_platformdetect/board.py

@@ -67,6 +67,8 @@ def id(self):
             board_id = boards.ONION_OMEGA
         elif chip_id == chips.MIPS24KEC:
             board_id = boards.ONION_OMEGA2
+        elif chip_id == chips.ZYNQ7000:
+            board_id = self._pynq_id()
         elif chip_id == chips.A64:
             board_id = self._pine64_id()
         return board_id
@@ -232,6 +234,22 @@ def _pine64_id(self):
             board = boards.PINEPHONE
         return board
 
+    # pylint: disable=no-self-use
+    def _pynq_id(self):
+        """Try to detect the id for Xilinx PYNQ boards."""
+        try:
+            with open("/proc/device-tree/chosen/pynq_board", "r") as board_file:
+                board_model = board_file.read()
+                match = board_model.upper().replace('-', '_').rstrip('\x00')
+                for model in boards._PYNQ_IDS:
+                    if model == match:
+                        return model
+
+                return None
+
+        except FileNotFoundError:
+            return None
+
     @property
     def any_96boards(self):
         """Check whether the current board is any 96boards board."""
@@ -267,6 +285,11 @@ def any_coral_board(self):
         """Check whether the current board is any defined Coral."""
         return self.CORAL_EDGE_TPU_DEV
 
+    @property
+    def any_pynq_board(self):
+        """Check whether the current board is any defined PYNQ Board."""
+        return self.id in boards._PYNQ_IDS
+
     @property
     def any_giant_board(self):
         """Check whether the current board is any defined Giant Board."""
@@ -306,6 +329,7 @@ def any_embedded_linux(self):
                 self.any_giant_board, self.any_jetson_board, self.any_coral_board,
                 self.any_odroid_40_pin, self.any_96boards, self.any_sifive_board,
                 self.any_onion_omega_board, self.any_pine64_board,
+                self.any_pynq_board,
             ]
         )
 

adafruit_platformdetect/chip.py

@@ -121,6 +121,10 @@ def _linux_id(self):  # pylint: disable=too-many-branches,too-many-statements
                 linux_id = chips.A64
             elif "sun50iw1p1" in hardware:
                 linux_id = chips.A64
+            elif "Xilinx Zynq" in hardware:
+                compatible = self.detector.get_device_compatible()
+                if compatible and 'xlnx,zynq-7000' in compatible:
+                    linux_id = chips.ZYNQ7000
             else:
                 if isinstance(hardware, str):
                     if hardware.upper() in chips.BCM_RANGE:

adafruit_platformdetect/constants/boards.py

@@ -43,6 +43,10 @@
 # Google Coral dev board
 CORAL_EDGE_TPU_DEV = "CORAL_EDGE_TPU_DEV"
 
+# Xilinx PYNQ FPGA dev boards
+PYNQ_Z1 = "PYNQ_Z1"
+PYNQ_Z2 = "PYNQ_Z2"
+
 # Various Raspberry Pi models
 RASPBERRY_PI_B_REV1 = "RASPBERRY_PI_B_REV1"
 RASPBERRY_PI_B_REV2 = "RASPBERRY_PI_B_REV2"
@@ -98,6 +102,11 @@
     CORAL_EDGE_TPU_DEV,
 )
 
+_PYNQ_IDS = (
+    PYNQ_Z1,
+    PYNQ_Z2,
+)
+
 _JETSON_IDS = {
     JETSON_TX1: (
         'nvidia,p2371-2180',

adafruit_platformdetect/constants/chips.py

@@ -21,6 +21,7 @@
 BINHO = "BINHO"
 MIPS24KC = "MIPS24KC"
 MIPS24KEC = "MIPS24KEC"
+ZYNQ7000 = "ZYNQ7000"
 A64 = "A64"
 
 BCM_RANGE = {'BCM2708', 'BCM2709', 'BCM2711', 'BCM2835', 'BCM2837'}

bin/detect.py

@@ -18,6 +18,7 @@
 print("Is this a Giant Board?", detector.board.GIANT_BOARD)
 print("Is this a Coral Edge TPU?", detector.board.CORAL_EDGE_TPU_DEV)
 print("Is this a SiFive Unleashed? ", detector.board.SIFIVE_UNLEASHED)
+print("Is this a PYNQ Board?", detector.board.PYNQ_Z1 | detector.board.PYNQ_Z2)
 print("Is this an embedded Linux system?", detector.board.any_embedded_linux)
 print("Is this a generic Linux PC?", detector.board.GENERIC_LINUX_PC)
 print("Is this an OS environment variable special case?", detector.board.FTDI_FT232H |
@@ -29,6 +30,9 @@
 if detector.board.any_jetson_board:
     print("Jetson platform detected.")
 
+if detector.board.any_pynq_board:
+    print("PYNQ platform detected.")
+
 if detector.board.any_orange_pi:
     print("Orange Pi detected.")