From 73122cd5f90d3516474e89f30ee8e2266d03d5d8 Mon Sep 17 00:00:00 2001 From: Jerry Palacios Date: Fri, 9 Feb 2024 09:36:58 -0600 Subject: [PATCH] mcx family renamed as mcxn MCXN and MCXA have different ARM Cortex M33 core, can't be on the same family --- hw/bsp/{mcx => mcxn}/FreeRTOSConfig/FreeRTOSConfig.h | 0 hw/bsp/{mcx => mcxn}/boards/frdmmcxn947/board.cmake | 0 hw/bsp/{mcx => mcxn}/boards/frdmmcxn947/board.h | 0 hw/bsp/{mcx => mcxn}/boards/frdmmcxn947/board.mk | 0 hw/bsp/{mcx => mcxn}/boards/frdmmcxn947/clock_config.c | 0 hw/bsp/{mcx => mcxn}/boards/frdmmcxn947/clock_config.h | 0 hw/bsp/{mcx => mcxn}/boards/frdmmcxn947/pin_mux.c | 0 hw/bsp/{mcx => mcxn}/boards/frdmmcxn947/pin_mux.h | 0 hw/bsp/{mcx => mcxn}/boards/mcxn947brk/board.cmake | 0 hw/bsp/{mcx => mcxn}/boards/mcxn947brk/board.h | 0 hw/bsp/{mcx => mcxn}/boards/mcxn947brk/board.mk | 0 hw/bsp/{mcx => mcxn}/boards/mcxn947brk/clock_config.c | 0 hw/bsp/{mcx => mcxn}/boards/mcxn947brk/clock_config.h | 0 hw/bsp/{mcx => mcxn}/boards/mcxn947brk/pin_mux.c | 0 hw/bsp/{mcx => mcxn}/boards/mcxn947brk/pin_mux.h | 0 hw/bsp/{mcx => mcxn}/debug.jlinkscript | 0 hw/bsp/{mcx => mcxn}/family.c | 0 hw/bsp/{mcx => mcxn}/family.cmake | 0 hw/bsp/{mcx => mcxn}/family.mk | 0 tools/get_deps.py | 4 ++-- 20 files changed, 2 insertions(+), 2 deletions(-) rename hw/bsp/{mcx => mcxn}/FreeRTOSConfig/FreeRTOSConfig.h (100%) rename hw/bsp/{mcx => mcxn}/boards/frdmmcxn947/board.cmake (100%) rename hw/bsp/{mcx => mcxn}/boards/frdmmcxn947/board.h (100%) rename hw/bsp/{mcx => mcxn}/boards/frdmmcxn947/board.mk (100%) rename hw/bsp/{mcx => mcxn}/boards/frdmmcxn947/clock_config.c (100%) rename hw/bsp/{mcx => mcxn}/boards/frdmmcxn947/clock_config.h (100%) rename hw/bsp/{mcx => mcxn}/boards/frdmmcxn947/pin_mux.c (100%) rename hw/bsp/{mcx => mcxn}/boards/frdmmcxn947/pin_mux.h (100%) rename hw/bsp/{mcx => mcxn}/boards/mcxn947brk/board.cmake (100%) rename hw/bsp/{mcx => mcxn}/boards/mcxn947brk/board.h (100%) rename hw/bsp/{mcx => mcxn}/boards/mcxn947brk/board.mk (100%) rename hw/bsp/{mcx => mcxn}/boards/mcxn947brk/clock_config.c (100%) rename hw/bsp/{mcx => mcxn}/boards/mcxn947brk/clock_config.h (100%) rename hw/bsp/{mcx => mcxn}/boards/mcxn947brk/pin_mux.c (100%) rename hw/bsp/{mcx => mcxn}/boards/mcxn947brk/pin_mux.h (100%) rename hw/bsp/{mcx => mcxn}/debug.jlinkscript (100%) rename hw/bsp/{mcx => mcxn}/family.c (100%) rename hw/bsp/{mcx => mcxn}/family.cmake (100%) rename hw/bsp/{mcx => mcxn}/family.mk (100%) diff --git a/hw/bsp/mcx/FreeRTOSConfig/FreeRTOSConfig.h b/hw/bsp/mcxn/FreeRTOSConfig/FreeRTOSConfig.h similarity index 100% rename from hw/bsp/mcx/FreeRTOSConfig/FreeRTOSConfig.h rename to hw/bsp/mcxn/FreeRTOSConfig/FreeRTOSConfig.h diff --git a/hw/bsp/mcx/boards/frdmmcxn947/board.cmake b/hw/bsp/mcxn/boards/frdmmcxn947/board.cmake similarity index 100% rename from hw/bsp/mcx/boards/frdmmcxn947/board.cmake rename to hw/bsp/mcxn/boards/frdmmcxn947/board.cmake diff --git a/hw/bsp/mcx/boards/frdmmcxn947/board.h b/hw/bsp/mcxn/boards/frdmmcxn947/board.h similarity index 100% rename from hw/bsp/mcx/boards/frdmmcxn947/board.h rename to hw/bsp/mcxn/boards/frdmmcxn947/board.h diff --git a/hw/bsp/mcx/boards/frdmmcxn947/board.mk b/hw/bsp/mcxn/boards/frdmmcxn947/board.mk similarity index 100% rename from hw/bsp/mcx/boards/frdmmcxn947/board.mk rename to hw/bsp/mcxn/boards/frdmmcxn947/board.mk diff --git a/hw/bsp/mcx/boards/frdmmcxn947/clock_config.c b/hw/bsp/mcxn/boards/frdmmcxn947/clock_config.c similarity index 100% rename from hw/bsp/mcx/boards/frdmmcxn947/clock_config.c rename to hw/bsp/mcxn/boards/frdmmcxn947/clock_config.c diff --git a/hw/bsp/mcx/boards/frdmmcxn947/clock_config.h b/hw/bsp/mcxn/boards/frdmmcxn947/clock_config.h similarity index 100% rename from hw/bsp/mcx/boards/frdmmcxn947/clock_config.h rename to hw/bsp/mcxn/boards/frdmmcxn947/clock_config.h diff --git a/hw/bsp/mcx/boards/frdmmcxn947/pin_mux.c b/hw/bsp/mcxn/boards/frdmmcxn947/pin_mux.c similarity index 100% rename from hw/bsp/mcx/boards/frdmmcxn947/pin_mux.c rename to hw/bsp/mcxn/boards/frdmmcxn947/pin_mux.c diff --git a/hw/bsp/mcx/boards/frdmmcxn947/pin_mux.h b/hw/bsp/mcxn/boards/frdmmcxn947/pin_mux.h similarity index 100% rename from hw/bsp/mcx/boards/frdmmcxn947/pin_mux.h rename to hw/bsp/mcxn/boards/frdmmcxn947/pin_mux.h diff --git a/hw/bsp/mcx/boards/mcxn947brk/board.cmake b/hw/bsp/mcxn/boards/mcxn947brk/board.cmake similarity index 100% rename from hw/bsp/mcx/boards/mcxn947brk/board.cmake rename to hw/bsp/mcxn/boards/mcxn947brk/board.cmake diff --git a/hw/bsp/mcx/boards/mcxn947brk/board.h b/hw/bsp/mcxn/boards/mcxn947brk/board.h similarity index 100% rename from hw/bsp/mcx/boards/mcxn947brk/board.h rename to hw/bsp/mcxn/boards/mcxn947brk/board.h diff --git a/hw/bsp/mcx/boards/mcxn947brk/board.mk b/hw/bsp/mcxn/boards/mcxn947brk/board.mk similarity index 100% rename from hw/bsp/mcx/boards/mcxn947brk/board.mk rename to hw/bsp/mcxn/boards/mcxn947brk/board.mk diff --git a/hw/bsp/mcx/boards/mcxn947brk/clock_config.c b/hw/bsp/mcxn/boards/mcxn947brk/clock_config.c similarity index 100% rename from hw/bsp/mcx/boards/mcxn947brk/clock_config.c rename to hw/bsp/mcxn/boards/mcxn947brk/clock_config.c diff --git a/hw/bsp/mcx/boards/mcxn947brk/clock_config.h b/hw/bsp/mcxn/boards/mcxn947brk/clock_config.h similarity index 100% rename from hw/bsp/mcx/boards/mcxn947brk/clock_config.h rename to hw/bsp/mcxn/boards/mcxn947brk/clock_config.h diff --git a/hw/bsp/mcx/boards/mcxn947brk/pin_mux.c b/hw/bsp/mcxn/boards/mcxn947brk/pin_mux.c similarity index 100% rename from hw/bsp/mcx/boards/mcxn947brk/pin_mux.c rename to hw/bsp/mcxn/boards/mcxn947brk/pin_mux.c diff --git a/hw/bsp/mcx/boards/mcxn947brk/pin_mux.h b/hw/bsp/mcxn/boards/mcxn947brk/pin_mux.h similarity index 100% rename from hw/bsp/mcx/boards/mcxn947brk/pin_mux.h rename to hw/bsp/mcxn/boards/mcxn947brk/pin_mux.h diff --git a/hw/bsp/mcx/debug.jlinkscript b/hw/bsp/mcxn/debug.jlinkscript similarity index 100% rename from hw/bsp/mcx/debug.jlinkscript rename to hw/bsp/mcxn/debug.jlinkscript diff --git a/hw/bsp/mcx/family.c b/hw/bsp/mcxn/family.c similarity index 100% rename from hw/bsp/mcx/family.c rename to hw/bsp/mcxn/family.c diff --git a/hw/bsp/mcx/family.cmake b/hw/bsp/mcxn/family.cmake similarity index 100% rename from hw/bsp/mcx/family.cmake rename to hw/bsp/mcxn/family.cmake diff --git a/hw/bsp/mcx/family.mk b/hw/bsp/mcxn/family.mk similarity index 100% rename from hw/bsp/mcx/family.mk rename to hw/bsp/mcxn/family.mk diff --git a/tools/get_deps.py b/tools/get_deps.py index ef83beea9..2a14c6123 100644 --- a/tools/get_deps.py +++ b/tools/get_deps.py @@ -52,7 +52,7 @@ deps_optional = { 'lpc11 lpc13 lpc15 lpc17 lpc18 lpc40 lpc43'], 'hw/mcu/nxp/mcux-sdk': ['https://github.com/wavenumber-eng/mcux-sdk.git', 'main', - 'kinetis_k32l2 kinetis_kl lpc51 lpc54 lpc55 mcx mcxa imxrt'], + 'kinetis_k32l2 kinetis_kl lpc51 lpc54 lpc55 mcxn mcxa imxrt'], 'hw/mcu/raspberry_pi/Pico-PIO-USB': ['https://github.com/sekigon-gonnoc/Pico-PIO-USB.git', '0f747aaa0c16f750bdfa2ba37ec25d6c8e1bc117', 'rp2040'], @@ -175,7 +175,7 @@ deps_optional = { 'ch32f20x'], 'lib/CMSIS_5': ['https://github.com/ARM-software/CMSIS_5.git', '20285262657d1b482d132d20d755c8c330d55c1f', - 'imxrt kinetis_k32l2 kinetis_kl lpc51 lpc54 lpc55 mcx mm32 msp432e4 nrf ra saml2x' + 'imxrt kinetis_k32l2 kinetis_kl lpc51 lpc54 lpc55 mcxn mcxa mm32 msp432e4 nrf ra saml2x' 'stm32f0 stm32f1 stm32f2 stm32f3 stm32f4 stm32f7 stm32g0 stm32g4 stm32h5' 'stm32h7 stm32l0 stm32l1 stm32l4 stm32l5 stm32u5 stm32wb'], 'lib/sct_neopixel': ['https://github.com/gsteiert/sct_neopixel.git',