@ -4,13 +4,13 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
import argparse import argparse
from collections import defaultdict from collections import defaultdict , Counter
from dataclasses import dataclass , field from dataclasses import dataclass , field
import itertools import itertools
from pathlib import Path from pathlib import Path
import pykwalify . core import pykwalify . core
import sys import sys
from typing import List from typing import List , Union
import yaml import yaml
import list_hardware import list_hardware
from list_hardware import unique_paths from list_hardware import unique_paths
@ -91,7 +91,8 @@ class Soc:
@dataclass ( frozen = True ) @dataclass ( frozen = True )
class Board : class Board :
name : str name : str
dir : Path # HWMv1 only supports a single Path, and requires Board dataclass to be hashable.
directories : Union [ Path , List [ Path ] ]
hwm : str hwm : str
full_name : str = None full_name : str = None
arch : str = None arch : str = None
@ -103,6 +104,41 @@ class Board:
socs : List [ Soc ] = field ( default_factory = list , compare = False ) socs : List [ Soc ] = field ( default_factory = list , compare = False )
variants : List [ str ] = field ( default_factory = list , compare = False ) variants : List [ str ] = field ( default_factory = list , compare = False )
def from_qualifier ( self , qualifiers ) :
qualifiers_list = qualifiers . split ( ' / ' )
node = Soc ( None )
n = len ( qualifiers_list )
if n > 0 :
soc_qualifier = qualifiers_list . pop ( 0 )
for s in self . socs :
if s . name == soc_qualifier :
node = s
break
if n > 1 :
if node . cpuclusters :
cpu_qualifier = qualifiers_list . pop ( 0 )
for c in node . cpuclusters :
if c . name == cpu_qualifier :
node = c
break
else :
node = Variant ( None )
for q in qualifiers_list :
for v in node . variants :
if v . name == q :
node = v
break
else :
node = Variant ( None )
if node in ( Soc ( None ) , Variant ( None ) ) :
sys . exit ( f ' ERROR: qualifiers { qualifiers } not found when extending board { self . name } ' )
return node
def board_key ( board ) : def board_key ( board ) :
return board . name return board . name
@ -165,11 +201,10 @@ def find_arch2board_set_in(root, arches, board_dir):
for arch in arches : for arch in arches :
if not ( boards / arch ) . is_dir ( ) : if not ( boards / arch ) . is_dir ( ) :
continue continue
for maybe_board in ( boards / arch ) . iterdir ( ) : for maybe_board in ( boards / arch ) . iterdir ( ) :
if not maybe_board . is_dir ( ) : if not maybe_board . is_dir ( ) :
continue continue
if board_dir is not None and board_dir != maybe_board : if board_dir and maybe_board not in board_dir :
continue continue
for maybe_defconfig in maybe_board . iterdir ( ) : for maybe_defconfig in maybe_board . iterdir ( ) :
file_name = maybe_defconfig . name file_name = maybe_defconfig . name
@ -181,7 +216,8 @@ def find_arch2board_set_in(root, arches, board_dir):
def load_v2_boards ( board_name , board_yml , systems ) : def load_v2_boards ( board_name , board_yml , systems ) :
boards = [ ] boards = { }
board_extensions = [ ]
if board_yml . is_file ( ) : if board_yml . is_file ( ) :
with board_yml . open ( ' r ' , encoding = ' utf-8 ' ) as f : with board_yml . open ( ' r ' , encoding = ' utf-8 ' ) as f :
b = yaml . load ( f . read ( ) , Loader = SafeLoader ) b = yaml . load ( f . read ( ) , Loader = SafeLoader )
@ -199,6 +235,18 @@ def load_v2_boards(board_name, board_yml, systems):
board_array = b . get ( ' boards ' , [ b . get ( ' board ' , None ) ] ) board_array = b . get ( ' boards ' , [ b . get ( ' board ' , None ) ] )
for board in board_array : for board in board_array :
mutual_exclusive = { ' name ' , ' extend ' }
if len ( mutual_exclusive - board . keys ( ) ) < 1 :
sys . exit ( f ' ERROR: Malformed " board " section in file: { board_yml . as_posix ( ) } \n '
f ' { mutual_exclusive } are mutual exclusive at this level. ' )
# This is a extending an existing board, place in array to allow later processing.
if ' extend ' in board :
board . update ( { ' dir ' : board_yml . parent } )
board_extensions . append ( board )
continue
# Create board
if board_name is not None : if board_name is not None :
if board [ ' name ' ] != board_name : if board [ ' name ' ] != board_name :
# Not the board we're looking for, ignore. # Not the board we're looking for, ignore.
@ -220,9 +268,9 @@ def load_v2_boards(board_name, board_yml, systems):
socs = [ Soc . from_soc ( systems . get_soc ( s [ ' name ' ] ) , s . get ( ' variants ' , [ ] ) ) socs = [ Soc . from_soc ( systems . get_soc ( s [ ' name ' ] ) , s . get ( ' variants ' , [ ] ) )
for s in board . get ( ' socs ' , { } ) ] for s in board . get ( ' socs ' , { } ) ]
board = Board ( boards [ board [ ' name ' ] ] = Board (
name = board [ ' name ' ] , name = board [ ' name ' ] ,
dir = board_yml . parent , directories = [ board_yml . parent ] ,
vendor = board . get ( ' vendor ' ) , vendor = board . get ( ' vendor ' ) ,
full_name = board . get ( ' full_name ' ) , full_name = board . get ( ' full_name ' ) ,
revision_format = board . get ( ' revision ' , { } ) . get ( ' format ' ) , revision_format = board . get ( ' revision ' , { } ) . get ( ' format ' ) ,
@ -234,8 +282,28 @@ def load_v2_boards(board_name, board_yml, systems):
variants = [ Variant . from_dict ( v ) for v in board . get ( ' variants ' , [ ] ) ] , variants = [ Variant . from_dict ( v ) for v in board . get ( ' variants ' , [ ] ) ] ,
hwm = ' v2 ' , hwm = ' v2 ' ,
) )
boards . append ( board ) board_qualifiers = board_v2_qualifiers ( boards [ board [ ' name ' ] ] )
return boards duplicates = [ q for q , n in Counter ( board_qualifiers ) . items ( ) if n > 1 ]
if duplicates :
sys . exit ( f ' ERROR: Duplicated board qualifiers detected { duplicates } for board: '
f ' { board [ " name " ] } . \n Please check content of: { board_yml . as_posix ( ) } \n ' )
return boards , board_extensions
def extend_v2_boards ( boards , board_extensions ) :
for e in board_extensions :
board = boards . get ( e [ ' extend ' ] )
if board is None :
continue
board . directories . append ( e [ ' dir ' ] )
for v in e . get ( ' variants ' , [ ] ) :
node = board . from_qualifier ( v [ ' qualifier ' ] )
if str ( v [ ' qualifier ' ] + ' / ' + v [ ' name ' ] ) in board_v2_qualifiers ( board ) :
board_yml = e [ ' dir ' ] / BOARD_YML
sys . exit ( f ' ERROR: Variant: { v [ " name " ] } , defined multiple times for board: '
f ' { board . name } . \n Last defined in { board_yml } ' )
node . variants . append ( Variant . from_dict ( v ) )
# Note that this does not share the args.board functionality of find_v2_boards # Note that this does not share the args.board functionality of find_v2_boards
@ -253,14 +321,25 @@ def find_v2_boards(args):
root_args = argparse . Namespace ( * * { ' soc_roots ' : args . soc_roots } ) root_args = argparse . Namespace ( * * { ' soc_roots ' : args . soc_roots } )
systems = list_hardware . find_v2_systems ( root_args ) systems = list_hardware . find_v2_systems ( root_args )
boards = [ ] boards = { }
board_extensions = [ ]
board_files = [ ] board_files = [ ]
for root in unique_paths ( args . board_roots ) : if args . board_dir :
board_files . extend ( ( root / ' boards ' ) . rglob ( BOARD_YML ) ) board_files = [ d / BOARD_YML for d in args . board_dir ]
else :
for root in unique_paths ( args . board_roots ) :
board_files . extend ( ( root / ' boards ' ) . rglob ( BOARD_YML ) )
for board_yml in board_files : for board_yml in board_files :
b = load_v2_boards ( args . board , board_yml , systems ) b , e = load_v2_boards ( args . board , board_yml , systems )
boards . extend ( b ) conflict_boards = set ( boards . keys ( ) ) . intersection ( b . keys ( ) )
if conflict_boards :
sys . exit ( f ' ERROR: Board(s): { conflict_boards } , defined multiple times. \n '
f ' Last defined in { board_yml } ' )
boards . update ( b )
board_extensions . extend ( e )
extend_v2_boards ( boards , board_extensions )
return boards return boards
@ -285,7 +364,7 @@ def add_args(parser):
help = ' add a soc root, may be given more than once ' ) help = ' add a soc root, may be given more than once ' )
parser . add_argument ( " --board " , dest = ' board ' , default = None , parser . add_argument ( " --board " , dest = ' board ' , default = None ,
help = ' lookup the specific board, fail if not found ' ) help = ' lookup the specific board, fail if not found ' )
parser . add_argument ( " --board-dir " , default = None , type = Path , parser . add_argument ( " --board-dir " , default = [ ] , type = Path , action = ' append ' ,
help = ' Only look for boards at the specific location ' ) help = ' Only look for boards at the specific location ' )
@ -327,20 +406,16 @@ def board_v2_qualifiers_csv(board):
def dump_v2_boards ( args ) : def dump_v2_boards ( args ) :
if args . board_dir : boards = find_v2_boards ( args )
root_args = argparse . Namespace ( * * { ' soc_roots ' : args . soc_roots } )
systems = list_hardware . find_v2_systems ( root_args )
boards = load_v2_boards ( args . board , args . board_dir / BOARD_YML , systems )
else :
boards = find_v2_boards ( args )
for b in boards : for b in boards . values ( ) :
qualifiers_list = board_v2_qualifiers ( b ) qualifiers_list = board_v2_qualifiers ( b )
if args . cmakeformat is not None : if args . cmakeformat is not None :
notfound = lambda x : x or ' NOTFOUND ' notfound = lambda x : x or ' NOTFOUND '
info = args . cmakeformat . format ( info = args . cmakeformat . format (
NAME = ' NAME; ' + b . name , NAME = ' NAME; ' + b . name ,
DIR = ' DIR; ' + str ( b . dir . as_posix ( ) ) , DIR = ' DIR; ' + ' ; ' . join (
[ str ( x . as_posix ( ) ) for x in b . directories ] ) ,
VENDOR = ' VENDOR; ' + notfound ( b . vendor ) , VENDOR = ' VENDOR; ' + notfound ( b . vendor ) ,
HWM = ' HWM; ' + b . hwm , HWM = ' HWM; ' + b . hwm ,
REVISION_DEFAULT = ' REVISION_DEFAULT; ' + notfound ( b . revision_default ) , REVISION_DEFAULT = ' REVISION_DEFAULT; ' + notfound ( b . revision_default ) ,
@ -365,7 +440,7 @@ def dump_boards(args):
if args . cmakeformat is not None : if args . cmakeformat is not None :
info = args . cmakeformat . format ( info = args . cmakeformat . format (
NAME = ' NAME; ' + board . name , NAME = ' NAME; ' + board . name ,
DIR = ' DIR; ' + str ( board . dir . as_posix ( ) ) , DIR = ' DIR; ' + str ( board . directories . as_posix ( ) ) ,
HWM = ' HWM; ' + board . hwm , HWM = ' HWM; ' + board . hwm ,
VENDOR = ' VENDOR;NOTFOUND ' , VENDOR = ' VENDOR;NOTFOUND ' ,
REVISION_DEFAULT = ' REVISION_DEFAULT;NOTFOUND ' , REVISION_DEFAULT = ' REVISION_DEFAULT;NOTFOUND ' ,
Torsten Rasmussen
1 year ago
committed by
Henrik Brix Andersen