diff --git a/bsp/imxrt/imxrt1170-nxp-evk/.config b/bsp/imxrt/imxrt1170-nxp-evk/m7/.config similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/.config rename to bsp/imxrt/imxrt1170-nxp-evk/m7/.config diff --git a/bsp/imxrt/imxrt1170-nxp-evk/Kconfig b/bsp/imxrt/imxrt1170-nxp-evk/m7/Kconfig similarity index 80% rename from bsp/imxrt/imxrt1170-nxp-evk/Kconfig rename to bsp/imxrt/imxrt1170-nxp-evk/m7/Kconfig index c9221717cb..356193256c 100644 --- a/bsp/imxrt/imxrt1170-nxp-evk/Kconfig +++ b/bsp/imxrt/imxrt1170-nxp-evk/m7/Kconfig @@ -3,7 +3,7 @@ mainmenu "RT-Thread Configuration" config RTT_DIR string option env="RTT_ROOT" - default "../../.." + default "../../../.." config PKGS_DIR string @@ -12,5 +12,5 @@ config PKGS_DIR source "$RTT_DIR/Kconfig" source "$PKGS_DIR/Kconfig" -source "../libraries/Kconfig" +source "../../libraries/Kconfig" source "board/Kconfig" diff --git a/bsp/imxrt/imxrt1170-nxp-evk/SConscript b/bsp/imxrt/imxrt1170-nxp-evk/m7/SConscript similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/SConscript rename to bsp/imxrt/imxrt1170-nxp-evk/m7/SConscript diff --git a/bsp/imxrt/imxrt1170-nxp-evk/SConstruct b/bsp/imxrt/imxrt1170-nxp-evk/m7/SConstruct similarity index 89% rename from bsp/imxrt/imxrt1170-nxp-evk/SConstruct rename to bsp/imxrt/imxrt1170-nxp-evk/m7/SConstruct index c950363404..9bd49dff8d 100644 --- a/bsp/imxrt/imxrt1170-nxp-evk/SConstruct +++ b/bsp/imxrt/imxrt1170-nxp-evk/m7/SConstruct @@ -5,7 +5,7 @@ import rtconfig if os.getenv('RTT_ROOT'): RTT_ROOT = os.getenv('RTT_ROOT') else: - RTT_ROOT = os.path.normpath(os.getcwd() + '/../../..') + RTT_ROOT = os.path.normpath(os.getcwd() + '/../../../..') sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')] try: @@ -46,10 +46,10 @@ Export('RTT_ROOT') Export('rtconfig') SDK_ROOT = os.path.abspath('./') -if os.path.exists(SDK_ROOT + '/libraries'): - libraries_path_prefix = SDK_ROOT + '/libraries' +if os.path.exists(SDK_ROOT + '/../libraries'): + libraries_path_prefix = SDK_ROOT + '/../libraries' else: - libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' + libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/../libraries' SDK_LIB = libraries_path_prefix Export('SDK_LIB') diff --git a/bsp/imxrt/imxrt1170-nxp-evk/applications/SConscript b/bsp/imxrt/imxrt1170-nxp-evk/m7/applications/SConscript similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/applications/SConscript rename to bsp/imxrt/imxrt1170-nxp-evk/m7/applications/SConscript diff --git a/bsp/imxrt/imxrt1170-nxp-evk/applications/main.c b/bsp/imxrt/imxrt1170-nxp-evk/m7/applications/main.c similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/applications/main.c rename to bsp/imxrt/imxrt1170-nxp-evk/m7/applications/main.c diff --git a/bsp/imxrt/imxrt1170-nxp-evk/applications/mnt.c b/bsp/imxrt/imxrt1170-nxp-evk/m7/applications/mnt.c similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/applications/mnt.c rename to bsp/imxrt/imxrt1170-nxp-evk/m7/applications/mnt.c diff --git a/bsp/imxrt/imxrt1170-nxp-evk/board/Kconfig b/bsp/imxrt/imxrt1170-nxp-evk/m7/board/Kconfig similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/board/Kconfig rename to bsp/imxrt/imxrt1170-nxp-evk/m7/board/Kconfig diff --git a/bsp/imxrt/imxrt1170-nxp-evk/board/MCUX_Config/MCUX_Config.mex b/bsp/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/MCUX_Config.mex similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/board/MCUX_Config/MCUX_Config.mex rename to bsp/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/MCUX_Config.mex diff --git a/bsp/imxrt/imxrt1170-nxp-evk/board/MCUX_Config/clock_config.c b/bsp/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/clock_config.c similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/board/MCUX_Config/clock_config.c rename to bsp/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/clock_config.c diff --git a/bsp/imxrt/imxrt1170-nxp-evk/board/MCUX_Config/clock_config.h b/bsp/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/clock_config.h similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/board/MCUX_Config/clock_config.h rename to bsp/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/clock_config.h diff --git a/bsp/imxrt/imxrt1170-nxp-evk/board/MCUX_Config/pin_mux.c b/bsp/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/pin_mux.c similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/board/MCUX_Config/pin_mux.c rename to bsp/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/pin_mux.c diff --git a/bsp/imxrt/imxrt1170-nxp-evk/board/MCUX_Config/pin_mux.h b/bsp/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/pin_mux.h similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/board/MCUX_Config/pin_mux.h rename to bsp/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/pin_mux.h diff --git a/bsp/imxrt/imxrt1170-nxp-evk/board/SConscript b/bsp/imxrt/imxrt1170-nxp-evk/m7/board/SConscript similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/board/SConscript rename to bsp/imxrt/imxrt1170-nxp-evk/m7/board/SConscript diff --git a/bsp/imxrt/imxrt1170-nxp-evk/board/board.c b/bsp/imxrt/imxrt1170-nxp-evk/m7/board/board.c similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/board/board.c rename to bsp/imxrt/imxrt1170-nxp-evk/m7/board/board.c diff --git a/bsp/imxrt/imxrt1170-nxp-evk/board/board.h b/bsp/imxrt/imxrt1170-nxp-evk/m7/board/board.h similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/board/board.h rename to bsp/imxrt/imxrt1170-nxp-evk/m7/board/board.h diff --git a/bsp/imxrt/imxrt1170-nxp-evk/board/dcd.c b/bsp/imxrt/imxrt1170-nxp-evk/m7/board/dcd.c similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/board/dcd.c rename to bsp/imxrt/imxrt1170-nxp-evk/m7/board/dcd.c diff --git a/bsp/imxrt/imxrt1170-nxp-evk/board/dcd.h b/bsp/imxrt/imxrt1170-nxp-evk/m7/board/dcd.h similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/board/dcd.h rename to bsp/imxrt/imxrt1170-nxp-evk/m7/board/dcd.h diff --git a/bsp/imxrt/imxrt1170-nxp-evk/board/linker_scripts/evkmimxrt1170_flexspi_nor_sdram.ini b/bsp/imxrt/imxrt1170-nxp-evk/m7/board/linker_scripts/evkmimxrt1170_flexspi_nor_sdram.ini similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/board/linker_scripts/evkmimxrt1170_flexspi_nor_sdram.ini rename to bsp/imxrt/imxrt1170-nxp-evk/m7/board/linker_scripts/evkmimxrt1170_flexspi_nor_sdram.ini diff --git a/bsp/imxrt/imxrt1170-nxp-evk/board/linker_scripts/link.icf b/bsp/imxrt/imxrt1170-nxp-evk/m7/board/linker_scripts/link.icf similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/board/linker_scripts/link.icf rename to bsp/imxrt/imxrt1170-nxp-evk/m7/board/linker_scripts/link.icf diff --git a/bsp/imxrt/imxrt1170-nxp-evk/board/linker_scripts/link.lds b/bsp/imxrt/imxrt1170-nxp-evk/m7/board/linker_scripts/link.lds similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/board/linker_scripts/link.lds rename to bsp/imxrt/imxrt1170-nxp-evk/m7/board/linker_scripts/link.lds diff --git a/bsp/imxrt/imxrt1170-nxp-evk/board/linker_scripts/link.sct b/bsp/imxrt/imxrt1170-nxp-evk/m7/board/linker_scripts/link.sct similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/board/linker_scripts/link.sct rename to bsp/imxrt/imxrt1170-nxp-evk/m7/board/linker_scripts/link.sct diff --git a/bsp/imxrt/imxrt1170-nxp-evk/board/ports/flexspi_port.h b/bsp/imxrt/imxrt1170-nxp-evk/m7/board/ports/flexspi_port.h similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/board/ports/flexspi_port.h rename to bsp/imxrt/imxrt1170-nxp-evk/m7/board/ports/flexspi_port.h diff --git a/bsp/imxrt/imxrt1170-nxp-evk/board/ports/sdram_port.h b/bsp/imxrt/imxrt1170-nxp-evk/m7/board/ports/sdram_port.h similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/board/ports/sdram_port.h rename to bsp/imxrt/imxrt1170-nxp-evk/m7/board/ports/sdram_port.h diff --git a/bsp/imxrt/imxrt1170-nxp-evk/project.ewd b/bsp/imxrt/imxrt1170-nxp-evk/m7/project.ewd similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/project.ewd rename to bsp/imxrt/imxrt1170-nxp-evk/m7/project.ewd diff --git a/bsp/imxrt/imxrt1170-nxp-evk/project.ewp b/bsp/imxrt/imxrt1170-nxp-evk/m7/project.ewp similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/project.ewp rename to bsp/imxrt/imxrt1170-nxp-evk/m7/project.ewp diff --git a/bsp/imxrt/imxrt1170-nxp-evk/project.eww b/bsp/imxrt/imxrt1170-nxp-evk/m7/project.eww similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/project.eww rename to bsp/imxrt/imxrt1170-nxp-evk/m7/project.eww diff --git a/bsp/imxrt/imxrt1170-nxp-evk/project.uvoptx b/bsp/imxrt/imxrt1170-nxp-evk/m7/project.uvoptx similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/project.uvoptx rename to bsp/imxrt/imxrt1170-nxp-evk/m7/project.uvoptx diff --git a/bsp/imxrt/imxrt1170-nxp-evk/project.uvprojx b/bsp/imxrt/imxrt1170-nxp-evk/m7/project.uvprojx similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/project.uvprojx rename to bsp/imxrt/imxrt1170-nxp-evk/m7/project.uvprojx diff --git a/bsp/imxrt/imxrt1170-nxp-evk/rtconfig.h b/bsp/imxrt/imxrt1170-nxp-evk/m7/rtconfig.h similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/rtconfig.h rename to bsp/imxrt/imxrt1170-nxp-evk/m7/rtconfig.h diff --git a/bsp/imxrt/imxrt1170-nxp-evk/rtconfig.py b/bsp/imxrt/imxrt1170-nxp-evk/m7/rtconfig.py similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/rtconfig.py rename to bsp/imxrt/imxrt1170-nxp-evk/m7/rtconfig.py diff --git a/bsp/imxrt/imxrt1170-nxp-evk/template.ewd b/bsp/imxrt/imxrt1170-nxp-evk/m7/template.ewd similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/template.ewd rename to bsp/imxrt/imxrt1170-nxp-evk/m7/template.ewd diff --git a/bsp/imxrt/imxrt1170-nxp-evk/template.ewp b/bsp/imxrt/imxrt1170-nxp-evk/m7/template.ewp similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/template.ewp rename to bsp/imxrt/imxrt1170-nxp-evk/m7/template.ewp diff --git a/bsp/imxrt/imxrt1170-nxp-evk/template.ewt b/bsp/imxrt/imxrt1170-nxp-evk/m7/template.ewt similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/template.ewt rename to bsp/imxrt/imxrt1170-nxp-evk/m7/template.ewt diff --git a/bsp/imxrt/imxrt1170-nxp-evk/template.eww b/bsp/imxrt/imxrt1170-nxp-evk/m7/template.eww similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/template.eww rename to bsp/imxrt/imxrt1170-nxp-evk/m7/template.eww diff --git a/bsp/imxrt/imxrt1170-nxp-evk/template.uvoptx b/bsp/imxrt/imxrt1170-nxp-evk/m7/template.uvoptx similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/template.uvoptx rename to bsp/imxrt/imxrt1170-nxp-evk/m7/template.uvoptx diff --git a/bsp/imxrt/imxrt1170-nxp-evk/template.uvprojx b/bsp/imxrt/imxrt1170-nxp-evk/m7/template.uvprojx similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/template.uvprojx rename to bsp/imxrt/imxrt1170-nxp-evk/m7/template.uvprojx diff --git a/bsp/imxrt/imxrt1170-nxp-evk/xip/SConscript b/bsp/imxrt/imxrt1170-nxp-evk/m7/xip/SConscript similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/xip/SConscript rename to bsp/imxrt/imxrt1170-nxp-evk/m7/xip/SConscript diff --git a/bsp/imxrt/imxrt1170-nxp-evk/xip/evkmimxrt1170_flexspi_nor_config.c b/bsp/imxrt/imxrt1170-nxp-evk/m7/xip/evkmimxrt1170_flexspi_nor_config.c similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/xip/evkmimxrt1170_flexspi_nor_config.c rename to bsp/imxrt/imxrt1170-nxp-evk/m7/xip/evkmimxrt1170_flexspi_nor_config.c diff --git a/bsp/imxrt/imxrt1170-nxp-evk/xip/evkmimxrt1170_flexspi_nor_config.h b/bsp/imxrt/imxrt1170-nxp-evk/m7/xip/evkmimxrt1170_flexspi_nor_config.h similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/xip/evkmimxrt1170_flexspi_nor_config.h rename to bsp/imxrt/imxrt1170-nxp-evk/m7/xip/evkmimxrt1170_flexspi_nor_config.h diff --git a/bsp/imxrt/imxrt1170-nxp-evk/xip/fsl_flexspi_nor_boot.c b/bsp/imxrt/imxrt1170-nxp-evk/m7/xip/fsl_flexspi_nor_boot.c similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/xip/fsl_flexspi_nor_boot.c rename to bsp/imxrt/imxrt1170-nxp-evk/m7/xip/fsl_flexspi_nor_boot.c diff --git a/bsp/imxrt/imxrt1170-nxp-evk/xip/fsl_flexspi_nor_boot.h b/bsp/imxrt/imxrt1170-nxp-evk/m7/xip/fsl_flexspi_nor_boot.h similarity index 100% rename from bsp/imxrt/imxrt1170-nxp-evk/xip/fsl_flexspi_nor_boot.h rename to bsp/imxrt/imxrt1170-nxp-evk/m7/xip/fsl_flexspi_nor_boot.h