@@ -477,6 +477,12 @@ def get_v2_model(self, kconfig_dir, settings_file):
477477 This is needed to complete Kconfig sanity tests.
478478 """
479479 os .environ ['HWM_SCHEME' ] = 'v2'
480+ os .environ ["KCONFIG_BOARD_DIR" ] = os .path .join (kconfig_dir , 'boards' )
481+
482+ os .makedirs (os .path .join (kconfig_dir , 'boards' ), exist_ok = True )
483+ os .makedirs (os .path .join (kconfig_dir , 'soc' ), exist_ok = True )
484+ os .makedirs (os .path .join (kconfig_dir , 'arch' ), exist_ok = True )
485+
480486 kconfig_file = os .path .join (kconfig_dir , 'boards' , 'Kconfig' )
481487 kconfig_boards_file = os .path .join (kconfig_dir , 'boards' , 'Kconfig.boards' )
482488 kconfig_defconfig_file = os .path .join (kconfig_dir , 'boards' , 'Kconfig.defconfig' )
@@ -585,14 +591,7 @@ def parse_kconfig(self):
585591 # For Kconfig.dts support
586592 self .get_kconfig_dts (os .path .join (kconfiglib_dir , "Kconfig.dts" ),
587593 os .path .join (kconfiglib_dir , "settings_file.txt" ))
588-
589- # To make compliance work with old hw model and HWMv2 simultaneously.
590- kconfiglib_boards_dir = os .path .join (kconfiglib_dir , 'boards' )
591- os .makedirs (kconfiglib_boards_dir , exist_ok = True )
592- os .makedirs (os .path .join (kconfiglib_dir , 'soc' ), exist_ok = True )
593- os .makedirs (os .path .join (kconfiglib_dir , 'arch' ), exist_ok = True )
594-
595- os .environ ["KCONFIG_BOARD_DIR" ] = kconfiglib_boards_dir
594+ # For hardware model support (board, soc, arch)
596595 self .get_v2_model (kconfiglib_dir , os .path .join (kconfiglib_dir , "settings_file.txt" ))
597596
598597 # Tells Kconfiglib to generate warnings for all references to undefined
0 commit comments