Merge pull request #331 from how2flow/odroid

ODROID-M1: Remove RK3568B2 and Use RK3568 instead
adafruit · Dec 7, 2023 · 47efdb5 · 47efdb5
2 parents cf5f419 + 028137f
commit 47efdb5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/adafruit_platformdetect/board.py b/adafruit_platformdetect/board.py
@@ -99,8 +99,6 @@ def id(self) -> Optional[str]:
             board_id = boards.RASPBERRY_PI_PICO
         elif chip_id == chips.S805:
             board_id = boards.ODROID_C1
-        elif chip_id == chips.RK3568B2:
-            board_id = boards.ODROID_M1
         elif chip_id == chips.S905:
             board_id = boards.ODROID_C2
         elif chip_id == chips.S905X3:
@@ -577,6 +575,8 @@ def _rk3568_id(self) -> Optional[str]:
             board = boards.LUBANCAT2
         if board_value and "ROCK3 Model A" in board_value:
             board = boards.ROCK_PI_3A
+        if board_value and "Hardkernel ODROID-M1" in board_value:
+            board = boards.ODROID_M1
         return board
 
     def _rk3588_id(self) -> Optional[str]:

diff --git a/adafruit_platformdetect/chip.py b/adafruit_platformdetect/chip.py
@@ -245,9 +245,6 @@ def _linux_id(self) -> Optional[str]:
         if self.detector.check_dt_compatible_value("rockchip,rk3568"):
             return chips.RK3568
 
-        if self.detector.check_dt_compatible_value("rockchip,rk3568b2"):
-            return chips.RK3568B2
-
         if self.detector.check_dt_compatible_value("rockchip,rk3588"):
             return chips.RK3588
 

diff --git a/adafruit_platformdetect/constants/chips.py b/adafruit_platformdetect/constants/chips.py
@@ -61,7 +61,6 @@
 RK3288 = "RK3288"
 RK3566 = "RK3566"
 RK3568 = "RK3568"
-RK3568B2 = "RK3568B2"
 RK3588 = "RK3588"
 PENTIUM_N3710 = "PENTIUM_N3710"  # SOC Braswell core
 CELERON_N5105 = "CELERON_N5105"