Skip to content

Commit

Permalink
[nrf fromlist] cmake: use SOC_ROOT for SoCs instead of BOARD_ROOT
Browse files Browse the repository at this point in the history
kconfig_soc_root was mistakenly set to value of BOARD_ROOT.
Fix this by correctly set kconfig_soc_root to the value of SOC_ROOT.

Upstream PR: zephyrproject-rtos/zephyr#74057

Signed-off-by: Torsten Rasmussen <[email protected]>
(cherry picked from commit e7aef7ffb9b197efd914fe402621b63d28551f9e)
  • Loading branch information
tejlmand authored and gmarull committed Jun 11, 2024
1 parent bac0654 commit 41b063f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion cmake/modules/kconfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ file(MAKE_DIRECTORY ${KCONFIG_BINARY_DIR})
if(HWMv1)
# Support multiple SOC_ROOT
file(MAKE_DIRECTORY ${KCONFIG_BINARY_DIR}/soc)
set(kconfig_soc_root ${BOARD_ROOT})
set(kconfig_soc_root ${SOC_ROOT})
list(REMOVE_ITEM kconfig_soc_root ${ZEPHYR_BASE})
set(soc_defconfig_file ${KCONFIG_BINARY_DIR}/soc/Kconfig.defconfig)

Expand Down

0 comments on commit 41b063f

Please sign in to comment.