Merge branch 'udoo'

Author: zzts

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,7 +326,11 @@ 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
-        return None
+
+        if self.detector.check_board_name_value() == 'UDOO x86':
+            return boards.UDOO_X86
+        else:
+            return None
 
     def _asus_tinker_board_id(self):
         """Check what type of Tinker Board."""

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

@@ -99,8 +99,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
 
@@ -364,4 +367,6 @@
 _ASUS_TINKER_BOARD_DEV_IDS = ASUS_TINKER_BOARD
 
 # 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"}