Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hwmv2: microchip_mec: port to HWMv2 #69082

Merged
merged 3 commits into from
Feb 20, 2024

Conversation

fabiobaltieri
Copy link
Member

Port the MEC soc and boards to hwmv2.

@@ -216,7 +210,17 @@ config MCHP_HEADER_VERBOSE_OUTPUT

endif # MCHP_MEC_UNSIGNED_HEADER

# Select SoC Part No. and configuration options
source "soc/soc_legacy/arm/microchip_mec/*/Kconfig.soc"
config SOC_MEC172X_PROC_CLK_DIV
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one is used by mec15xx drivers as well as it turns out, should probably be renamed but I just moved it up the hierarchy in the interest of not changing the matching usage in drivers/

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Falls on the maintainers responsibility to fix

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah fine by me... I can also rename it here if you prefer, whatever, no difference but this change is needed for the boards to build

soc/microchip/mec/Kconfig.soc Outdated Show resolved Hide resolved
soc/microchip/mec/Kconfig.soc Outdated Show resolved Hide resolved
soc/microchip/mec/Kconfig.soc Outdated Show resolved Hide resolved
soc/microchip/mec/mec1501x/Kconfig Outdated Show resolved Hide resolved
soc/microchip/mec/mec172x/Kconfig Outdated Show resolved Hide resolved
@@ -216,7 +210,17 @@ config MCHP_HEADER_VERBOSE_OUTPUT

endif # MCHP_MEC_UNSIGNED_HEADER

# Select SoC Part No. and configuration options
source "soc/soc_legacy/arm/microchip_mec/*/Kconfig.soc"
config SOC_MEC172X_PROC_CLK_DIV
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Falls on the maintainers responsibility to fix

@fabiobaltieri
Copy link
Member Author

Rebased as well, merge conflict on the doc index file.

Copy link
Collaborator

@nordicjm nordicjm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor change then good to go

soc/microchip/mec/Kconfig Outdated Show resolved Hide resolved
soc/microchip/mec/Kconfig.defconfig Show resolved Hide resolved
Convert the Microchip MEC soc/ to hardware model v2.

Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
Convert mec1501modular_assy6885, mec15xxevb_assy6853,
mec172xevb_assy6906 and mec172xmodular_assy6930 to hwmv2.

Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
Adjust few paths in the board document and maintainer file to reflect
the new file location.

Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
@@ -12,7 +12,7 @@ endif()
if (DEFINED CONFIG_MCHP_MEC_UNSIGNED_HEADER)
set(MCHP_MEC_BIN_NAME ${CONFIG_KERNEL_BIN_NAME}.mchp.bin)
set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
COMMAND ${PYTHON_EXECUTABLE} ${SOC_DIR}/${ARCH}/${SOC_FAMILY}/common/spigen/mec_spi_gen.py
COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/soc/microchip/mec/common/spigen/mec_spi_gen.py
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No change requested, but want to point out that the following code resolves to same location:

Suggested change
COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/soc/microchip/mec/common/spigen/mec_spi_gen.py
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/spigen/mec_spi_gen.py

@tejlmand tejlmand merged commit b939010 into zephyrproject-rtos:collab-hwm Feb 20, 2024
18 checks passed
@fabiobaltieri fabiobaltieri deleted the mec-hwmv2 branch February 28, 2024 12:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants