From 9fc0e92c1da9ee422eec776ea58397fd0a9fee52 Mon Sep 17 00:00:00 2001 From: Fabio Baltieri Date: Tue, 27 Feb 2024 14:05:51 +0000 Subject: [PATCH 1/2] CMakeLists: use MEC15XX for the series option Rename the SoC series option to MEC15XX to align with the new hwmv2 config name, drop the 1701x option which had no references anyway. Signed-off-by: Fabio Baltieri --- mec/CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mec/CMakeLists.txt b/mec/CMakeLists.txt index 5cca6b0b..9512ae37 100644 --- a/mec/CMakeLists.txt +++ b/mec/CMakeLists.txt @@ -4,7 +4,5 @@ # SPDX-License-Identifier: Apache-2.0 # -zephyr_include_directories_ifdef(CONFIG_SOC_SERIES_MEC1701X .) - -zephyr_include_directories_ifdef(CONFIG_SOC_SERIES_MEC1501X common) -zephyr_include_directories_ifdef(CONFIG_SOC_SERIES_MEC1501X mec1501) +zephyr_include_directories_ifdef(CONFIG_SOC_SERIES_MEC15XX common) +zephyr_include_directories_ifdef(CONFIG_SOC_SERIES_MEC15XX mec1501) From 412b4c4dd91ad304c1a3023c8c4c0a85600763fa Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Thu, 4 Apr 2024 20:38:05 -0400 Subject: [PATCH 2/2] hal: microchip: Sync main branch with master to switch default to main The hal_microchip repo is still using "master" as the default branch name. We want to switch the default branch to "main" for future development. Signed-off-by: Scott Worley --- README.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.txt b/README.txt index e9018043..99a46966 100644 --- a/README.txt +++ b/README.txt @@ -38,4 +38,7 @@ Both are from Tag 21.08 The following changes were made: - platform-2021.08 top folder renamed to mpfs and located at modules/hal/microchip - - The applications/mpfs-pmp-demo/mpfs-pmp-app-u54-1/src/boards folder is copied to modules/hal/microchip/mpfs \ No newline at end of file + - The applications/mpfs-pmp-demo/mpfs-pmp-app-u54-1/src/boards folder is copied to modules/hal/microchip/mpfs + +----------------------------------------------------- +2024-04-04 change default branch from master to main.