Merge branch 'adafruit:main' into main

Author: nopnop2002

adafruit_platformdetect/board.py

@@ -65,12 +65,16 @@ def id(self) -> Optional[str]:
             board_id = self._armbian_id() or self._allwinner_variants_id()
         elif chip_id == chips.BCM2XXX:
             board_id = self._pi_id()
+        elif chip_id == chips.OS_AGNOSTIC:
+            board_id = boards.OS_AGNOSTIC_BOARD
         elif chip_id == chips.AM625X:
             board_id = self._beaglebone_id()
         elif chip_id == chips.AM33XX:
             board_id = self._beaglebone_id()
         elif chip_id == chips.AM65XX:
             board_id = self._siemens_simatic_iot2000_id()
+        elif chip_id == chips.AM67A:
+            board_id = self._beagleyai_id()
         elif chip_id == chips.DRA74X:
             board_id = self._bbai_id()
         elif chip_id == chips.SUN4I:
@@ -340,6 +344,12 @@ def _beaglebone_id(self) -> Optional[str]:
         return None
 
     # pylint: enable=no-self-use
+    def _beagleyai_id(self) -> Optional[str]:
+        """Try to detect id of a BeagleY-AI board."""
+        board_value = self.detector.get_device_model()
+        if "BeagleY-AI" in board_value:
+            return boards.BEAGLEY_AI
+        return None
 
     def _bbai_id(self) -> Optional[str]:
         """Try to detect id of a Beaglebone AI related board."""
@@ -734,6 +744,8 @@ def _allwinner_variants_id(self) -> Optional[str]:
                     board = boards.ORANGE_PI_ZERO_PLUS_2H5
                 elif "H616" in chip_id:
                     board = boards.ORANGE_PI_ZERO_2
+        elif "walnutpi-1b-emmc" in board_value:
+            board = boards.WALNUT_PI_1B_EMMC
         elif "walnutpi-1b" in board_value:
             board = boards.WALNUT_PI_1B
             # TODO: Add other specifc board contexts here
@@ -1036,6 +1048,7 @@ def lazily_generate_conditions():
             yield self.board.QTPY_U2IF
             yield self.board.QT2040_TRINKEY_U2IF
             yield self.board.KB2040_U2IF
+            yield self.board.OS_AGNOSTIC_BOARD
 
         return any(condition for condition in lazily_generate_conditions())
 
@@ -1105,6 +1118,11 @@ def microchip_mcp2221(self) -> bool:
         """Check whether the current board is a Microchip MCP2221."""
         return self.id == boards.MICROCHIP_MCP2221
 
+    @property
+    def os_agnostic_board(self) -> bool:
+        """Check whether the current board is an OS agnostic special case."""
+        return self.id == boards.OS_AGNOSTIC_BOARD
+
     @property
     def pico_u2if(self) -> bool:
         """Check whether the current board is a RPi Pico w/ u2if."""

adafruit_platformdetect/chip.py

@@ -98,6 +98,10 @@ def id(
                     "BLINKA_MCP2221 environment variable "
                     + "set, but no MCP2221 device found"
                 )
+            if os.environ.get("BLINKA_OS_AGNOSTIC"):
+                # we don't need to look for this chip, it's just a flag
+                self._chip_id = chips.OS_AGNOSTIC
+                return self._chip_id
             if os.environ.get("BLINKA_U2IF"):
                 import hid
 
@@ -179,6 +183,8 @@ def _linux_id(self) -> Optional[str]:
         # pylint: disable=too-many-branches,too-many-statements
         # pylint: disable=too-many-return-statements
         """Attempt to detect the CPU on a computer running the Linux kernel."""
+        if self.detector.check_dt_compatible_value("beagle,am67a-beagley-ai"):
+            return chips.AM67A
         if self.detector.check_dt_compatible_value("ti,am625"):
             return chips.AM625X
         if self.detector.check_dt_compatible_value("ti,am654"):

adafruit_platformdetect/constants/boards.py

@@ -21,6 +21,7 @@
 BEAGLEBONE_AI = "BEAGLEBONE_AI"
 BEAGLEBONE_POCKETBONE = "BEAGLEBONE_POCKETBONE"
 BEAGLEV_STARLIGHT = "BEAGLEV_STARLIGHT"
+BEAGLEY_AI = "BEAGLEY_AI"
 BEAGLELOGIC_STANDALONE = "BEAGLELOGIC_STANDALONE"
 OSD3358_DEV_BOARD = "OSD3358_DEV_BOARD"
 OSD3358_SM_RED = "OSD3358_SM_RED"
@@ -40,6 +41,7 @@
 
 # Walnut Pi boards
 WALNUT_PI_1B = "WALNUT_PI_1B"
+WALNUT_PI_1B_EMMC = "WALNUT_PI_1B_EMMC"
 
 # Clockwork Pi boards
 CLOCKWORK_CPI3 = "CLOCKWORK_CPI3"
@@ -240,7 +242,10 @@
 )
 
 # WalnutPi
-_WALNUT_PI_IDS = (WALNUT_PI_1B,)
+_WALNUT_PI_IDS = (
+    WALNUT_PI_1B,
+    WALNUT_PI_1B_EMMC,
+)
 
 # STM32MP1
 _STM32MP1_IDS = (
@@ -418,6 +423,7 @@
 _ODROID_MINI_PC_IDS = (ODROID_H3,)
 
 _BEAGLEBONE_IDS = (
+    BEAGLEY_AI,
     BEAGLE_PLAY,
     BEAGLEBONE_AI64,
     BEAGLEBONE,
@@ -594,3 +600,6 @@
     LUCKFOX_PICO_MAX,
     LUCKFOX_PICO_MINI,
 )
+
+# Agnostic board
+OS_AGNOSTIC_BOARD = "OS_AGNOSTIC_BOARD"

adafruit_platformdetect/constants/chips.py

@@ -4,9 +4,11 @@
 
 """Definition of chips."""
 A311D = "A311D"
+OS_AGNOSTIC = "OS_AGNOSTIC"
 AM33XX = "AM33XX"
 AM625X = "AM625X"
 AM65XX = "AM65XX"
+AM67A = "AM67A"
 DRA74X = "DRA74X"
 TDA4VM = "TDA4VM"
 IMX6ULL = "IMX6ULL"