From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Thu, 15 Dec 2022 18:49:35 +0000 (-0800)
Subject: Merge pull request #635 from happyme531/rk3588-rock-5
X-Git-Tag: 8.10.0
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/6d7575069dd39a740212f7ae6c12ecf1c8f8bb98?ds=inline;hp=-c

Merge pull request #635 from happyme531/rk3588-rock-5

 Add support for Radxa rock 5b
---

6d7575069dd39a740212f7ae6c12ecf1c8f8bb98
diff --combined src/board.py
index ded04b0,480983c..8654cd8
--- a/src/board.py
+++ b/src/board.py
@@@ -235,14 -235,17 +235,17 @@@ elif board_id == ap_board.ROCK_PI_S
  elif board_id == ap_board.ROCK_PI_4:
      from adafruit_blinka.board.radxa.rockpi4 import *
  
+ elif board_id == ap_board.ROCK_PI_5:
+     from adafruit_blinka.board.radxa.rock5 import *
+ 
  elif board_id == ap_board.ROCK_PI_E:
      from adafruit_blinka.board.radxa.rockpie import *
  
  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 *
@@@ -259,12 -262,6 +262,12 @@@ elif board_id == ap_board.LUBANCAT_IMX6
  elif board_id == ap_board.LUBANCAT_STM32MP157:
      from adafruit_blinka.board.lubancat.lubancat_stm32mp157 import *
  
 +elif board_id == ap_board.LUBANCAT_ZERO:
 +    from adafruit_blinka.board.lubancat.lubancat_zero import *
 +
 +elif board_id == ap_board.LUBANCAT1:
 +    from adafruit_blinka.board.lubancat.lubancat1 import *
 +
  elif board_id == ap_board.NANOPI_NEO_AIR:
      from adafruit_blinka.board.nanopi.neoair import *