cmake: Remove support for deprecated prj_board.conf
Removes support for the deprecated features of having a prj file
which has the board name on the end of it. Board Kconfig fragments
should be used instead.
Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
diff --git a/cmake/modules/FindDeprecated.cmake b/cmake/modules/FindDeprecated.cmake
index 66cac2a..f80d341 100644
--- a/cmake/modules/FindDeprecated.cmake
+++ b/cmake/modules/FindDeprecated.cmake
@@ -107,13 +107,6 @@
endif()
endif()
-if("PRJ_BOARD" IN_LIST Deprecated_FIND_COMPONENTS)
- # This code was deprecated after Zephyr v3.3.0
- list(REMOVE_ITEM Deprecated_FIND_COMPONENTS PRJ_BOARD)
- message(DEPRECATION "'prj_<board>.conf' files are deprecated and should be "
- "replaced with board Kconfig fragments instead.")
-endif()
-
if("PYTHON_PREFER" IN_LIST Deprecated_FIND_COMPONENTS)
# This code was deprecated after Zephyr v3.4.0
list(REMOVE_ITEM Deprecated_FIND_COMPONENTS PYTHON_PREFER)
diff --git a/cmake/modules/configuration_files.cmake b/cmake/modules/configuration_files.cmake
index 76d19e5..d435742 100644
--- a/cmake/modules/configuration_files.cmake
+++ b/cmake/modules/configuration_files.cmake
@@ -68,9 +68,6 @@
# That value has precedence over anything else than a new
# `cmake -DCONF_FILE=<file>` invocation.
set(CONF_FILE ${CACHED_CONF_FILE})
-elseif(EXISTS ${APPLICATION_CONFIG_DIR}/prj_${BOARD}.conf)
- set(CONF_FILE ${APPLICATION_CONFIG_DIR}/prj_${BOARD}.conf)
- find_package(Deprecated COMPONENTS PRJ_BOARD)
elseif(EXISTS ${APPLICATION_CONFIG_DIR}/prj.conf)
set(CONF_FILE ${APPLICATION_CONFIG_DIR}/prj.conf)
set(CONF_FILE_INCLUDE_FRAGMENTS true)
diff --git a/samples/drivers/espi/prj_mec172xevb_assy6906.conf b/samples/drivers/espi/boards/mec172xevb_assy6906.conf
similarity index 100%
rename from samples/drivers/espi/prj_mec172xevb_assy6906.conf
rename to samples/drivers/espi/boards/mec172xevb_assy6906.conf
