cmake: remove dead 'soc_legacy' folder handling
During HWMv2 migration, non-ported SoCs were placed in a 'soc_legacy' folder and sourced from there instead of 'soc' folder. Remove the no-longer needed soc_legacy folder. CMake oot SoCs in old hardware model are sourced from '<soc-root>/soc/<arch>/<soc-path>' which has always been the case, also before HWMv2. Remove the 'osource "soc/soc_legacy/...' generation in Kconfig, because the source is relative to Zephyr base. All SoCs in Zephyr repository has been ported to the new hardware model and therefore there is no need for this line. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
This commit is contained in:
parent
ae833cd04f
commit
0d51cb08c4
4 changed files with 0 additions and 11 deletions
|
@ -30,9 +30,6 @@ if(HWMv1)
|
|||
list(REMOVE_ITEM kconfig_soc_root ${ZEPHYR_BASE})
|
||||
set(soc_defconfig_file ${KCONFIG_BINARY_DIR}/soc/Kconfig.defconfig)
|
||||
|
||||
# This loads Zephyr base SoC root defconfigs
|
||||
file(WRITE ${soc_defconfig_file} "osource \"soc/soc_legacy/$(ARCH)/*/Kconfig.defconfig\"\n")
|
||||
|
||||
set(OPERATION WRITE)
|
||||
foreach(root ${kconfig_soc_root})
|
||||
file(APPEND ${soc_defconfig_file}
|
||||
|
|
|
@ -60,9 +60,6 @@ if(HWMv1)
|
|||
if(EXISTS ${root}/soc/${ARCH}/${SOC_PATH})
|
||||
set(SOC_DIR ${root}/soc)
|
||||
break()
|
||||
elseif(EXISTS ${root}/soc/soc_legacy/${ARCH}/${SOC_PATH})
|
||||
set(SOC_DIR ${root}/soc/soc_legacy)
|
||||
break()
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
|
|
|
@ -9,9 +9,6 @@ menu "Hardware Configuration"
|
|||
|
||||
rsource "Kconfig.$(HWM_SCHEME)"
|
||||
|
||||
# This loads Zephyr base SoC Kconfigs for both hw model v1 and v2
|
||||
osource "soc/soc_legacy/$(ARCH)/Kconfig"
|
||||
|
||||
# Source Zephyr Kconfig specifics from SoC roots.
|
||||
osource "$(KCONFIG_BINARY_DIR)/soc/Kconfig"
|
||||
|
||||
|
|
|
@ -7,7 +7,5 @@ choice
|
|||
|
||||
# This loads custom SoC root Kconfig (only available if custom SoC root are defined)
|
||||
osource "$(KCONFIG_BINARY_DIR)/soc/Kconfig.soc.choice"
|
||||
# This loads Zephyr base SoC scheme v1 root Kconfig
|
||||
osource "soc/soc_legacy/$(ARCH)/*/Kconfig.soc"
|
||||
|
||||
endchoice
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue