Merge pull request #95 from zzts/master

Pentium N3710 (Braswell SOC) on UDOO x86

Author: makermelissa

adafruit_platformdetect/__init__.py

@@ -121,7 +121,7 @@ def get_device_compatible(self):
 
     def check_board_asset_tag_value(self):
         """
-        Search /proc/device-tree/model for the device model and return its value, if found,
+        Search /sys/devices/virtual/dmi/id for the device model and return its value, if found,
         otherwise None.
         """
         tag = None
@@ -133,3 +133,18 @@ def check_board_asset_tag_value(self):
             pass
 
         return tag
+
+    def check_board_name_value(self):
+        """
+        Search /sys/devices/virtual/dmi/id for the device model and return its value, if found,
+        otherwise None. Debian/ubuntu based
+        """
+        board_name = None
+
+        try:
+            with open("/sys/devices/virtual/dmi/id/board_name", "r") as board_name_file:
+                board_name = board_name_file.read().strip()
+        except FileNotFoundError:
+            pass
+
+        return board_name

adafruit_platformdetect/board.py

@@ -123,6 +123,8 @@ def id(self):
             board_id = self._asus_tinker_board_id()
         elif chip_id == chips.RYZEN_V1605B:
             board_id = self._udoo_id()
+        elif chip_id == chips.PENTIUM_N3710:
+            board_id = self._udoo_id()
 
         return board_id
 
@@ -324,6 +326,10 @@ def _udoo_id(self):
         for board_id, board_tags in boards._UDOO_BOARD_IDS.items():
             if any(v == board_asset_tag for v in board_tags):
                 return board_id
+
+        if self.detector.check_board_name_value() == "UDOO x86":
+            return boards.UDOO_X86
+
         return None
 
     def _asus_tinker_board_id(self):

adafruit_platformdetect/chip.py

@@ -144,10 +144,14 @@ def _linux_id(self):
                     linux_id = chips.RYZEN_V1202B
                 if "RYZEN EMBEDDED V1605B" in model_name:
                     linux_id = chips.RYZEN_V1605B
+            elif vendor_id == "GenuineIntel":
+                model_name = self.detector.get_cpuinfo_field("model name").upper()
+                ##                print('model_name =', model_name)
+                if "N3710" in model_name:
+                    linux_id = chips.PENTIUM_N3710
                 else:
                     linux_id = chips.GENERIC_X86
-            elif vendor_id == "GenuineIntel":
-                linux_id = chips.GENERIC_X86
+            ##            print("linux_id = ", linux_id)
 
             compatible = self.detector.get_device_compatible()
             if compatible and "tegra" in compatible:

adafruit_platformdetect/constants/boards.py

@@ -98,8 +98,11 @@
 ROCK_PI_S = "ROCK_PI_S"
 
 GREATFET_ONE = "GREATFET_ONE"
+
+# Udoo boards
 UDOO_BOLT_V3 = "UDOO_BOLT_V3"
 UDOO_BOLT_V8 = "UDOO_BOLT_V8"
+UDOO_X86 = "UDOO_X86"
 
 # pylint: enable=bad-whitespace
 
@@ -120,13 +123,10 @@
 
 _CORAL_IDS = (CORAL_EDGE_TPU_DEV,)
 
-_PYNQ_IDS = (
-    PYNQ_Z1,
-    PYNQ_Z2,
-)
+_PYNQ_IDS = (PYNQ_Z1, PYNQ_Z2)
 
 _JETSON_IDS = {
-    JETSON_TX1: ("nvidia,p2371-2180", "nvidia,jetson-cv",),
+    JETSON_TX1: ("nvidia,p2371-2180", "nvidia,jetson-cv"),
     JETSON_TX2: (
         "nvidia,p2771-0000",
         "nvidia,p2771-0888",
@@ -135,8 +135,8 @@
         "nvidia,quill",
         "nvidia,storm",
     ),
-    JETSON_XAVIER: ("nvidia,p2972-0000", "nvidia,p2972-0006", "nvidia,jetson-xavier",),
-    JETSON_NANO: ("nvidia,p3450-0000", "nvidia,p3450-0002", "nvidia,jetson-nano",),
+    JETSON_XAVIER: ("nvidia,p2972-0000", "nvidia,p2972-0006", "nvidia,jetson-xavier"),
+    JETSON_NANO: ("nvidia,p3450-0000", "nvidia,p3450-0002", "nvidia,jetson-nano"),
     JETSON_NX: (
         "nvidia,p3509-0000+p3668-0000",
         "nvidia,p3509-0000+p3668-0001",
@@ -217,7 +217,7 @@
     BEAGLEBONE_BLUE: (("A2", "A335BNLTBLA2"),),
     BEAGLEBONE_BLACK_WIRELESS: (("A5", "A335BNLTBWA5"),),
     BEAGLEBONE_POCKETBEAGLE: (("A2", "A335PBGL00A2"),),
-    BEAGLEBONE_GREEN: (("1A", "A335BNLT...."), ("UNKNOWN", "A335BNLTBBG1"),),
+    BEAGLEBONE_GREEN: (("1A", "A335BNLT...."), ("UNKNOWN", "A335BNLTBBG1")),
     BEAGLEBONE_GREEN_WIRELESS: (("W1A", "A335BNLTGW1A"),),
     BEAGLEBONE_BLACK_INDUSTRIAL: (
         ("A0", "A335BNLTAIA0"),  # Arrow
@@ -261,10 +261,10 @@
         "100000e",
         "100000f",
     ),
-    RASPBERRY_PI_B_PLUS: ("0010", "0013", "900032", "1000010", "1000013", "1900032",),
-    RASPBERRY_PI_A: ("0007", "0008", "0009", "1000007", "1000008", "1000009",),
-    RASPBERRY_PI_A_PLUS: ("0012", "0015", "900021", "1000012", "1000015", "1900021",),
-    RASPBERRY_PI_CM1: ("0011", "0014", "10000011", "10000014",),
+    RASPBERRY_PI_B_PLUS: ("0010", "0013", "900032", "1000010", "1000013", "1900032"),
+    RASPBERRY_PI_A: ("0007", "0008", "0009", "1000007", "1000008", "1000009"),
+    RASPBERRY_PI_A_PLUS: ("0012", "0015", "900021", "1000012", "1000015", "1900021"),
+    RASPBERRY_PI_CM1: ("0011", "0014", "10000011", "10000014"),
     RASPBERRY_PI_ZERO: (
         "900092",
         "920092",
@@ -279,7 +279,7 @@
         "2900093",
         "2920093",  # warranty bit 25
     ),
-    RASPBERRY_PI_ZERO_W: ("9000c1", "19000c1", "29000c1",),  # warranty bits
+    RASPBERRY_PI_ZERO_W: ("9000c1", "19000c1", "29000c1"),  # warranty bits
     RASPBERRY_PI_2B: (
         "a01040",
         "a01041",
@@ -316,7 +316,7 @@
         "2a32082",
         "2a52082",  # warranty bit 25
     ),
-    RASPBERRY_PI_3B_PLUS: ("a020d3", "1a020d3", "2a020d3",),  # warranty bits
+    RASPBERRY_PI_3B_PLUS: ("a020d3", "1a020d3", "2a020d3"),  # warranty bits
     RASPBERRY_PI_AVNET_IIOT_GW: ("60a220b0",),
     RASPBERRY_PI_CM3: (
         "a020a0",
@@ -326,8 +326,8 @@
         "1a220a0",
         "2a220a0",
     ),
-    RASPBERRY_PI_3A_PLUS: ("9020e0", "19020e0", "29020e0",),  # warranty bits
-    RASPBERRY_PI_CM3_PLUS: ("a02100", "1a02100", "2a02100",),  # warranty bits
+    RASPBERRY_PI_3A_PLUS: ("9020e0", "19020e0", "29020e0"),  # warranty bits
+    RASPBERRY_PI_CM3_PLUS: ("a02100", "1a02100", "2a02100"),  # warranty bits
     RASPBERRY_PI_4B: (
         "a03111",
         "b03111",
@@ -352,13 +352,10 @@
 }
 
 # Onion omega boards
-_ONION_OMEGA_BOARD_IDS = (
-    ONION_OMEGA,
-    ONION_OMEGA2,
-)
+_ONION_OMEGA_BOARD_IDS = (ONION_OMEGA, ONION_OMEGA2)
 
 # Pine64 boards and devices
 _PINE64_DEV_IDS = (PINE64, PINEBOOK, PINEPHONE)
 
 # UDOO
-_UDOO_BOARD_IDS = {UDOO_BOLT_V8: ("SC40-2000-0000-C0|C",)}
+_UDOO_BOARD_IDS = {UDOO_BOLT_V8: ("SC40-2000-0000-C0|C",), UDOO_X86: ("dummy",)}

adafruit_platformdetect/constants/chips.py

@@ -31,5 +31,6 @@
 RK3308 = "RK3308"
 LPC4330 = "LPC4330"
 RK3288 = "RK3288"
+PENTIUM_N3710 = "PENTIUM_N3710"  # SOC Braswell core
 
 BCM_RANGE = {"BCM2708", "BCM2709", "BCM2711", "BCM2835", "BCM2837"}