Merge branch 'main' into add-agnostic-board

This commit is contained in:
Brent Rubell 2024-05-31 14:36:06 -04:00 committed by GitHub
commit 15d91a4c1b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 26 additions and 2 deletions

View file

@ -215,6 +215,8 @@ class Board:
board_id = boards.MILKV_DUO
elif chip_id == chips.TH1520:
board_id = boards.LICHEEPI_4A
elif chip_id == chips.RV1103:
board_id = self._rv1103_id()
elif chip_id == chips.RV1106:
board_id = self._rv1106_id()
self._board_id = board_id
@ -732,6 +734,8 @@ class Board:
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
@ -808,6 +812,14 @@ class Board:
board = boards.SIEMENS_SIMATIC_IOT2050_BASIC
return board
def _rv1103_id(self) -> Optional[str]:
"""Check what type of rv1103 board."""
board_value = self.detector.get_device_model()
board = None
if board_value and "Luckfox Pico Mini" in board_value:
board = boards.LUCKFOX_PICO_MINI
return board
def _rv1106_id(self) -> Optional[str]:
"""Check what type of rv1106 board."""
board_value = self.detector.get_device_model()

View file

@ -252,6 +252,9 @@ class Chip:
if self.detector.check_dt_compatible_value("rockchip,rk3588"):
return chips.RK3588
if self.detector.check_dt_compatible_value("rockchip,rv1103"):
return chips.RV1103
if self.detector.check_dt_compatible_value("rockchip,rv1106"):
return chips.RV1106

View file

@ -40,6 +40,7 @@ ASUS_TINKER_EDGE_R = "ASUS_TINKER_EDGE_R"
# Walnut Pi boards
WALNUT_PI_1B = "WALNUT_PI_1B"
WALNUT_PI_1B_EMMC = "WALNUT_PI_1B_EMMC"
# Clockwork Pi boards
CLOCKWORK_CPI3 = "CLOCKWORK_CPI3"
@ -229,6 +230,7 @@ _KHADAS_40_PIN_IDS = (KHADAS_VIM3,)
# Luckfox Pico boards
LUCKFOX_PICO_MAX = "LUCKFOX_PICO_MAX"
LUCKFOX_PICO_MINI = "LUCKFOX_PICO_MINI"
# Asus Tinkerboard
_ASUS_TINKER_BOARD_IDS = (
@ -238,7 +240,10 @@ _ASUS_TINKER_BOARD_IDS = (
)
# WalnutPi
_WALNUT_PI_IDS = (WALNUT_PI_1B,)
_WALNUT_PI_IDS = (
WALNUT_PI_1B,
WALNUT_PI_1B_EMMC,
)
# STM32MP1
_STM32MP1_IDS = (
@ -587,7 +592,10 @@ _REPKA_PI_IDS = (
_MILKV_IDS_ = (MILKV_DUO,)
# Luckfox
_LUCKFOX_IDS = (LUCKFOX_PICO_MAX,)
_LUCKFOX_IDS = (
LUCKFOX_PICO_MAX,
LUCKFOX_PICO_MINI,
)
# Agnostic board
OS_AGNOSTIC_BOARD = "OS_AGNOSTIC_BOARD"

View file

@ -63,6 +63,7 @@ RK3288 = "RK3288"
RK3566 = "RK3566"
RK3568 = "RK3568"
RK3588 = "RK3588"
RV1103 = "RV1103"
RV1106 = "RV1106"
PENTIUM_N3710 = "PENTIUM_N3710" # SOC Braswell core
CELERON_N5105 = "CELERON_N5105"