From: Jens Oberender <1905126+burberius@users.noreply.github.com>
Date: Tue, 28 May 2024 11:58:26 +0000 (+0200)
Subject: Merge branch 'adafruit:main' into raxda-zero3
X-Git-Tag: 8.40.0~1^2
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/89028b7fe874bf72ea080b017fd63acfa8dbd1ed?ds=inline;hp=-c

Merge branch 'adafruit:main' into raxda-zero3
---

89028b7fe874bf72ea080b017fd63acfa8dbd1ed
diff --combined src/board.py
index 46e9c10,44f8fda..085743a
--- a/src/board.py
+++ b/src/board.py
@@@ -224,13 -224,7 +224,7 @@@ elif board_id == ap_board.BINHO_NOVA
      from adafruit_blinka.board.binho_nova import *
  
  elif board_id == ap_board.MICROCHIP_MCP2221:
-     if (
-         "BLINKA_FORCECHIP" in os.environ
-         and os.environ["BLINKA_FORCEBOARD"] == "MICROCHIP_MCP2221"
-     ):
-         from adafruit_blinka.board.fake_microchip_mcp2221 import *
-     else:
-         from adafruit_blinka.board.microchip_mcp2221 import *
+     from adafruit_blinka.board.microchip_mcp2221 import *
  
  elif board_id == ap_board.GREATFET_ONE:
      from adafruit_blinka.board.greatfet_one import *
@@@ -274,9 -268,6 +268,9 @@@ elif board_id == ap_board.ROCK_PI_3C
  elif board_id == ap_board.RADXA_ZERO:
      from adafruit_blinka.board.radxa.radxazero import *
  
 +elif board_id == ap_board.RADXA_ZERO3:
 +    from adafruit_blinka.board.radxa.radxazero3 import *
 +
  elif board_id == ap_board.ROCK_PI_S:
      from adafruit_blinka.board.radxa.rockpis import *
  
@@@ -397,6 -388,12 +391,12 @@@ elif board_id == ap_board.LICHEEPI_4A
  elif board_id == ap_board.MILKV_DUO:
      from adafruit_blinka.board.milkv_duo import *
  
+ elif (
+     "BLINKA_FORCECHIP" in os.environ
+     and os.environ["BLINKA_FORCEBOARD"] == "GENERIC_AGNOSTIC_BOARD"
+ ):
+     from adafruit_blinka.board.generic_agnostic_board import *
+ 
  elif "sphinx" in sys.modules:
      pass