From: ecarozzo <emanuelecarozzo@gmail.com>
Date: Thu, 15 Dec 2022 08:53:39 +0000 (+0100)
Subject: Merge branch 'adafruit:main' into main
X-Git-Tag: 8.10.0~2^2
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/c2a1fee3c01387bd4d88b467ecd4da4cdf3fa480?hp=-c

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

c2a1fee3c01387bd4d88b467ecd4da4cdf3fa480
diff --combined src/board.py
index 4ab0af1,19bfe95..ef2664c
--- a/src/board.py
+++ b/src/board.py
@@@ -223,6 -223,9 +223,9 @@@ elif board_id == ap_board.CLOCKWORK_CPI
  elif board_id == ap_board.ONION_OMEGA2:
      from adafruit_blinka.board.onion.omega2 import *
  
+ elif board_id == ap_board.RADXA_CM3:
+     from adafruit_blinka.board.radxa.radxacm3 import *
+ 
  elif board_id == ap_board.RADXA_ZERO:
      from adafruit_blinka.board.radxa.radxazero import *
  
@@@ -238,8 -241,8 +241,8 @@@ elif board_id == ap_board.ROCK_PI_E
  elif board_id == ap_board.UDOO_X86:
      from adafruit_blinka.board.udoo_x86ultra import *
  
 -elif board_id == ap_board.ODYSSEY_X86J4105:
 -    from adafruit_blinka.board.x86j4105 import *
 +elif board_id == ap_board.ODYSSEY_X86J41X5:
 +    from adafruit_blinka.board.x86j41x5 import *
  
  elif board_id == ap_board.STM32MP157C_DK2:
      from adafruit_blinka.board.stm32.stm32mp157c_dk2 import *