3917 files changed, 1451 insertions, 2237 deletions

diff --git a/.github/workflows/bsp_buildings.yml b/.github/workflows/bsp_buildings.yml
index f3b2bde06e..92a4c58ecf 100644
--- a/.github/workflows/bsp_buildings.yml
+++ b/.github/workflows/bsp_buildings.yml
@@ -197,16 +197,14 @@ jobs:
                 - "nxp/lpc/lpc54114-lite"
                 - "nxp/lpc/lpc176x"
                 #- "nxp/lpc/lpc43xx/M4"
-                - "imx6sx/cortex-a9"
-                - "imxrt/imxrt1052-atk-commander"
-                - "imxrt/imxrt1052-fire-pro"
-                - "imxrt/imxrt1052-nxp-evk"
-                - "imxrt/imxrt1052-seeed-ArchMix"
-                - "imxrt/imxrt1060-nxp-evk"
-                - "imxrt/imxrt1064-nxp-evk"
-                - "imxrt/imxrt1021-nxp-evk"
-                - "frdm-k64f"
-                - "xplorer4330/M4"
+                - "nxp/imx/imx6sx/cortex-a9"
+                - "nxp/imx/imxrt/imxrt1052-atk-commander"
+                - "nxp/imx/imxrt/imxrt1052-fire-pro"
+                - "nxp/imx/imxrt/imxrt1052-nxp-evk"
+                - "nxp/imx/imxrt/imxrt1052-seeed-ArchMix"
+                - "nxp/imx/imxrt/imxrt1060-nxp-evk"
+                - "nxp/imx/imxrt/imxrt1064-nxp-evk"
+                - "nxp/imx/imxrt/imxrt1021-nxp-evk"
                 - "nxp/mcx/mcxn/frdm-mcxn947"
                 - "nxp/mcx/mcxa/frdm-mcxa153"
                 - "renesas/ebf_qi_min_6m5"
@@ -219,6 +217,8 @@ jobs:
                 - "renesas/ra8m1-ek"
                 - "renesas/ra8d1-ek"
                 - "renesas/ra8d1-vision-board"
+                - "frdm-k64f"
+                - "xplorer4330/M4"
          -  RTT_BSP: "gd32_n32_apm32"   
             RTT_TOOL_CHAIN: "sourcery-arm"
             SUB_RTT_BSP:             
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/mk/common.mk b/bsp/imx6sx/iMX6_Platform_SDK/mk/common.mk
deleted file mode 100755
index bc25b1c6d9..0000000000
--- a/bsp/imx6sx/iMX6_Platform_SDK/mk/common.mk
+++ /dev/null
@@ -1,195 +0,0 @@
-#-------------------------------------------------------------------------------
-# Copyright (c) 2012 Freescale Semiconductor, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# o Redistributions of source code must retain the above copyright notice, this list
-#   of conditions and the following disclaimer.
-#
-# o Redistributions in binary form must reproduce the above copyright notice, this
-#   list of conditions and the following disclaimer in the documentation and/or
-#   other materials provided with the distribution.
-#
-# o Neither the name of Freescale Semiconductor, Inc. nor the names of its
-#   contributors may be used to endorse or promote products derived from this
-#   software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#-------------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------------
-# Root paths
-#-------------------------------------------------------------------------------
-
-# At this point, the path to this makefile was just appended to MAKEFILE_LIST. We make
-# use of this to get the root directory of the SDK. This variable is exported to child
-# instances of make.
-this_makefile := $(firstword $(MAKEFILE_LIST))
-export SDK_ROOT := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../)
-
-# The rest of the paths are defined in a separate makefile for easy access.
-include $(SDK_ROOT)/mk/paths.mk
-
-#-------------------------------------------------------------------------------
-# Utility
-#-------------------------------------------------------------------------------
-
-# Kludge to create a variable equal to a single space.
-empty :=
-space := $(empty) $(empty)
-
-#-------------------------------------------------------------------------------
-# OS
-#-------------------------------------------------------------------------------
-
-# Get the OS name. Known values are "Linux", "CYGWIN_NT-5.1", and "Darwin".
-os_name := $(shell uname -s)
-
-# Set to 1 if running on cygwin.
-is_cygwin := $(and $(findstring CYGWIN,$(os_name)),1)
-
-# Set to 1 if running on redhat.
-is_redhat := $(shell if [ -f /etc/redhat-release ]; then echo 1 ; fi)
-
-# Disable parallel builds for cygwin since they hang.
-ifeq "$(is_cygwin)" "1"
-.NOTPARALLEL:
-endif
-
-#-------------------------------------------------------------------------------
-# Logging options
-#-------------------------------------------------------------------------------
-
-# Enable color output by default.
-BUILD_SDK_COLOR ?= 1
-
-# Normally, commands in recipes are prefixed with '@' so the command itself
-# is not echoed by make. But if VERBOSE is defined (set to anything non-empty),
-# then the '@' is removed from recipes. The 'at' variable is used to control
-# this. Similarly, 'silent_make' is used to pass the -s option to child make
-# invocations when not in VERBOSE mode.
-ifeq "$(VERBOSE)" "1"
-at :=
-silent_make :=
-else
-at := @
-silent_make := -s
-endif
-
-# These colors must be printed with the printf command. echo won't handle the
-# escape sequences.
-color_default = \033[00m
-color_bold = \033[01m
-color_red = \033[31m
-color_green = \033[32m
-color_yellow = \033[33m
-color_blue = \033[34m
-color_magenta = \033[35m
-color_cyan = \033[36m
-color_orange = \033[38;5;172m
-color_light_blue = \033[38;5;039m
-color_gray = \033[38;5;008m
-color_purple = \033[38;5;097m
-
-ifeq "$(BUILD_SDK_COLOR)" "1"
-color_build := $(color_light_blue)
-color_c := $(color_green)
-color_cxx := $(color_green)
-color_cpp := $(color_orange)
-color_asm := $(color_magenta)
-color_ar := $(color_yellow)
-color_link := $(color_purple)
-endif
-
-# Used in printmessage if the color args are not present.
-color_ :=
-
-# Use in recipes to print color messages if printing to a terminal. If
-# BUILD_SDK_COLOR is not set to 1, this reverts to a simple uncolorized printf.
-# A newline is added to the end of the printed message.
-#
-# Arguments:
-#  1 - name of the color variable (see above), minus the "color_" prefix
-#  2 - first colorized part of the message
-#  3 - first uncolorized part of the message
-#  4 - color name for second colorized message
-#  5 - second colorized message
-#  6 - second uncolorized part of the message
-#  7 - uncolorized prefix on the whole line; this is last because it is expected to be used rarely
-#
-# All arguments are optional.
-#
-# Use like:
-#  $(call printmessage,cyan,Building, remainder of the message...)
-ifeq "$(BUILD_SDK_COLOR)" "1"
-define printmessage
-if [ -t 1 ]; then printf "$(7)$(color_$(1))$(2)$(color_default)$(3)$(color_$(4))$(5)$(color_default)$(6)\n" ; \
-else printf "$(7)$(2)$(3)$(5)$(6)\n" ; fi
-endef
-else
-define printmessage
-printf "$(7)$(2)$(3)$(5)$(6)\n" ; fi
-endef
-endif
-
-#-------------------------------------------------------------------------------
-# Compiler and tools
-#-------------------------------------------------------------------------------
-
-# For all the paths built below, we assume that the Mentor CodeSourcery release of gcc is
-# being used. Other distributions of gcc may work, but have not been tested.
-
-# Set compiler version defaults.
-CROSS_COMPILE = arm-none-eabi-
-
-# Strip off the trailing '-', resulting in arm-none-eabi
-CROSS_COMPILE_STRIP := $(CROSS_COMPILE:%-=%)
-
-# Build tool names.
-CC = $(CROSS_COMPILE)gcc
-CXX = $(CROSS_COMPILE)g++
-LD = $(CROSS_COMPILE)ld
-AS = $(CROSS_COMPILE)as
-AR = $(CROSS_COMPILE)ar
-OBJCOPY = $(CROSS_COMPILE)objcopy
-
-# Ask the compiler for its version
-CC_VERSION := $(shell $(CC) -dumpversion)
-
-# Get the compiler directory. We have to go through this sillyness in order to support
-# paths with spaces in their names, such as under Cygwin where the CodeSourcery compiler
-# is normally installed under C:\Program Files\.
-CC_PREFIX := $(shell dirname "`which $(CC)`")/..
-
-# Standard library include paths.
-LIBGCC_LDPATH = $(CC_PREFIX)/lib/gcc/$(CROSS_COMPILE_STRIP)/$(CC_VERSION)/$(CC_LIB_POST)
-LIBC_LDPATH = $(CC_PREFIX)/$(CROSS_COMPILE_STRIP)/lib/$(CC_LIB_POST)
-
-# System header file include paths.
-CC_INCLUDE = $(CC_PREFIX)/lib/gcc/$(CROSS_COMPILE_STRIP)/$(CC_VERSION)/include
-CC_INCLUDE_FIXED = $(CC_PREFIX)/lib/gcc/$(CROSS_COMPILE_STRIP)/$(CC_VERSION)/include-fixed
-LIBC_INCLUDE = $(CC_PREFIX)/$(CROSS_COMPILE_STRIP)/include
-
-#-------------------------------------------------------------------------------
-# Target and board configuration
-#-------------------------------------------------------------------------------
-
-include $(SDK_ROOT)/mk/config.mk
-
-#-------------------------------------------------------------------------------
-# Compiler flags
-#-------------------------------------------------------------------------------
-
-include $(SDK_ROOT)/mk/flags.mk
-
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/mk/config.mk b/bsp/imx6sx/iMX6_Platform_SDK/mk/config.mk
deleted file mode 100755
index 0b30e88681..0000000000
--- a/bsp/imx6sx/iMX6_Platform_SDK/mk/config.mk
+++ /dev/null
@@ -1,99 +0,0 @@
-#-------------------------------------------------------------------------------
-# Copyright (c) 2012 Freescale Semiconductor, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# o Redistributions of source code must retain the above copyright notice, this list
-#   of conditions and the following disclaimer.
-#
-# o Redistributions in binary form must reproduce the above copyright notice, this
-#   list of conditions and the following disclaimer in the documentation and/or
-#   other materials provided with the distribution.
-#
-# o Neither the name of Freescale Semiconductor, Inc. nor the names of its
-#   contributors may be used to endorse or promote products derived from this
-#   software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#-------------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------------
-# Target and board configuration
-#-------------------------------------------------------------------------------
-
-# Handle lower-case versions of the config variables. These are really meant to ease
-# manual invocation of make via the command line.
-ifdef target
-TARGET = $(target)
-endif
-ifdef board
-BOARD = $(board)
-endif
-ifdef boardrev
-BOARD_REVISION = $(boardrev)
-endif
-
-# Target
-ifeq "$(TARGET)" "mx6dq"
-DEFINES += -DCHIP_MX6DQ
-CPU	= cortex-a9
-else ifeq "$(TARGET)" "mx6sdl"
-DEFINES += -DCHIP_MX6SDL
-CPU	= cortex-a9
-else ifeq "$(TARGET)" "mx6sl"
-DEFINES += -DCHIP_MX6SL
-CPU	= cortex-a9
-else ifdef TARGET
-$(error Unknown target $(TARGET))
-endif
-
-# Board
-ifeq "$(BOARD)" "evb"
-DEFINES += -DBOARD_EVB
-else ifeq "$(BOARD)" "evk"
-DEFINES += -DBOARD_EVK
-else ifeq "$(BOARD)" "sabre_ai"
-DEFINES += -DBOARD_SABRE_AI
-else ifeq "$(BOARD)" "smart_device"
-DEFINES += -DBOARD_SMART_DEVICE
-else ifdef BOARD
-$(error Unknown board $(BOARD))
-endif
-
-# Board revision, defaults to a if not specified.
-ifndef BOARD_REVISION
-BOARD_REVISION = a
-BOARD_REVISION_IS_DEFAULT = yes
-endif
-ifeq "$(BOARD_REVISION)" "c"
-DEFINES +=-DBOARD_REV_C
-else ifeq "$(BOARD_REVISION)" "b"
-DEFINES +=-DBOARD_REV_B
-else ifeq "$(BOARD_REVISION)" "a"
-DEFINES +=-DBOARD_REV_A
-else ifdef BOARD_REVISION
-$(error Unknown board revision $(BOARD_REVISION))
-endif
-
-# Only define this variable if a board is specified.
-ifdef BOARD
-BOARD_WITH_REV := $(BOARD)_rev_$(BOARD_REVISION)
-endif
-
-# Set this define to 1 if we want to build thumb binaries, or 0 for ARM.
-USE_THUMB ?= 0
-
-# Enable debug build by default.
-DEBUG ?= 1
-
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/mk/flags.mk b/bsp/imx6sx/iMX6_Platform_SDK/mk/flags.mk
deleted file mode 100755
index e732d57292..0000000000
--- a/bsp/imx6sx/iMX6_Platform_SDK/mk/flags.mk
+++ /dev/null
@@ -1,157 +0,0 @@
-#-------------------------------------------------------------------------------
-# Copyright (c) 2012 Freescale Semiconductor, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# o Redistributions of source code must retain the above copyright notice, this list
-#   of conditions and the following disclaimer.
-#
-# o Redistributions in binary form must reproduce the above copyright notice, this
-#   list of conditions and the following disclaimer in the documentation and/or
-#   other materials provided with the distribution.
-#
-# o Neither the name of Freescale Semiconductor, Inc. nor the names of its
-#   contributors may be used to endorse or promote products derived from this
-#   software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#-------------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------------
-# Compiler flags
-#-------------------------------------------------------------------------------
-
-# Generate debug information.
-# Add '-O0' at the end of this line to turn off optimizations.  This can make
-# debugging (especially asm) much easier but it greatly increases the size of
-# the code and reduces performance.
-CDEBUG = -g -O0 -DDEBUG=1
-
-# Turns on all -O2 except size increasers.
-# Any CDEBUG settings will come after this and can be used to override.
-COMMON_FLAGS += -Os
-COMMON_FLAGS += -mno-unaligned-access
-
-# Turn on dead code elimination.
-COMMON_FLAGS += -fdce
-
-# Enables all warnings and treat them as errors except those preceded with -Wno-
-C_FLAGS_WARNINGS = -Wall -Werror -Wno-uninitialized -Wno-strict-aliasing -Wno-unused-function -fdiagnostics-show-option
-C_FLAGS_WARNINGS += -Wno-unused-but-set-variable -Wno-format
-
-# Turn on all warnings.
-COMMON_FLAGS += $(C_FLAGS_WARNINGS)
-
-# Don't use common symbols.  This is usually done in kernels.  Makes
-# code size slightly larger and increases performance.
-COMMON_FLAGS += -fno-common
-
-# Use a freestanding build environment.  Standard for kernels, implies
-# std library may not exist.
-COMMON_FLAGS += -ffreestanding -fno-builtin
-
-# Don't ever link anything against shared libs.
-COMMON_FLAGS += -static
-
-# Don't link against the system std library or compiler libraries.
-# Everything we link against MUST be specified with -I/-L explicitly.
-#COMMON_FLAGS += -nostdinc -nostdlib
-
-# Set the C standard to C99 with GNU extensions.
-# Use traditional GNU inline function semantics.
-C99_FLAGS = -std=gnu99 -fgnu89-inline
-
-# Generate code specifically for ARMv7-A, cortex-ax CPU.
-# Use the ARM Procedure Call Standard.
-ARM_FLAGS = -march=armv7-a -mcpu=$(CPU) -mtune=$(CPU) -mapcs
-
-ifeq "$(USE_THUMB)" "1"
-    # Generate thumb2 instructions (mixed 16/32-bit).
-    ARM_FLAGS += -mthumb
-    # Allow mixed ARM and thumb code.  All C code will generate thumb instructions
-    # but there is hand-written asm that requires ARM.
-    ARM_FLAGS += -mthumb-interwork
-    # Indicate that we're using thumb.
-    ARM_FLAGS += -DUSE_THUMB
-    CC_LIB_POST = thumb2
-else
-    # Generate ARM-only code.
-    ARM_FLAGS += -marm
-    CC_LIB_POST =
-endif
-
-# Use NEON SIMD instructions for floating point.  Alternatively can specify
-# VFP which gives IEEE 754-compliance (unlike NEON which can have errors).
-ARM_FLAGS += -mfpu=neon
-# Specify these options with NEON.
-ARM_FLAGS += -ftree-vectorize
-ARM_FLAGS += -fno-math-errno
-ARM_FLAGS += -funsafe-math-optimizations
-ARM_FLAGS += -fno-signed-zeros
-# Use float-abi=softfp for soft floating point api with HW instructions.
-# Alternatively, float-abi=hard for hw float instructions and pass float args in float regs.
-ARM_FLAGS += -mfloat-abi=softfp
-
-# Build common flags shared by C and C++.
-COMMON_FLAGS += $(ARM_FLAGS)
-
-# Add debug flags for debug builds.
-ifeq "$(DEBUG)" "1"
-COMMON_FLAGS += $(CDEBUG)
-endif
-
-# C flags. Set C99 mode.
-CFLAGS += $(COMMON_FLAGS)
-CFLAGS += $(C99_FLAGS)
-
-# C++ flags. Disable exceptions and RTTI.
-CXXFLAGS += $(COMMON_FLAGS)
-CXXFLAGS += -fno-exceptions -fno-rtti
-
-#-------------------------------------------------------------------------------
-# Include paths
-#-------------------------------------------------------------------------------
-
-# Link against libc and libgcc. Specify paths to libc in newlib build
-# directory.  Need to specify libgcc since our linker does not link
-# against anything, even compiler libs because of -nostdlib.
-LDADD += -lm -lstdc++ -lc -lgcc
-
-# These include paths have to be quoted because they may contain spaces,
-# particularly under cygwin.
-LDINC += -L '$(LIBGCC_LDPATH)' -L '$(LIBC_LDPATH)'
-
-# Indicate gcc and newlib std includes as -isystem so gcc tags and
-# treats them as system directories.
-SYSTEM_INC = \
-    -isystem '$(CC_INCLUDE)' \
-    -isystem '$(CC_INCLUDE_FIXED)' \
-    -isystem '$(LIBC_INCLUDE)'
-
-INCLUDES += \
-    -I$(SDK_ROOT)/sdk \
-    -I$(SDK_ROOT)/sdk/include  \
-    -I$(SDK_ROOT)/sdk/include/$(TARGET) \
-    -I$(SDK_ROOT)/sdk/drivers \
-    -I$(SDK_ROOT)/sdk/common \
-    -I$(SDK_ROOT)/sdk/core \
-    -I$(SDK_ROOT)/sdk/utility \
-    -I$(BOARD_ROOT) \
-    -I$(SDK_ROOT)/board/$(TARGET)/common \
-    -I$(SDK_ROOT)/board/common \
-    -I$(LWIP_ROOT)/lwip/src/include \
-    -I$(LWIP_ROOT)/lwip/src/include/ipv4 \
-    -I$(LWIP_ROOT)/lwip/src/include/ipv6 \
-    -I$(LWIP_ROOT)/mx6/include
-
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/mk/paths.mk b/bsp/imx6sx/iMX6_Platform_SDK/mk/paths.mk
deleted file mode 100755
index 6702f2af0e..0000000000
--- a/bsp/imx6sx/iMX6_Platform_SDK/mk/paths.mk
+++ /dev/null
@@ -1,74 +0,0 @@
-#-------------------------------------------------------------------------------
-# Copyright (c) 2012 Freescale Semiconductor, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# o Redistributions of source code must retain the above copyright notice, this list
-#   of conditions and the following disclaimer.
-#
-# o Redistributions in binary form must reproduce the above copyright notice, this
-#   list of conditions and the following disclaimer in the documentation and/or
-#   other materials provided with the distribution.
-#
-# o Neither the name of Freescale Semiconductor, Inc. nor the names of its
-#   contributors may be used to endorse or promote products derived from this
-#   software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#-------------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------------
-# Root paths
-#-------------------------------------------------------------------------------
-
-# Build root directory paths.
-SDK_LIB_ROOT = $(SDK_ROOT)/sdk
-APPS_ROOT = $(SDK_ROOT)/apps
-BOARD_ROOT = $(SDK_ROOT)/board/$(TARGET)/$(BOARD)
-LWIP_ROOT = $(SDK_ROOT)/lwip
-
-#-------------------------------------------------------------------------------
-# Output file paths
-#-------------------------------------------------------------------------------
-
-# Build output directory paths.
-#
-# All output goes under the top-level 'output' directory. Libraries are not board-specific,
-# but apps are. Everything is chip-specific. Objects for both libs and apps are placed in
-# an 'obj' directory under either the app or lib output directory.
-#
-# Libs:     output/<chip>/lib/lib<foo>.a
-# Lib objs: output/<chip>/lib/obj/<foo>/...
-#
-# Apps:     output/<chip>/<app>/<board>/<app>.elf
-# App objs: output/<chip>/<app>/<board>/obj/...
-#
-OUTPUT_ROOT = $(SDK_ROOT)/output/$(TARGET)
-
-LIBS_ROOT = $(OUTPUT_ROOT)/lib
-LIB_OBJS_ROOT = $(LIBS_ROOT)/obj/$(TARGET_LIB_NAME)
-
-# Put app build products in their own dir.
-APP_OUTPUT_ROOT = $(OUTPUT_ROOT)/$(APP_NAME)/$(BOARD_WITH_REV)
-APP_OBJS_ROOT = $(APP_OUTPUT_ROOT)/obj
-
-#-------------------------------------------------------------------------------
-# Standard library paths
-#-------------------------------------------------------------------------------
-
-LIBSDK = $(LIBS_ROOT)/libsdk.a
-LIBBOARD = $(LIBS_ROOT)/libboard_$(BOARD_WITH_REV).a
-LIBLWIP = $(LIBS_ROOT)/liblwip.a
-
-
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/mk/targets.mk b/bsp/imx6sx/iMX6_Platform_SDK/mk/targets.mk
deleted file mode 100755
index 1676d17d28..0000000000
--- a/bsp/imx6sx/iMX6_Platform_SDK/mk/targets.mk
+++ /dev/null
@@ -1,249 +0,0 @@
-#-------------------------------------------------------------------------------
-# Copyright (c) 2012 Freescale Semiconductor, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# o Redistributions of source code must retain the above copyright notice, this list
-#   of conditions and the following disclaimer.
-#
-# o Redistributions in binary form must reproduce the above copyright notice, this
-#   list of conditions and the following disclaimer in the documentation and/or
-#   other materials provided with the distribution.
-#
-# o Neither the name of Freescale Semiconductor, Inc. nor the names of its
-#   contributors may be used to endorse or promote products derived from this
-#   software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#-------------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------------
-# Sources and objects
-#-------------------------------------------------------------------------------
-
-# Select our object root depending on whether we're building an app or lib.
-ifneq "$(APP_NAME)" ""
-OBJS_ROOT = $(APP_OBJS_ROOT)
-else
-OBJS_ROOT = $(LIB_OBJS_ROOT)
-endif
-
-# Strip sources.
-SOURCES := $(strip $(SOURCES))
-
-# Convert sources list to absolute paths and root-relative paths.
-SOURCES_ABS := $(foreach s,$(SOURCES),$(abspath $(s)))
-SOURCES_REL := $(subst $(SDK_ROOT)/,,$(SOURCES_ABS))
-
-# Get a list of unique directories containing the source files.
-SOURCE_DIRS_ABS := $(sort $(foreach f,$(SOURCES_ABS),$(dir $(f))))
-SOURCE_DIRS_REL := $(subst $(SDK_ROOT)/,,$(SOURCE_DIRS_ABS))
-
-OBJECTS_DIRS := $(addprefix $(OBJS_ROOT)/,$(SOURCE_DIRS_REL))
-
-# Filter source files list into separate source types.
-C_SOURCES = $(filter %.c,$(SOURCES_REL))
-CXX_SOURCES = $(filter %.cpp,$(SOURCES_REL))
-ASM_s_SOURCES = $(filter %.s,$(SOURCES_REL))
-ASM_S_SOURCES = $(filter %.S,$(SOURCES_REL))
-
-# Convert sources to objects.
-OBJECTS_C := $(addprefix $(OBJS_ROOT)/,$(C_SOURCES:.c=.o))
-OBJECTS_CXX := $(addprefix $(OBJS_ROOT)/,$(CXX_SOURCES:.cpp=.o))
-OBJECTS_ASM := $(addprefix $(OBJS_ROOT)/,$(ASM_s_SOURCES:.s=.o))
-OBJECTS_ASM_S := $(addprefix $(OBJS_ROOT)/,$(ASM_S_SOURCES:.S=.o))
-
-PREBUILT_OBJECTS = $(addprefix $(SDK_ROOT)/,$(filter %.o,$(SOURCES_REL)))
-
-# Complete list of all object files.
-OBJECTS_ALL := $(sort $(OBJECTS_C) $(OBJECTS_CXX) $(OBJECTS_ASM) $(OBJECTS_ASM_S) $(PREBUILT_OBJECTS))
-
-#-------------------------------------------------------------------------------
-# Target library
-#-------------------------------------------------------------------------------
-
-# Library where app objects are archived, if used.
-LIBAPP = $(APP_OUTPUT_ROOT)/lib$(APP_NAME).a
-
-# Build the target lib path from the lib name.
-ifneq "$(TARGET_LIB_NAME)" ""
-TARGET_LIB ?= $(LIBS_ROOT)/lib$(TARGET_LIB_NAME).a
-else ifeq "$(ARCHIVE_APP_OBJECTS)" "1"
-TARGET_LIB ?= $(LIBAPP)
-endif
-
-# Construct full path name to application output ELF file.
-ifneq "$(APP_NAME)" ""
-APP_ELF ?= $(APP_OUTPUT_ROOT)/$(APP_NAME).elf
-endif
-
-# Select the output target.
-ifneq "$(TARGET_LIB)" ""
-# Only use the target lib if there are actually objects to put into it.
-ifneq "$(strip $(OBJECTS_ALL))" ""
-archive_or_objs = $(TARGET_LIB)($(OBJECTS_ALL))
-endif
-else
-archive_or_objs = $(OBJECTS_ALL)
-endif
-
-#-------------------------------------------------------------------------------
-# Default target
-#-------------------------------------------------------------------------------
-
-# Note that prerequisite order is important here. The subdirectories must be built first, or you
-# may end up with files in the current directory not getting added to libraries. This would happen
-# if subdirs modified the library file after local files were compiled but before they were added
-# to the library.
-.PHONY: all
-all : $(SUBDIRS) $(archive_or_objs) $(APP_ELF)
-
-# Recipe to create the output object file directories.
-$(OBJECTS_DIRS) :
-	$(at)mkdir -p $@
-
-# Everything depends upon the current makefile.
-$(OBJECTS_ALL) $(APP_ELF): $(this_makefile)
-
-# Object files depend on the directories where they will be created.
-#
-# The dirs are made order-only prerequisites (by being listed after the '|') so they won't cause
-# the objects to be rebuilt, as the modification date on a directory changes whenver its contents
-# change. This would cause the objects to always be rebuilt if the dirs were normal prerequisites.
-$(OBJECTS_ALL): | $(OBJECTS_DIRS)
-
-#-------------------------------------------------------------------------------
-# Pattern rules for compilation
-#-------------------------------------------------------------------------------
-# We cd into the source directory before calling the appropriate compiler. This must be done
-# on a single command line since make calls individual recipe lines in separate shells, so
-# '&&' is used to chain the commands.
-#
-# Generate make dependencies while compiling using the -MMD option, which excludes system headers.
-# If system headers are included, there are path problems on cygwin. The -MP option creates empty
-# targets for each header file so that a rebuild will be forced if the file goes missing, but
-# no error will occur.
-
-# Compile C sources.
-$(OBJS_ROOT)/%.o: $(SDK_ROOT)/%.c
-	@$(call printmessage,c,Compiling, $(subst $(SDK_ROOT)/,,$<))
-	$(at)cd $(dir $<) && $(CC) $(CFLAGS) $(SYSTEM_INC) $(INCLUDES) $(DEFINES) -MMD -MF $(basename $@).d -MP -o $@ -c $<
-
-# Compile C++ sources.
-$(OBJS_ROOT)/%.o: $(SDK_ROOT)/%.cpp
-	@$(call printmessage,cxx,Compiling, $(subst $(SDK_ROOT)/,,$<))
-	$(at)cd $(dir $<) && $(CXX) $(CXXFLAGS) $(SYSTEM_INC) $(INCLUDES) $(DEFINES) -MMD -MF $(basename $@).d -MP -o $@ -c $<
-
-# For .S assembly files, first run through the C preprocessor then assemble.
-$(OBJS_ROOT)/%.o: $(SDK_ROOT)/%.S
-	@$(call printmessage,asm,Assembling, $(subst $(SDK_ROOT)/,,$<))
-	$(at)cd $(dir $<) \
-	&& $(CPP) -D__LANGUAGE_ASM__ $(INCLUDES) $(DEFINES) -o $(basename $@).s $< \
-	&& $(AS) $(ASFLAGS) $(INCLUDES) -MD $(OBJS_ROOT)/$*.d -o $@ $(basename $@).s
-
-# Assembler sources.
-$(OBJS_ROOT)/%.o: $(SDK_ROOT)/%.s
-	@$(call printmessage,asm,Assembling, $(subst $(SDK_ROOT)/,,$<))
-	$(at)cd $(dir $<) && $(AS) $(ASFLAGS) $(INCLUDES) -MD $(basename $@).d -o $@ $<
-
-# Add objects to the target library.
-#
-# We use mkdir to explicitly ensure that the archive's directory exists before calling
-# the ar tool. The dir can't be made a dependancy because make will try to add it to the
-# archive.
-#
-# flock is used to protect the archive file from multiple processes trying to write to it
-# simultaneously, in case we're using parallel processes.
-#
-# The log message is disabled in order to reduce clutter in the build log, since you will get
-# one message for every file that is archived.
-$(TARGET_LIB)(%): %
-#	@$(call printmessage,ar,Archiving, $(?F) in $(@F))
-	$(at)mkdir -p $(dir $(@))
-	$(at)flock $(@).lock $(AR) -rucs $@ $?
-
-#-------------------------------------------------------------------------------
-# Subdirs
-#-------------------------------------------------------------------------------
-
-# Recursively execute make in each of the subdirectories.
-# Subdirs are double-colon rules to allow additional recipes to be added to them.
-# This is used by the top-level makefile to print a message when starting to build
-# the sdk library.
-.PHONY: $(SUBDIRS)
-$(SUBDIRS)::
-	@$(MAKE) $(silent_make) -r -C $@
-
-#-------------------------------------------------------------------------------
-# Linking
-#-------------------------------------------------------------------------------
-
-# Only link the application if LINK_APP is defined.
-ifeq "$(LINK_APP)" "1"
-
-# If app objects are being archived into a library, we don't need to specify the
-# actual .o files on the linker command line.
-ifeq "$(ARCHIVE_APP_OBJECTS)" "1"
-app_objs = $(TARGET_LIB)
-else
-app_objs = $(OBJECTS_ALL) $(TARGET_LIB)
-endif
-
-app_bin = $(basename $(APP_ELF)).bin
-app_map = $(basename $(APP_ELF)).map
-
-# Preprocess the linker script if it has an ".S" extension.
-ifeq "$(filter %.S,$(LD_FILE))" ""
-the_ld_file = $(LD_FILE)
-else
-rel_ld_file = $(basename $(subst $(SDK_ROOT)/,,$(abspath $(LD_FILE))))
-the_ld_file = $(addprefix $(OBJS_ROOT)/,$(rel_ld_file))
-the_ld_file_dir = $(dir $(the_ld_file))
-
-# Rule to preprocess the ld file. The ld file's parent directory is made an order-only
-# prerequisite so it cannot by itself cause this recipe to be invoked.
-$(the_ld_file): $(LD_FILE) | $(the_ld_file_dir)
-	@$(call printmessage,cpp,Preprocessing, $(subst $(SDK_ROOT)/,,$<))
-	$(at)cd $(dir $<) && $(CC) -E -P $(INCLUDES) $(DEFINES) -o $@ $<
-endif
-
-# Link the application.
-# Wrap the link objects in start/end group so that ld re-checks each
-# file for dependencies.  Otherwise linking static libs can be a pain
-# since order matters.
-$(APP_ELF): $(SUBDIRS) $(app_objs) $(the_ld_file) $(LIBRARIES) $(APP_LIBS)
-	@$(call printmessage,link,Linking, $(APP_NAME))
-	$(at)$(LD) -Bstatic -nostartfiles -nostdlib $(LDFLAGS) \
-	      -T $(the_ld_file) \
-	      $(LDINC) \
-	      --start-group \
-	      $(app_objs) \
-	      $(LIBRARIES) \
-	      $(APP_LIBS) \
-	      $(LDADD) \
-	      --end-group \
-	      -o $@ \
-	      -Map $(app_map) --cref
-	$(at)$(OBJCOPY) --gap-fill 0x00 -I elf32-little -O binary $@ $(app_bin)
-	@echo "Output ELF:" ; echo "  $(APP_ELF)"
-	@echo "Output binary:" ; echo "  $(app_bin)"
-
-else
-# Empty target to prevent an error. Needed because $(APP_ELF) is a prereq for the 'all' target.
-$(APP_ELF): ;
-endif
-
-# Include dependency files.
--include $(OBJECTS_ALL:.o=.d)
-
diff --git a/bsp/imxrt/imxrt1052-fire-pro/EventRecorderStub.scvd b/bsp/imxrt/imxrt1052-fire-pro/EventRecorderStub.scvd
deleted file mode 100644
index 2956b29683..0000000000
--- a/bsp/imxrt/imxrt1052-fire-pro/EventRecorderStub.scvd
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<component_viewer schemaVersion="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="Component_Viewer.xsd">
-
-<component name="EventRecorderStub" version="1.0.0"/>       <!--name and version of the component-->
-  <events>
-  </events>
-
-</component_viewer>
diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/Kconfig b/bsp/imxrt/imxrt1052-seeed-ArchMix/Kconfig
deleted file mode 100644
index c9221717cb..0000000000
--- a/bsp/imxrt/imxrt1052-seeed-ArchMix/Kconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-mainmenu "RT-Thread Configuration"
-
-config RTT_DIR
-    string
-    option env="RTT_ROOT"
-    default "../../.."
-
-config PKGS_DIR
-    string
-    option env="PKGS_ROOT"
-    default "packages"
-
-source "$RTT_DIR/Kconfig"
-source "$PKGS_DIR/Kconfig"
-source "../libraries/Kconfig"
-source "board/Kconfig"
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/Kconfig b/bsp/imxrt/imxrt1060-nxp-evk/Kconfig
deleted file mode 100644
index c9221717cb..0000000000
--- a/bsp/imxrt/imxrt1060-nxp-evk/Kconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-mainmenu "RT-Thread Configuration"
-
-config RTT_DIR
-    string
-    option env="RTT_ROOT"
-    default "../../.."
-
-config PKGS_DIR
-    string
-    option env="PKGS_ROOT"
-    default "packages"
-
-source "$RTT_DIR/Kconfig"
-source "$PKGS_DIR/Kconfig"
-source "../libraries/Kconfig"
-source "board/Kconfig"
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/Kconfig b/bsp/imxrt/imxrt1061-forlinx-OK1061-S/Kconfig
deleted file mode 100644
index c9221717cb..0000000000
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/Kconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-mainmenu "RT-Thread Configuration"
-
-config RTT_DIR
-    string
-    option env="RTT_ROOT"
-    default "../../.."
-
-config PKGS_DIR
-    string
-    option env="PKGS_ROOT"
-    default "packages"
-
-source "$RTT_DIR/Kconfig"
-source "$PKGS_DIR/Kconfig"
-source "../libraries/Kconfig"
-source "board/Kconfig"
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/Kconfig b/bsp/imxrt/imxrt1064-nxp-evk/Kconfig
deleted file mode 100644
index c9221717cb..0000000000
--- a/bsp/imxrt/imxrt1064-nxp-evk/Kconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-mainmenu "RT-Thread Configuration"
-
-config RTT_DIR
-    string
-    option env="RTT_ROOT"
-    default "../../.."
-
-config PKGS_DIR
-    string
-    option env="PKGS_ROOT"
-    default "packages"
-
-source "$RTT_DIR/Kconfig"
-source "$PKGS_DIR/Kconfig"
-source "../libraries/Kconfig"
-source "board/Kconfig"
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/Kconfig b/bsp/imxrt/libraries/templates/imxrt1050xxx/Kconfig
deleted file mode 100644
index c9221717cb..0000000000
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/Kconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-mainmenu "RT-Thread Configuration"
-
-config RTT_DIR
-    string
-    option env="RTT_ROOT"
-    default "../../.."
-
-config PKGS_DIR
-    string
-    option env="PKGS_ROOT"
-    default "packages"
-
-source "$RTT_DIR/Kconfig"
-source "$PKGS_DIR/Kconfig"
-source "../libraries/Kconfig"
-source "board/Kconfig"
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/Kconfig b/bsp/imxrt/libraries/templates/imxrt1064xxx/Kconfig
deleted file mode 100644
index c9221717cb..0000000000
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/Kconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-mainmenu "RT-Thread Configuration"
-
-config RTT_DIR
-    string
-    option env="RTT_ROOT"
-    default "../../.."
-
-config PKGS_DIR
-    string
-    option env="PKGS_ROOT"
-    default "packages"
-
-source "$RTT_DIR/Kconfig"
-source "$PKGS_DIR/Kconfig"
-source "../libraries/Kconfig"
-source "board/Kconfig"
diff --git a/bsp/imx6sx/README.md b/bsp/nxp/imx/imx6sx/README.md
index 3dc29e5c93..3dc29e5c93 100644
--- a/bsp/imx6sx/README.md
+++ b/bsp/nxp/imx/imx6sx/README.md
diff --git a/bsp/imx6sx/cortex-a9/.config b/bsp/nxp/imx/imx6sx/cortex-a9/.config
index 5097bf6a38..5097bf6a38 100644
--- a/bsp/imx6sx/cortex-a9/.config
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/.config
diff --git a/bsp/imx6sx/cortex-a9/Kconfig b/bsp/nxp/imx/imx6sx/cortex-a9/Kconfig
index e34af98ff9..01d30b0032 100644
--- a/bsp/imx6sx/cortex-a9/Kconfig
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/Kconfig
@@ -8,10 +8,7 @@ config BSP_DIR
 config RTT_DIR
     string
     option env="RTT_ROOT"
-    default "../../.."
-
-# you can change the RTT_ROOT default "../.." to your rtthread_root,
-# example: default "F:/git_repositories/rt-thread"
+    default "../../../../.."
 
 config PKGS_DIR
     string
diff --git a/bsp/imx6sx/cortex-a9/SConscript b/bsp/nxp/imx/imx6sx/cortex-a9/SConscript
index fe0ae941ae..fe0ae941ae 100644
--- a/bsp/imx6sx/cortex-a9/SConscript
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/SConscript
diff --git a/bsp/imx6sx/cortex-a9/SConstruct b/bsp/nxp/imx/imx6sx/cortex-a9/SConstruct
index 9694bc9eda..c799e51bc7 100644
--- a/bsp/imx6sx/cortex-a9/SConstruct
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/SConstruct
@@ -5,7 +5,7 @@ import rtconfig
 if os.getenv('RTT_ROOT'):
     RTT_ROOT = os.getenv('RTT_ROOT')
 else:
-    RTT_ROOT = os.path.join(os.getcwd(), '..', '..', '..')
+    RTT_ROOT = os.path.join(os.getcwd(), '..', '..', '..', '..', '..')
 
 sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')]
 from building import *
diff --git a/bsp/imx6sx/cortex-a9/applications/SConscript b/bsp/nxp/imx/imx6sx/cortex-a9/applications/SConscript
index 9bb9abae89..9bb9abae89 100644
--- a/bsp/imx6sx/cortex-a9/applications/SConscript
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/applications/SConscript
diff --git a/bsp/imx6sx/cortex-a9/applications/main.c b/bsp/nxp/imx/imx6sx/cortex-a9/applications/main.c
index 9b0847fc8f..9b0847fc8f 100644
--- a/bsp/imx6sx/cortex-a9/applications/main.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/applications/main.c
diff --git a/bsp/imx6sx/cortex-a9/board/SConscript b/bsp/nxp/imx/imx6sx/cortex-a9/board/SConscript
index 2074d467e9..2074d467e9 100644
--- a/bsp/imx6sx/cortex-a9/board/SConscript
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/SConscript
diff --git a/bsp/imx6sx/cortex-a9/board/audmux_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/audmux_iomux_config.c
index 1d9d1dad58..1d9d1dad58 100644
--- a/bsp/imx6sx/cortex-a9/board/audmux_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/audmux_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/ccm_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/ccm_iomux_config.c
index e934c67870..e934c67870 100644
--- a/bsp/imx6sx/cortex-a9/board/ccm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/ccm_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/dcic_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/dcic_iomux_config.c
index 8039037dd9..8039037dd9 100644
--- a/bsp/imx6sx/cortex-a9/board/dcic_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/dcic_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/ecspi1_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/ecspi1_iomux_config.c
index d994f08c1c..d994f08c1c 100644
--- a/bsp/imx6sx/cortex-a9/board/ecspi1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/ecspi1_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/ecspi_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/ecspi_iomux_config.c
index a4b466d88d..a4b466d88d 100644
--- a/bsp/imx6sx/cortex-a9/board/ecspi_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/ecspi_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/eim_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/eim_iomux_config.c
index 44a8605daf..44a8605daf 100644
--- a/bsp/imx6sx/cortex-a9/board/eim_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/eim_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/enet_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/enet_iomux_config.c
index 49ac153395..49ac153395 100644
--- a/bsp/imx6sx/cortex-a9/board/enet_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/enet_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/epit_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/epit_iomux_config.c
index 01dbe1e09c..01dbe1e09c 100644
--- a/bsp/imx6sx/cortex-a9/board/epit_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/epit_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/esai_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/esai_iomux_config.c
index 88a5ceefa0..88a5ceefa0 100644
--- a/bsp/imx6sx/cortex-a9/board/esai_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/esai_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/flexcan1_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/flexcan1_iomux_config.c
index 80536ef4ef..80536ef4ef 100644
--- a/bsp/imx6sx/cortex-a9/board/flexcan1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/flexcan1_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/flexcan2_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/flexcan2_iomux_config.c
index 28da8d2350..28da8d2350 100644
--- a/bsp/imx6sx/cortex-a9/board/flexcan2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/flexcan2_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/flexcan_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/flexcan_iomux_config.c
index 9c95ba7856..9c95ba7856 100644
--- a/bsp/imx6sx/cortex-a9/board/flexcan_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/flexcan_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/gpio1_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/gpio1_iomux_config.c
index 50ceac2087..50ceac2087 100644
--- a/bsp/imx6sx/cortex-a9/board/gpio1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/gpio1_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/gpio2_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/gpio2_iomux_config.c
index a3970c58a4..a3970c58a4 100644
--- a/bsp/imx6sx/cortex-a9/board/gpio2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/gpio2_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/gpio4_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/gpio4_iomux_config.c
index cdfcff9f11..cdfcff9f11 100644
--- a/bsp/imx6sx/cortex-a9/board/gpio4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/gpio4_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/gpio5_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/gpio5_iomux_config.c
index b7bddfe233..b7bddfe233 100644
--- a/bsp/imx6sx/cortex-a9/board/gpio5_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/gpio5_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/gpio6_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/gpio6_iomux_config.c
index 7ef99b2391..7ef99b2391 100644
--- a/bsp/imx6sx/cortex-a9/board/gpio6_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/gpio6_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/gpio_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/gpio_iomux_config.c
index b4eb910c61..b4eb910c61 100644
--- a/bsp/imx6sx/cortex-a9/board/gpio_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/gpio_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/gpmi_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/gpmi_iomux_config.c
index 38da88793f..38da88793f 100644
--- a/bsp/imx6sx/cortex-a9/board/gpmi_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/gpmi_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/i2c2_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/i2c2_iomux_config.c
index 2db0c274a3..2db0c274a3 100644
--- a/bsp/imx6sx/cortex-a9/board/i2c2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/i2c2_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/i2c3_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/i2c3_iomux_config.c
index 2c7d71292c..2c7d71292c 100644
--- a/bsp/imx6sx/cortex-a9/board/i2c3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/i2c3_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/i2c_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/i2c_iomux_config.c
index 5c3915ee56..5c3915ee56 100644
--- a/bsp/imx6sx/cortex-a9/board/i2c_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/i2c_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/iomux_config.c
index 967178be63..967178be63 100644
--- a/bsp/imx6sx/cortex-a9/board/iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/ipu1_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/ipu1_iomux_config.c
index 5166735784..5166735784 100644
--- a/bsp/imx6sx/cortex-a9/board/ipu1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/ipu1_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/ipu_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/ipu_iomux_config.c
index 16f23f17c9..16f23f17c9 100644
--- a/bsp/imx6sx/cortex-a9/board/ipu_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/ipu_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/mlb_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/mlb_iomux_config.c
index 3eaf51d186..3eaf51d186 100644
--- a/bsp/imx6sx/cortex-a9/board/mlb_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/mlb_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/mmdc_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/mmdc_iomux_config.c
index 03d251aedb..03d251aedb 100644
--- a/bsp/imx6sx/cortex-a9/board/mmdc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/mmdc_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/pwm3_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/pwm3_iomux_config.c
index 7a8eb678d2..7a8eb678d2 100644
--- a/bsp/imx6sx/cortex-a9/board/pwm3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/pwm3_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/pwm4_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/pwm4_iomux_config.c
index 4e6c29899d..4e6c29899d 100644
--- a/bsp/imx6sx/cortex-a9/board/pwm4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/pwm4_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/pwm_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/pwm_iomux_config.c
index cbfbaeebfb..cbfbaeebfb 100644
--- a/bsp/imx6sx/cortex-a9/board/pwm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/pwm_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/sjc_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/sjc_iomux_config.c
index 7df975efdb..7df975efdb 100644
--- a/bsp/imx6sx/cortex-a9/board/sjc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/sjc_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/spdif_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/spdif_iomux_config.c
index 991f561a8a..991f561a8a 100644
--- a/bsp/imx6sx/cortex-a9/board/spdif_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/spdif_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/uart2_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/uart2_iomux_config.c
index b07eecc904..b07eecc904 100644
--- a/bsp/imx6sx/cortex-a9/board/uart2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/uart2_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/uart3_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/uart3_iomux_config.c
index 69f242c23b..69f242c23b 100644
--- a/bsp/imx6sx/cortex-a9/board/uart3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/uart3_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/uart4_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/uart4_iomux_config.c
index 3ca3b1b5f1..3ca3b1b5f1 100644
--- a/bsp/imx6sx/cortex-a9/board/uart4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/uart4_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/uart_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/uart_iomux_config.c
index f438e1415f..f438e1415f 100644
--- a/bsp/imx6sx/cortex-a9/board/uart_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/uart_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/usdhc1_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/usdhc1_iomux_config.c
index 4b743c268e..4b743c268e 100644
--- a/bsp/imx6sx/cortex-a9/board/usdhc1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/usdhc1_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/usdhc3_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/usdhc3_iomux_config.c
index 5ce9a6db92..5ce9a6db92 100644
--- a/bsp/imx6sx/cortex-a9/board/usdhc3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/usdhc3_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/usdhc_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/usdhc_iomux_config.c
index 9c14062475..9c14062475 100644
--- a/bsp/imx6sx/cortex-a9/board/usdhc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/usdhc_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/wdog1_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/wdog1_iomux_config.c
index f19cb8163a..f19cb8163a 100644
--- a/bsp/imx6sx/cortex-a9/board/wdog1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/wdog1_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/board/wdog_iomux_config.c b/bsp/nxp/imx/imx6sx/cortex-a9/board/wdog_iomux_config.c
index d1faa6536a..d1faa6536a 100644
--- a/bsp/imx6sx/cortex-a9/board/wdog_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/board/wdog_iomux_config.c
diff --git a/bsp/imx6sx/cortex-a9/cpu/SConscript b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/SConscript
index 6594fa8c8f..6594fa8c8f 100644
--- a/bsp/imx6sx/cortex-a9/cpu/SConscript
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/SConscript
diff --git a/bsp/imx6sx/cortex-a9/cpu/armv7.h b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/armv7.h
index 69c556eb3c..69c556eb3c 100644
--- a/bsp/imx6sx/cortex-a9/cpu/armv7.h
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/armv7.h
diff --git a/bsp/imx6sx/cortex-a9/cpu/context_gcc.S b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/context_gcc.S
index 97b3dbc447..97b3dbc447 100644
--- a/bsp/imx6sx/cortex-a9/cpu/context_gcc.S
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/context_gcc.S
diff --git a/bsp/imx6sx/cortex-a9/cpu/cortexA9_gcc.S b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/cortexA9_gcc.S
index ce34242fc9..ce34242fc9 100755..100644
--- a/bsp/imx6sx/cortex-a9/cpu/cortexA9_gcc.S
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/cortexA9_gcc.S
diff --git a/bsp/imx6sx/cortex-a9/cpu/cp15.h b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/cp15.h
index ebea3f0fe3..ebea3f0fe3 100644
--- a/bsp/imx6sx/cortex-a9/cpu/cp15.h
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/cp15.h
diff --git a/bsp/imx6sx/cortex-a9/cpu/cp15_gcc.S b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/cp15_gcc.S
index 0e3e60655c..0e3e60655c 100644
--- a/bsp/imx6sx/cortex-a9/cpu/cp15_gcc.S
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/cp15_gcc.S
diff --git a/bsp/imx6sx/cortex-a9/cpu/cpu.c b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/cpu.c
index ec44c1493b..ec44c1493b 100644
--- a/bsp/imx6sx/cortex-a9/cpu/cpu.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/cpu.c
diff --git a/bsp/imx6sx/cortex-a9/cpu/interrupt.c b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/interrupt.c
index fb6e3ff3e0..fb6e3ff3e0 100644
--- a/bsp/imx6sx/cortex-a9/cpu/interrupt.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/interrupt.c
diff --git a/bsp/imx6sx/cortex-a9/cpu/mmu.c b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/mmu.c
index 58acdd8145..58acdd8145 100644
--- a/bsp/imx6sx/cortex-a9/cpu/mmu.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/mmu.c
diff --git a/bsp/imx6sx/cortex-a9/cpu/pmu.c b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/pmu.c
index 8ffc1dede6..8ffc1dede6 100644
--- a/bsp/imx6sx/cortex-a9/cpu/pmu.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/pmu.c
diff --git a/bsp/imx6sx/cortex-a9/cpu/pmu.h b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/pmu.h
index 05c1420dd8..05c1420dd8 100644
--- a/bsp/imx6sx/cortex-a9/cpu/pmu.h
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/pmu.h
diff --git a/bsp/imx6sx/cortex-a9/cpu/stack.c b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/stack.c
index 2bd3c36915..2bd3c36915 100644
--- a/bsp/imx6sx/cortex-a9/cpu/stack.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/stack.c
diff --git a/bsp/imx6sx/cortex-a9/cpu/start_gcc.S b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/start_gcc.S
index 3ff5a755d5..3ff5a755d5 100644
--- a/bsp/imx6sx/cortex-a9/cpu/start_gcc.S
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/start_gcc.S
diff --git a/bsp/imx6sx/cortex-a9/cpu/trap.c b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/trap.c
index 4625d1accf..4625d1accf 100644
--- a/bsp/imx6sx/cortex-a9/cpu/trap.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/trap.c
diff --git a/bsp/imx6sx/cortex-a9/cpu/vector_gcc.S b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/vector_gcc.S
index 60d3c6cf1d..60d3c6cf1d 100644
--- a/bsp/imx6sx/cortex-a9/cpu/vector_gcc.S
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/cpu/vector_gcc.S
diff --git a/bsp/imx6sx/cortex-a9/drivers/SConscript b/bsp/nxp/imx/imx6sx/cortex-a9/drivers/SConscript
index 2074d467e9..2074d467e9 100644
--- a/bsp/imx6sx/cortex-a9/drivers/SConscript
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/drivers/SConscript
diff --git a/bsp/imx6sx/cortex-a9/drivers/board.c b/bsp/nxp/imx/imx6sx/cortex-a9/drivers/board.c
index 7ff9d47a89..7ff9d47a89 100644
--- a/bsp/imx6sx/cortex-a9/drivers/board.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/drivers/board.c
diff --git a/bsp/imx6sx/cortex-a9/drivers/board.h b/bsp/nxp/imx/imx6sx/cortex-a9/drivers/board.h
index 9ae9ae60c7..9ae9ae60c7 100644
--- a/bsp/imx6sx/cortex-a9/drivers/board.h
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/drivers/board.h
diff --git a/bsp/imx6sx/cortex-a9/drivers/emac_drv.c b/bsp/nxp/imx/imx6sx/cortex-a9/drivers/emac_drv.c
index 80d2a95618..80d2a95618 100644
--- a/bsp/imx6sx/cortex-a9/drivers/emac_drv.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/drivers/emac_drv.c
diff --git a/bsp/imx6sx/cortex-a9/drivers/emac_drv.h b/bsp/nxp/imx/imx6sx/cortex-a9/drivers/emac_drv.h
index 455fa496e7..455fa496e7 100644
--- a/bsp/imx6sx/cortex-a9/drivers/emac_drv.h
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/drivers/emac_drv.h
diff --git a/bsp/imx6sx/cortex-a9/drivers/serial.c b/bsp/nxp/imx/imx6sx/cortex-a9/drivers/serial.c
index 5a9e8121e1..5a9e8121e1 100644
--- a/bsp/imx6sx/cortex-a9/drivers/serial.c
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/drivers/serial.c
diff --git a/bsp/imx6sx/cortex-a9/drivers/serial.h b/bsp/nxp/imx/imx6sx/cortex-a9/drivers/serial.h
index 862ba65ef7..862ba65ef7 100644
--- a/bsp/imx6sx/cortex-a9/drivers/serial.h
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/drivers/serial.h
diff --git a/bsp/imx6sx/cortex-a9/imx6.lds b/bsp/nxp/imx/imx6sx/cortex-a9/imx6.lds
index a889774f85..a889774f85 100644
--- a/bsp/imx6sx/cortex-a9/imx6.lds
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/imx6.lds
diff --git a/bsp/imx6sx/cortex-a9/rtconfig.h b/bsp/nxp/imx/imx6sx/cortex-a9/rtconfig.h
index ece320fa54..ece320fa54 100644
--- a/bsp/imx6sx/cortex-a9/rtconfig.h
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/rtconfig.h
diff --git a/bsp/imx6sx/cortex-a9/rtconfig.py b/bsp/nxp/imx/imx6sx/cortex-a9/rtconfig.py
index 349852950f..349852950f 100644
--- a/bsp/imx6sx/cortex-a9/rtconfig.py
+++ b/bsp/nxp/imx/imx6sx/cortex-a9/rtconfig.py
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/Doxyfile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/Doxyfile
index 83cf05a672..83cf05a672 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/Doxyfile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/Doxyfile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/LICENSE.txt b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/LICENSE.txt
index 82415f2af3..82415f2af3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/LICENSE.txt
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/LICENSE.txt
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/Makefile
index 1211983d14..1211983d14 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/README.pdf b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/README.pdf
index 377be3776b..377be3776b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/README.pdf
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/README.pdf
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/SConscript b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/SConscript
index ba5935c6e2..ba5935c6e2 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/SConscript
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/SConscript
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/apps/common/basic_sdk_app.ld.S b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/apps/common/basic_sdk_app.ld.S
index 6876425076..6876425076 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/apps/common/basic_sdk_app.ld.S
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/apps/common/basic_sdk_app.ld.S
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/apps/common/ivt.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/apps/common/ivt.c
index c380446064..c380446064 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/apps/common/ivt.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/apps/common/ivt.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/apps/common/platform_init.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/apps/common/platform_init.c
index 50d2cef59a..50d2cef59a 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/apps/common/platform_init.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/apps/common/platform_init.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/apps/common/platform_init.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/apps/common/platform_init.h
index 0cd9239f3c..0cd9239f3c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/apps/common/platform_init.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/apps/common/platform_init.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/apps/common/print_clock_info.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/apps/common/print_clock_info.c
index 1d1a7998ef..1d1a7998ef 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/apps/common/print_clock_info.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/apps/common/print_clock_info.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/apps/common/print_clock_info.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/apps/common/print_clock_info.h
index 7b398216db..7b398216db 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/apps/common/print_clock_info.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/apps/common/print_clock_info.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/apps/common/print_version.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/apps/common/print_version.c
index a9d19a022f..a9d19a022f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/apps/common/print_version.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/apps/common/print_version.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/apps/common/print_version.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/apps/common/print_version.h
index bb08611b35..bb08611b35 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/apps/common/print_version.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/apps/common/print_version.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_audio.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_audio.c
index 9b16bb68b5..9b16bb68b5 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_audio.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_audio.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_buttons.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_buttons.c
index b9b2ccddf7..b9b2ccddf7 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_buttons.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_buttons.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_camera.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_camera.c
index d5b25bdf78..d5b25bdf78 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_camera.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_camera.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_can.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_can.c
index 8618881554..8618881554 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_can.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_can.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_display.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_display.c
index 4b9f8fa62b..4b9f8fa62b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_display.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_display.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_hdmi.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_hdmi.c
index 296d7db352..296d7db352 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_hdmi.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_hdmi.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_i2c.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_i2c.c
index f30f80dee4..f30f80dee4 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_i2c.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_i2c.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_i2c.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_i2c.h
index df277070ef..df277070ef 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_i2c.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_i2c.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_io_expanders.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_io_expanders.c
index ebca48f2c5..ebca48f2c5 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_io_expanders.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_io_expanders.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_io_expanders.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_io_expanders.h
index 419a717d48..419a717d48 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_io_expanders.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_io_expanders.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_mipi.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_mipi.c
index 9453803ccb..9453803ccb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_mipi.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_mipi.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_nand.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_nand.c
index 89cbf1f059..89cbf1f059 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_nand.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_nand.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_network.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_network.c
index f6133862ec..f6133862ec 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_network.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_network.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_pcie.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_pcie.c
index 7c7cf98ae3..7c7cf98ae3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_pcie.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_pcie.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_sata.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_sata.c
index 9bf4de2f28..9bf4de2f28 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_sata.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_sata.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_usb.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_usb.c
index c3c07178ed..c3c07178ed 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_usb.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_usb.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_usdhc.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_usdhc.c
index f698369a38..f698369a38 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/common/board_usdhc.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/board_usdhc.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/common/buffers.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/buffers.h
index b3baa34309..b3baa34309 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/common/buffers.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/buffers.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/common/hardware_modules.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/hardware_modules.c
index a2cfd3e14f..a2cfd3e14f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/common/hardware_modules.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/hardware_modules.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/common/readme.txt b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/readme.txt
index 790cc052d3..790cc052d3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/common/readme.txt
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/common/readme.txt
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/Makefile
index f5a72043fd..f5a72043fd 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/dcd.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/dcd.c
index ccab2bcf5f..ccab2bcf5f 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/dcd.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/dcd.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/i.MX6DQ_EVB_X3.IoMuxDesign.xml b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/i.MX6DQ_EVB_X3.IoMuxDesign.xml
index 0346134437..0346134437 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/i.MX6DQ_EVB_X3.IoMuxDesign.xml
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/i.MX6DQ_EVB_X3.IoMuxDesign.xml
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/ccm_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/ccm_iomux_config.c
index 4f289e4372..4f289e4372 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/ccm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/ccm_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/dcic_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/dcic_iomux_config.c
index 8039037dd9..8039037dd9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/dcic_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/dcic_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/ecspi1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/ecspi1_iomux_config.c
index 4b35a28afe..4b35a28afe 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/ecspi1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/ecspi1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/ecspi_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/ecspi_iomux_config.c
index 95fd9095e7..95fd9095e7 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/ecspi_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/ecspi_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/enet_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/enet_iomux_config.c
index 45a487440c..45a487440c 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/enet_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/enet_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/epit_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/epit_iomux_config.c
index 01dbe1e09c..01dbe1e09c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/epit_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/epit_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/esai_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/esai_iomux_config.c
index 8c874ae7e2..8c874ae7e2 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/esai_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/esai_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/flexcan1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/flexcan1_iomux_config.c
index ba0046ecb1..ba0046ecb1 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/flexcan1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/flexcan1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/flexcan2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/flexcan2_iomux_config.c
index 23d6a0f72e..23d6a0f72e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/flexcan2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/flexcan2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/flexcan_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/flexcan_iomux_config.c
index 9c95ba7856..9c95ba7856 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/flexcan_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/flexcan_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/gpio3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/gpio3_iomux_config.c
index dd6d61bca8..dd6d61bca8 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/gpio3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/gpio3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/gpio4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/gpio4_iomux_config.c
index d4a572183b..d4a572183b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/gpio4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/gpio4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/gpio5_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/gpio5_iomux_config.c
index b19542f586..b19542f586 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/gpio5_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/gpio5_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/gpio6_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/gpio6_iomux_config.c
index 27e9948acf..27e9948acf 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/gpio6_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/gpio6_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/gpio_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/gpio_iomux_config.c
index b4eb910c61..b4eb910c61 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/gpio_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/gpio_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/gpmi_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/gpmi_iomux_config.c
index 563aeda858..563aeda858 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/gpmi_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/gpmi_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/hdmi_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/hdmi_iomux_config.c
index 27bed0147e..27bed0147e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/hdmi_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/hdmi_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/i2c1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/i2c1_iomux_config.c
index e464f45883..e464f45883 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/i2c1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/i2c1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/i2c2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/i2c2_iomux_config.c
index 7895b59349..7895b59349 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/i2c2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/i2c2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/i2c3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/i2c3_iomux_config.c
index 9039cd4a61..9039cd4a61 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/i2c3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/i2c3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/i2c_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/i2c_iomux_config.c
index 16305b5153..16305b5153 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/i2c_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/i2c_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/iomux_config.c
index ac51994a56..ac51994a56 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/ipu1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/ipu1_iomux_config.c
index c75bfa664a..c75bfa664a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/ipu1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/ipu1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/ipu_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/ipu_iomux_config.c
index cfac533eef..cfac533eef 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/ipu_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/ipu_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/kpp_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/kpp_iomux_config.c
index c22bf7ce79..c22bf7ce79 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/kpp_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/kpp_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/mlb_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/mlb_iomux_config.c
index 9e25ce238e..9e25ce238e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/mlb_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/mlb_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/mmdc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/mmdc_iomux_config.c
index da11b6b1f0..da11b6b1f0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/mmdc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/mmdc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/pwm1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/pwm1_iomux_config.c
index 958c5e245f..958c5e245f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/pwm1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/pwm1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/pwm_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/pwm_iomux_config.c
index cbfbaeebfb..cbfbaeebfb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/pwm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/pwm_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/sjc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/sjc_iomux_config.c
index ac1899fd9d..ac1899fd9d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/sjc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/sjc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/spdif_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/spdif_iomux_config.c
index 975a2c27db..975a2c27db 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/spdif_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/spdif_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/uart2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/uart2_iomux_config.c
index 7f2b9f9589..7f2b9f9589 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/uart2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/uart2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/uart4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/uart4_iomux_config.c
index 5a69223838..5a69223838 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/uart4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/uart4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/uart_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/uart_iomux_config.c
index f438e1415f..f438e1415f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/uart_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/uart_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/usb_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/usb_iomux_config.c
index 31cc3722d2..31cc3722d2 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/usb_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/usb_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/usdhc1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/usdhc1_iomux_config.c
index b8a48d73fb..b8a48d73fb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/usdhc1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/usdhc1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/usdhc2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/usdhc2_iomux_config.c
index f0633ed629..f0633ed629 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/usdhc2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/usdhc2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/usdhc3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/usdhc3_iomux_config.c
index 0fa5f5b6e4..0fa5f5b6e4 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/usdhc3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/usdhc3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/usdhc4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/usdhc4_iomux_config.c
index a8dea18445..a8dea18445 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/usdhc4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/usdhc4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/usdhc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/usdhc_iomux_config.c
index 9c14062475..9c14062475 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/usdhc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/usdhc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/wdog_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/wdog_iomux_config.c
index d1faa6536a..d1faa6536a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/wdog_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux/wdog_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux_config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux_config.h
index 6252daff23..6252daff23 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux_config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/evb/iomux_config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/Makefile
index ba1cc9de15..ba1cc9de15 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/dcd.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/dcd.c
index e30324af25..e30324af25 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/dcd.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/dcd.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/i.MX6DQ_Sabre_AI_RevA.IomuxDesign.xml b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/i.MX6DQ_Sabre_AI_RevA.IomuxDesign.xml
index 1c2d5e1d50..1c2d5e1d50 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/i.MX6DQ_Sabre_AI_RevA.IomuxDesign.xml
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/i.MX6DQ_Sabre_AI_RevA.IomuxDesign.xml
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/i.MX6DQ_Sabre_AI_RevB.IomuxDesign.xml b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/i.MX6DQ_Sabre_AI_RevB.IomuxDesign.xml
index 797caa537a..797caa537a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/i.MX6DQ_Sabre_AI_RevB.IomuxDesign.xml
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/i.MX6DQ_Sabre_AI_RevB.IomuxDesign.xml
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/iomux_config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/iomux_config.h
index 6252daff23..6252daff23 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/iomux_config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/iomux_config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/audmux_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/audmux_iomux_config.c
index ac2a15ac20..ac2a15ac20 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/audmux_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/audmux_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/ccm_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/ccm_iomux_config.c
index 4f289e4372..4f289e4372 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/ccm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/ccm_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/dcic_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/dcic_iomux_config.c
index 8039037dd9..8039037dd9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/dcic_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/dcic_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/ecspi1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/ecspi1_iomux_config.c
index d4dec12e2b..d4dec12e2b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/ecspi1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/ecspi1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/ecspi_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/ecspi_iomux_config.c
index 95fd9095e7..95fd9095e7 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/ecspi_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/ecspi_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/eim_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/eim_iomux_config.c
index 090cb8216e..090cb8216e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/eim_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/eim_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/enet_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/enet_iomux_config.c
index 45a487440c..45a487440c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/enet_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/enet_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/epit_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/epit_iomux_config.c
index 01dbe1e09c..01dbe1e09c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/epit_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/epit_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/esai_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/esai_iomux_config.c
index 3a29c0143e..3a29c0143e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/esai_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/esai_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/flexcan1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/flexcan1_iomux_config.c
index f742229507..f742229507 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/flexcan1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/flexcan1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/flexcan2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/flexcan2_iomux_config.c
index 23d6a0f72e..23d6a0f72e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/flexcan2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/flexcan2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/flexcan_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/flexcan_iomux_config.c
index 9c95ba7856..9c95ba7856 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/flexcan_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/flexcan_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/gpio1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/gpio1_iomux_config.c
index c2aee5a00a..c2aee5a00a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/gpio1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/gpio1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/gpio2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/gpio2_iomux_config.c
index b42b11097d..b42b11097d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/gpio2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/gpio2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/gpio4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/gpio4_iomux_config.c
index e0302d9439..e0302d9439 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/gpio4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/gpio4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/gpio5_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/gpio5_iomux_config.c
index 781a7e192d..781a7e192d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/gpio5_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/gpio5_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/gpio6_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/gpio6_iomux_config.c
index f1f1002f01..f1f1002f01 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/gpio6_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/gpio6_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/gpio_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/gpio_iomux_config.c
index b4eb910c61..b4eb910c61 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/gpio_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/gpio_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/gpmi_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/gpmi_iomux_config.c
index 9b80feac53..9b80feac53 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/gpmi_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/gpmi_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/i2c2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/i2c2_iomux_config.c
index dafe407cbe..dafe407cbe 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/i2c2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/i2c2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/i2c3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/i2c3_iomux_config.c
index 5fafb031a0..5fafb031a0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/i2c3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/i2c3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/i2c_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/i2c_iomux_config.c
index 16305b5153..16305b5153 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/i2c_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/i2c_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/iomux_config.c
index 51de21118e..51de21118e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/ipu1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/ipu1_iomux_config.c
index 33c6dd4b0f..33c6dd4b0f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/ipu1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/ipu1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/ipu_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/ipu_iomux_config.c
index cfac533eef..cfac533eef 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/ipu_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/ipu_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/mlb_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/mlb_iomux_config.c
index 051ed5a69f..051ed5a69f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/mlb_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/mlb_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/mmdc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/mmdc_iomux_config.c
index da11b6b1f0..da11b6b1f0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/mmdc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/mmdc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/pwm3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/pwm3_iomux_config.c
index a684e20a09..a684e20a09 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/pwm3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/pwm3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/pwm4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/pwm4_iomux_config.c
index 044f9769cb..044f9769cb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/pwm4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/pwm4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/pwm_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/pwm_iomux_config.c
index cbfbaeebfb..cbfbaeebfb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/pwm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/pwm_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/sjc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/sjc_iomux_config.c
index ac1899fd9d..ac1899fd9d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/sjc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/sjc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/spdif_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/spdif_iomux_config.c
index 459b17fc06..459b17fc06 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/spdif_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/spdif_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/uart2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/uart2_iomux_config.c
index e6d7fe82da..e6d7fe82da 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/uart2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/uart2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/uart3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/uart3_iomux_config.c
index c8081ae483..c8081ae483 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/uart3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/uart3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/uart4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/uart4_iomux_config.c
index 5a69223838..5a69223838 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/uart4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/uart4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/uart_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/uart_iomux_config.c
index f438e1415f..f438e1415f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/uart_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/uart_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/usdhc1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/usdhc1_iomux_config.c
index 221d5dd689..221d5dd689 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/usdhc1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/usdhc1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/usdhc3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/usdhc3_iomux_config.c
index 0fa5f5b6e4..0fa5f5b6e4 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/usdhc3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/usdhc3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/usdhc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/usdhc_iomux_config.c
index 9c14062475..9c14062475 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/usdhc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/usdhc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/wdog1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/wdog1_iomux_config.c
index fe50c2f209..fe50c2f209 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/wdog1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/wdog1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/wdog_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/wdog_iomux_config.c
index d1faa6536a..d1faa6536a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/wdog_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_a_iomux/wdog_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/audmux_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/audmux_iomux_config.c
index ac2a15ac20..ac2a15ac20 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/audmux_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/audmux_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/ccm_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/ccm_iomux_config.c
index 4f289e4372..4f289e4372 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/ccm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/ccm_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/dcic_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/dcic_iomux_config.c
index 8039037dd9..8039037dd9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/dcic_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/dcic_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/ecspi1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/ecspi1_iomux_config.c
index d4dec12e2b..d4dec12e2b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/ecspi1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/ecspi1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/ecspi_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/ecspi_iomux_config.c
index 95fd9095e7..95fd9095e7 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/ecspi_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/ecspi_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/eim_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/eim_iomux_config.c
index c7a16b84e6..c7a16b84e6 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/eim_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/eim_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/enet_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/enet_iomux_config.c
index c7ff4a017b..c7ff4a017b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/enet_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/enet_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/epit_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/epit_iomux_config.c
index 01dbe1e09c..01dbe1e09c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/epit_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/epit_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/esai_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/esai_iomux_config.c
index 3a29c0143e..3a29c0143e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/esai_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/esai_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/flexcan1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/flexcan1_iomux_config.c
index f742229507..f742229507 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/flexcan1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/flexcan1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/flexcan2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/flexcan2_iomux_config.c
index 23d6a0f72e..23d6a0f72e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/flexcan2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/flexcan2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/flexcan_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/flexcan_iomux_config.c
index 9c95ba7856..9c95ba7856 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/flexcan_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/flexcan_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/gpio1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/gpio1_iomux_config.c
index adf19942fc..adf19942fc 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/gpio1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/gpio1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/gpio2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/gpio2_iomux_config.c
index 7d1c4e15ff..7d1c4e15ff 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/gpio2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/gpio2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/gpio4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/gpio4_iomux_config.c
index 9d4405202d..9d4405202d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/gpio4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/gpio4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/gpio5_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/gpio5_iomux_config.c
index 781a7e192d..781a7e192d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/gpio5_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/gpio5_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/gpio6_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/gpio6_iomux_config.c
index a281cf146c..a281cf146c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/gpio6_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/gpio6_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/gpio_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/gpio_iomux_config.c
index b4eb910c61..b4eb910c61 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/gpio_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/gpio_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/gpmi_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/gpmi_iomux_config.c
index 9b80feac53..9b80feac53 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/gpmi_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/gpmi_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/i2c2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/i2c2_iomux_config.c
index c4483bc88f..c4483bc88f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/i2c2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/i2c2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/i2c3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/i2c3_iomux_config.c
index 9bffe7a93a..9bffe7a93a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/i2c3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/i2c3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/i2c_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/i2c_iomux_config.c
index 16305b5153..16305b5153 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/i2c_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/i2c_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/iomux_config.c
index 0bcff3b9a4..0bcff3b9a4 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/ipu1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/ipu1_iomux_config.c
index 33c6dd4b0f..33c6dd4b0f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/ipu1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/ipu1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/ipu_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/ipu_iomux_config.c
index cfac533eef..cfac533eef 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/ipu_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/ipu_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/mlb_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/mlb_iomux_config.c
index 051ed5a69f..051ed5a69f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/mlb_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/mlb_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/mmdc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/mmdc_iomux_config.c
index da11b6b1f0..da11b6b1f0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/mmdc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/mmdc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/pwm3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/pwm3_iomux_config.c
index a684e20a09..a684e20a09 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/pwm3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/pwm3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/pwm4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/pwm4_iomux_config.c
index 044f9769cb..044f9769cb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/pwm4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/pwm4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/pwm_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/pwm_iomux_config.c
index cbfbaeebfb..cbfbaeebfb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/pwm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/pwm_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/sjc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/sjc_iomux_config.c
index ac1899fd9d..ac1899fd9d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/sjc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/sjc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/spdif_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/spdif_iomux_config.c
index 459b17fc06..459b17fc06 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/spdif_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/spdif_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/uart2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/uart2_iomux_config.c
index e81bd83adb..e81bd83adb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/uart2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/uart2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/uart3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/uart3_iomux_config.c
index c8081ae483..c8081ae483 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/uart3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/uart3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/uart4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/uart4_iomux_config.c
index 5a69223838..5a69223838 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/uart4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/uart4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/uart_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/uart_iomux_config.c
index f438e1415f..f438e1415f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/uart_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/uart_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/usdhc1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/usdhc1_iomux_config.c
index 221d5dd689..221d5dd689 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/usdhc1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/usdhc1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/usdhc3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/usdhc3_iomux_config.c
index 0fa5f5b6e4..0fa5f5b6e4 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/usdhc3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/usdhc3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/usdhc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/usdhc_iomux_config.c
index 9c14062475..9c14062475 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/usdhc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/usdhc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/wdog1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/wdog1_iomux_config.c
index d163eb302b..d163eb302b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/wdog1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/wdog1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/wdog_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/wdog_iomux_config.c
index d1faa6536a..d1faa6536a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/wdog_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_b_iomux/wdog_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/audmux_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/audmux_iomux_config.c
index ac2a15ac20..ac2a15ac20 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/audmux_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/audmux_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/ccm_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/ccm_iomux_config.c
index 4f289e4372..4f289e4372 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/ccm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/ccm_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/dcic_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/dcic_iomux_config.c
index 8039037dd9..8039037dd9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/dcic_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/dcic_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/ecspi1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/ecspi1_iomux_config.c
index d4dec12e2b..d4dec12e2b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/ecspi1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/ecspi1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/ecspi_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/ecspi_iomux_config.c
index 95fd9095e7..95fd9095e7 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/ecspi_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/ecspi_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/eim_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/eim_iomux_config.c
index c7a16b84e6..c7a16b84e6 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/eim_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/eim_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/enet_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/enet_iomux_config.c
index c7ff4a017b..c7ff4a017b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/enet_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/enet_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/epit_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/epit_iomux_config.c
index 01dbe1e09c..01dbe1e09c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/epit_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/epit_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/esai_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/esai_iomux_config.c
index 3a29c0143e..3a29c0143e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/esai_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/esai_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/flexcan1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/flexcan1_iomux_config.c
index f742229507..f742229507 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/flexcan1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/flexcan1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/flexcan2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/flexcan2_iomux_config.c
index 23d6a0f72e..23d6a0f72e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/flexcan2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/flexcan2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/flexcan_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/flexcan_iomux_config.c
index 9c95ba7856..9c95ba7856 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/flexcan_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/flexcan_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/gpio1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/gpio1_iomux_config.c
index adf19942fc..adf19942fc 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/gpio1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/gpio1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/gpio2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/gpio2_iomux_config.c
index 7d1c4e15ff..7d1c4e15ff 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/gpio2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/gpio2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/gpio4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/gpio4_iomux_config.c
index 9d4405202d..9d4405202d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/gpio4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/gpio4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/gpio5_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/gpio5_iomux_config.c
index 781a7e192d..781a7e192d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/gpio5_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/gpio5_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/gpio6_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/gpio6_iomux_config.c
index a281cf146c..a281cf146c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/gpio6_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/gpio6_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/gpio_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/gpio_iomux_config.c
index b4eb910c61..b4eb910c61 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/gpio_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/gpio_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/gpmi_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/gpmi_iomux_config.c
index 9b80feac53..9b80feac53 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/gpmi_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/gpmi_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/i2c2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/i2c2_iomux_config.c
index c4483bc88f..c4483bc88f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/i2c2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/i2c2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/i2c3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/i2c3_iomux_config.c
index 9bffe7a93a..9bffe7a93a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/i2c3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/i2c3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/i2c_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/i2c_iomux_config.c
index 16305b5153..16305b5153 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/i2c_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/i2c_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/iomux_config.c
index 0bcff3b9a4..0bcff3b9a4 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/ipu1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/ipu1_iomux_config.c
index 33c6dd4b0f..33c6dd4b0f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/ipu1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/ipu1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/ipu_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/ipu_iomux_config.c
index cfac533eef..cfac533eef 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/ipu_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/ipu_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/mlb_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/mlb_iomux_config.c
index 051ed5a69f..051ed5a69f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/mlb_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/mlb_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/mmdc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/mmdc_iomux_config.c
index da11b6b1f0..da11b6b1f0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/mmdc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/mmdc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/pwm3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/pwm3_iomux_config.c
index a684e20a09..a684e20a09 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/pwm3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/pwm3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/pwm4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/pwm4_iomux_config.c
index 044f9769cb..044f9769cb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/pwm4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/pwm4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/pwm_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/pwm_iomux_config.c
index cbfbaeebfb..cbfbaeebfb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/pwm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/pwm_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/sjc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/sjc_iomux_config.c
index ac1899fd9d..ac1899fd9d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/sjc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/sjc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/spdif_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/spdif_iomux_config.c
index 459b17fc06..459b17fc06 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/spdif_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/spdif_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/uart2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/uart2_iomux_config.c
index e81bd83adb..e81bd83adb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/uart2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/uart2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/uart3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/uart3_iomux_config.c
index c8081ae483..c8081ae483 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/uart3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/uart3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/uart4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/uart4_iomux_config.c
index 5a69223838..5a69223838 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/uart4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/uart4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/uart_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/uart_iomux_config.c
index f438e1415f..f438e1415f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/uart_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/uart_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/usdhc1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/usdhc1_iomux_config.c
index 221d5dd689..221d5dd689 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/usdhc1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/usdhc1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/usdhc3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/usdhc3_iomux_config.c
index 0fa5f5b6e4..0fa5f5b6e4 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/usdhc3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/usdhc3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/usdhc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/usdhc_iomux_config.c
index 9c14062475..9c14062475 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/usdhc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/usdhc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/wdog1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/wdog1_iomux_config.c
index d163eb302b..d163eb302b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/wdog1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/wdog1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/wdog_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/wdog_iomux_config.c
index d1faa6536a..d1faa6536a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/wdog_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/sabre_ai/rev_c_iomux/wdog_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/Makefile
index ba1cc9de15..ba1cc9de15 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/dcd.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/dcd.c
index af98a84bb2..af98a84bb2 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/dcd.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/dcd.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/i.MX6DQ_Smart_Device.RevA.IoMuxDesign.xml b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/i.MX6DQ_Smart_Device.RevA.IoMuxDesign.xml
index 1b10ba384b..1b10ba384b 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/i.MX6DQ_Smart_Device.RevA.IoMuxDesign.xml
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/i.MX6DQ_Smart_Device.RevA.IoMuxDesign.xml
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/i.MX6DQ_Smart_Device.RevB.IoMuxDesign.xml b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/i.MX6DQ_Smart_Device.RevB.IoMuxDesign.xml
index 80c7789c57..80c7789c57 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/i.MX6DQ_Smart_Device.RevB.IoMuxDesign.xml
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/i.MX6DQ_Smart_Device.RevB.IoMuxDesign.xml
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/iomux_config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/iomux_config.h
index 6f9016936d..6f9016936d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/iomux_config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/iomux_config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/audmux_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/audmux_iomux_config.c
index b18689214a..b18689214a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/audmux_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/audmux_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/ccm_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/ccm_iomux_config.c
index 4f289e4372..4f289e4372 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/ccm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/ccm_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/dcic_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/dcic_iomux_config.c
index 8039037dd9..8039037dd9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/dcic_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/dcic_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/ecspi1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/ecspi1_iomux_config.c
index 2f5a76611b..2f5a76611b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/ecspi1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/ecspi1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/ecspi_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/ecspi_iomux_config.c
index 95fd9095e7..95fd9095e7 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/ecspi_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/ecspi_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/enet_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/enet_iomux_config.c
index 77c7299cd9..77c7299cd9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/enet_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/enet_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/epit_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/epit_iomux_config.c
index 01dbe1e09c..01dbe1e09c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/epit_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/epit_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/flexcan1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/flexcan1_iomux_config.c
index 9a9b588fc2..9a9b588fc2 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/flexcan1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/flexcan1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/flexcan_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/flexcan_iomux_config.c
index 9c95ba7856..9c95ba7856 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/flexcan_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/flexcan_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio1_iomux_config.c
index 85149447b8..85149447b8 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio2_iomux_config.c
index a26b0d7b00..a26b0d7b00 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio3_iomux_config.c
index 9c36e4ca0e..9c36e4ca0e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio4_iomux_config.c
index 4adce46dc0..4adce46dc0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio5_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio5_iomux_config.c
index 6520fd0580..6520fd0580 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio5_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio5_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio6_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio6_iomux_config.c
index 3df301a2a0..3df301a2a0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio6_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio6_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio7_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio7_iomux_config.c
index df38abd428..df38abd428 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio7_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio7_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio_iomux_config.c
index b4eb910c61..b4eb910c61 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gpio_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gps_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gps_iomux_config.c
index ef27ab3ea3..ef27ab3ea3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gps_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/gps_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/i2c1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/i2c1_iomux_config.c
index e464f45883..e464f45883 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/i2c1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/i2c1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/i2c2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/i2c2_iomux_config.c
index 7895b59349..7895b59349 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/i2c2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/i2c2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/i2c3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/i2c3_iomux_config.c
index 5fafb031a0..5fafb031a0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/i2c3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/i2c3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/i2c_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/i2c_iomux_config.c
index 16305b5153..16305b5153 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/i2c_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/i2c_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/iomux_config.c
index 7fc220fc66..7fc220fc66 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/ipu1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/ipu1_iomux_config.c
index d8023ef20e..d8023ef20e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/ipu1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/ipu1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/ipu_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/ipu_iomux_config.c
index cfac533eef..cfac533eef 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/ipu_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/ipu_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/kpp_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/kpp_iomux_config.c
index 979285992c..979285992c 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/kpp_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/kpp_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/mmdc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/mmdc_iomux_config.c
index da11b6b1f0..da11b6b1f0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/mmdc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/mmdc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/pwm1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/pwm1_iomux_config.c
index 0cd1165c8f..0cd1165c8f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/pwm1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/pwm1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/pwm_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/pwm_iomux_config.c
index cbfbaeebfb..cbfbaeebfb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/pwm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/pwm_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/sjc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/sjc_iomux_config.c
index ac1899fd9d..ac1899fd9d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/sjc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/sjc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/uart1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/uart1_iomux_config.c
index 705bcaa146..705bcaa146 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/uart1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/uart1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/uart_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/uart_iomux_config.c
index f438e1415f..f438e1415f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/uart_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/uart_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/usdhc2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/usdhc2_iomux_config.c
index cc75b1d983..cc75b1d983 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/usdhc2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/usdhc2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/usdhc3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/usdhc3_iomux_config.c
index e483d499e6..e483d499e6 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/usdhc3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/usdhc3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/usdhc4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/usdhc4_iomux_config.c
index a8dea18445..a8dea18445 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/usdhc4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/usdhc4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/usdhc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/usdhc_iomux_config.c
index 9c14062475..9c14062475 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/usdhc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/usdhc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/wdog_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/wdog_iomux_config.c
index d1faa6536a..d1faa6536a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/wdog_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_a_iomux/wdog_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/audmux_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/audmux_iomux_config.c
index b18689214a..b18689214a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/audmux_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/audmux_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/ccm_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/ccm_iomux_config.c
index 4f289e4372..4f289e4372 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/ccm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/ccm_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/dcic_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/dcic_iomux_config.c
index 8039037dd9..8039037dd9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/dcic_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/dcic_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/ecspi1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/ecspi1_iomux_config.c
index 2f5a76611b..2f5a76611b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/ecspi1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/ecspi1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/ecspi_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/ecspi_iomux_config.c
index 95fd9095e7..95fd9095e7 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/ecspi_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/ecspi_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/enet_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/enet_iomux_config.c
index f48f7744a7..f48f7744a7 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/enet_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/enet_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/epit_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/epit_iomux_config.c
index 01dbe1e09c..01dbe1e09c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/epit_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/epit_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/flexcan1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/flexcan1_iomux_config.c
index 9a9b588fc2..9a9b588fc2 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/flexcan1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/flexcan1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/flexcan_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/flexcan_iomux_config.c
index 9c95ba7856..9c95ba7856 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/flexcan_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/flexcan_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio1_iomux_config.c
index 9a10435efd..9a10435efd 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio2_iomux_config.c
index a26b0d7b00..a26b0d7b00 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio3_iomux_config.c
index 96bf53c719..96bf53c719 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio4_iomux_config.c
index 085ebd5298..085ebd5298 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio5_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio5_iomux_config.c
index d8c923d5b3..d8c923d5b3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio5_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio5_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio6_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio6_iomux_config.c
index 5b0474d43b..5b0474d43b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio6_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio6_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio7_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio7_iomux_config.c
index df38abd428..df38abd428 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio7_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio7_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio_iomux_config.c
index b4eb910c61..b4eb910c61 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gpio_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gps_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gps_iomux_config.c
index ef27ab3ea3..ef27ab3ea3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gps_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/gps_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/i2c1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/i2c1_iomux_config.c
index e464f45883..e464f45883 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/i2c1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/i2c1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/i2c2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/i2c2_iomux_config.c
index 7895b59349..7895b59349 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/i2c2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/i2c2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/i2c3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/i2c3_iomux_config.c
index a4f4139bd4..a4f4139bd4 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/i2c3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/i2c3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/i2c_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/i2c_iomux_config.c
index 16305b5153..16305b5153 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/i2c_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/i2c_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/iomux_config.c
index 63cca6ea4e..63cca6ea4e 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/ipu1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/ipu1_iomux_config.c
index d8d90df01d..d8d90df01d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/ipu1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/ipu1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/ipu_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/ipu_iomux_config.c
index cfac533eef..cfac533eef 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/ipu_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/ipu_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/kpp_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/kpp_iomux_config.c
index 979285992c..979285992c 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/kpp_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/kpp_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/mmdc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/mmdc_iomux_config.c
index da11b6b1f0..da11b6b1f0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/mmdc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/mmdc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/pwm1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/pwm1_iomux_config.c
index 0cd1165c8f..0cd1165c8f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/pwm1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/pwm1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/pwm_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/pwm_iomux_config.c
index cbfbaeebfb..cbfbaeebfb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/pwm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/pwm_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/sjc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/sjc_iomux_config.c
index ac1899fd9d..ac1899fd9d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/sjc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/sjc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/uart1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/uart1_iomux_config.c
index 705bcaa146..705bcaa146 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/uart1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/uart1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/uart_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/uart_iomux_config.c
index f438e1415f..f438e1415f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/uart_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/uart_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/usb_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/usb_iomux_config.c
index ee433c27cd..ee433c27cd 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/usb_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/usb_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/usdhc2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/usdhc2_iomux_config.c
index cc75b1d983..cc75b1d983 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/usdhc2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/usdhc2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/usdhc3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/usdhc3_iomux_config.c
index e483d499e6..e483d499e6 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/usdhc3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/usdhc3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/usdhc4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/usdhc4_iomux_config.c
index a8dea18445..a8dea18445 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/usdhc4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/usdhc4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/usdhc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/usdhc_iomux_config.c
index 9c14062475..9c14062475 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/usdhc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/usdhc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/wdog_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/wdog_iomux_config.c
index d1faa6536a..d1faa6536a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/wdog_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_b_iomux/wdog_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/audmux_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/audmux_iomux_config.c
index b18689214a..b18689214a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/audmux_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/audmux_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/ccm_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/ccm_iomux_config.c
index 4f289e4372..4f289e4372 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/ccm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/ccm_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/dcic_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/dcic_iomux_config.c
index 8039037dd9..8039037dd9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/dcic_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/dcic_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/ecspi1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/ecspi1_iomux_config.c
index 2f5a76611b..2f5a76611b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/ecspi1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/ecspi1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/ecspi_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/ecspi_iomux_config.c
index 95fd9095e7..95fd9095e7 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/ecspi_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/ecspi_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/enet_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/enet_iomux_config.c
index f48f7744a7..f48f7744a7 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/enet_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/enet_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/epit_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/epit_iomux_config.c
index 01dbe1e09c..01dbe1e09c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/epit_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/epit_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/flexcan1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/flexcan1_iomux_config.c
index 9a9b588fc2..9a9b588fc2 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/flexcan1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/flexcan1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/flexcan_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/flexcan_iomux_config.c
index 9c95ba7856..9c95ba7856 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/flexcan_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/flexcan_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio1_iomux_config.c
index 9a10435efd..9a10435efd 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio2_iomux_config.c
index a26b0d7b00..a26b0d7b00 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio3_iomux_config.c
index 96bf53c719..96bf53c719 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio4_iomux_config.c
index 085ebd5298..085ebd5298 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio5_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio5_iomux_config.c
index d8c923d5b3..d8c923d5b3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio5_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio5_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio6_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio6_iomux_config.c
index 5b0474d43b..5b0474d43b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio6_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio6_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio7_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio7_iomux_config.c
index df38abd428..df38abd428 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio7_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio7_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio_iomux_config.c
index b4eb910c61..b4eb910c61 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gpio_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gps_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gps_iomux_config.c
index ef27ab3ea3..ef27ab3ea3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gps_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/gps_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/i2c1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/i2c1_iomux_config.c
index e464f45883..e464f45883 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/i2c1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/i2c1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/i2c2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/i2c2_iomux_config.c
index 7895b59349..7895b59349 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/i2c2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/i2c2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/i2c3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/i2c3_iomux_config.c
index a4f4139bd4..a4f4139bd4 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/i2c3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/i2c3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/i2c_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/i2c_iomux_config.c
index 16305b5153..16305b5153 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/i2c_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/i2c_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/iomux_config.c
index 63cca6ea4e..63cca6ea4e 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/ipu1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/ipu1_iomux_config.c
index d8d90df01d..d8d90df01d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/ipu1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/ipu1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/ipu_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/ipu_iomux_config.c
index cfac533eef..cfac533eef 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/ipu_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/ipu_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/kpp_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/kpp_iomux_config.c
index 979285992c..979285992c 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/kpp_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/kpp_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/mmdc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/mmdc_iomux_config.c
index da11b6b1f0..da11b6b1f0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/mmdc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/mmdc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/pwm1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/pwm1_iomux_config.c
index 0cd1165c8f..0cd1165c8f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/pwm1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/pwm1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/pwm_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/pwm_iomux_config.c
index cbfbaeebfb..cbfbaeebfb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/pwm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/pwm_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/sjc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/sjc_iomux_config.c
index ac1899fd9d..ac1899fd9d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/sjc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/sjc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/uart1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/uart1_iomux_config.c
index 705bcaa146..705bcaa146 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/uart1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/uart1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/uart_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/uart_iomux_config.c
index f438e1415f..f438e1415f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/uart_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/uart_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/usb_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/usb_iomux_config.c
index ee433c27cd..ee433c27cd 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/usb_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/usb_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/usdhc2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/usdhc2_iomux_config.c
index cc75b1d983..cc75b1d983 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/usdhc2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/usdhc2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/usdhc3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/usdhc3_iomux_config.c
index e483d499e6..e483d499e6 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/usdhc3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/usdhc3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/usdhc4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/usdhc4_iomux_config.c
index a8dea18445..a8dea18445 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/usdhc4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/usdhc4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/usdhc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/usdhc_iomux_config.c
index 9c14062475..9c14062475 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/usdhc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/usdhc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/wdog_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/wdog_iomux_config.c
index d1faa6536a..d1faa6536a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/wdog_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6dq/smart_device/rev_c_iomux/wdog_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/Makefile
index 8cde4afa9d..8cde4afa9d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/dcd.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/dcd.c
index c3f6213d49..c3f6213d49 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/dcd.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/dcd.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/i.MX6SDL_EVB_X3.IoMuxDesign.xml b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/i.MX6SDL_EVB_X3.IoMuxDesign.xml
index cac992ef9a..cac992ef9a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/i.MX6SDL_EVB_X3.IoMuxDesign.xml
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/i.MX6SDL_EVB_X3.IoMuxDesign.xml
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/ccm_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/ccm_iomux_config.c
index e934c67870..e934c67870 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/ccm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/ccm_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/dcic_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/dcic_iomux_config.c
index 8039037dd9..8039037dd9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/dcic_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/dcic_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/ecspi1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/ecspi1_iomux_config.c
index 3dee95667d..3dee95667d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/ecspi1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/ecspi1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/ecspi_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/ecspi_iomux_config.c
index a4b466d88d..a4b466d88d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/ecspi_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/ecspi_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/enet_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/enet_iomux_config.c
index bfb5c9c253..bfb5c9c253 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/enet_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/enet_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/epit_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/epit_iomux_config.c
index 01dbe1e09c..01dbe1e09c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/epit_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/epit_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/esai_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/esai_iomux_config.c
index f8f0d140ff..f8f0d140ff 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/esai_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/esai_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/flexcan1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/flexcan1_iomux_config.c
index f144f6159a..f144f6159a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/flexcan1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/flexcan1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/flexcan2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/flexcan2_iomux_config.c
index 28da8d2350..28da8d2350 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/flexcan2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/flexcan2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/flexcan_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/flexcan_iomux_config.c
index 9c95ba7856..9c95ba7856 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/flexcan_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/flexcan_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/gpio3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/gpio3_iomux_config.c
index 1d07e1a494..1d07e1a494 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/gpio3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/gpio3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/gpio4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/gpio4_iomux_config.c
index 8bb0890611..8bb0890611 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/gpio4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/gpio4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/gpio5_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/gpio5_iomux_config.c
index 1e3ac898ff..1e3ac898ff 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/gpio5_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/gpio5_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/gpio6_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/gpio6_iomux_config.c
index 016e440c49..016e440c49 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/gpio6_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/gpio6_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/gpio_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/gpio_iomux_config.c
index b4eb910c61..b4eb910c61 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/gpio_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/gpio_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/gpmi_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/gpmi_iomux_config.c
index 14c09aee98..14c09aee98 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/gpmi_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/gpmi_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/hdmi_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/hdmi_iomux_config.c
index 78c3572dbb..78c3572dbb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/hdmi_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/hdmi_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/i2c1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/i2c1_iomux_config.c
index b6418b4362..b6418b4362 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/i2c1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/i2c1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/i2c2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/i2c2_iomux_config.c
index 8c3c37f972..8c3c37f972 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/i2c2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/i2c2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/i2c3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/i2c3_iomux_config.c
index bfbb4413e0..bfbb4413e0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/i2c3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/i2c3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/i2c_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/i2c_iomux_config.c
index 5c3915ee56..5c3915ee56 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/i2c_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/i2c_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/iomux_config.c
index 8f7ab954ed..8f7ab954ed 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/ipu1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/ipu1_iomux_config.c
index c9904f317a..c9904f317a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/ipu1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/ipu1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/ipu_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/ipu_iomux_config.c
index 16f23f17c9..16f23f17c9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/ipu_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/ipu_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/kpp_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/kpp_iomux_config.c
index 568c8c725e..568c8c725e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/kpp_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/kpp_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/mlb_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/mlb_iomux_config.c
index 74fffb6025..74fffb6025 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/mlb_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/mlb_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/mmdc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/mmdc_iomux_config.c
index 03d251aedb..03d251aedb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/mmdc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/mmdc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/pwm1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/pwm1_iomux_config.c
index 443a878c2f..443a878c2f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/pwm1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/pwm1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/pwm_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/pwm_iomux_config.c
index cbfbaeebfb..cbfbaeebfb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/pwm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/pwm_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/sjc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/sjc_iomux_config.c
index 7df975efdb..7df975efdb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/sjc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/sjc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/spdif_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/spdif_iomux_config.c
index 251a1fe831..251a1fe831 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/spdif_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/spdif_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/uart2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/uart2_iomux_config.c
index 4652e150d6..4652e150d6 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/uart2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/uart2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/uart4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/uart4_iomux_config.c
index 3ca3b1b5f1..3ca3b1b5f1 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/uart4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/uart4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/uart_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/uart_iomux_config.c
index f438e1415f..f438e1415f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/uart_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/uart_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/usb_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/usb_iomux_config.c
index 8a250063c7..8a250063c7 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/usb_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/usb_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/usdhc1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/usdhc1_iomux_config.c
index a1727188ca..a1727188ca 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/usdhc1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/usdhc1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/usdhc2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/usdhc2_iomux_config.c
index 6a49aed235..6a49aed235 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/usdhc2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/usdhc2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/usdhc3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/usdhc3_iomux_config.c
index 5ce9a6db92..5ce9a6db92 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/usdhc3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/usdhc3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/usdhc4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/usdhc4_iomux_config.c
index 05e10e4ff9..05e10e4ff9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/usdhc4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/usdhc4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/usdhc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/usdhc_iomux_config.c
index 9c14062475..9c14062475 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/usdhc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/usdhc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/wdog_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/wdog_iomux_config.c
index d1faa6536a..d1faa6536a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/wdog_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux/wdog_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux_config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux_config.h
index bba996691c..bba996691c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux_config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/evb/iomux_config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/Makefile
index 06b9f051ff..06b9f051ff 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/dcd.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/dcd.c
index f6198c5c53..f6198c5c53 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/dcd.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/dcd.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/i.MX6SDL_Sabre_AI_RevA.IomuxDesign.xml b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/i.MX6SDL_Sabre_AI_RevA.IomuxDesign.xml
index 2e00b43b87..2e00b43b87 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/i.MX6SDL_Sabre_AI_RevA.IomuxDesign.xml
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/i.MX6SDL_Sabre_AI_RevA.IomuxDesign.xml
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/i.MX6SDL_Sabre_AI_RevB.IomuxDesign.xml b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/i.MX6SDL_Sabre_AI_RevB.IomuxDesign.xml
index 0d047dc1cf..0d047dc1cf 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/i.MX6SDL_Sabre_AI_RevB.IomuxDesign.xml
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/i.MX6SDL_Sabre_AI_RevB.IomuxDesign.xml
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/iomux_config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/iomux_config.h
index bba996691c..bba996691c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/iomux_config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/iomux_config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/audmux_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/audmux_iomux_config.c
index 1d9d1dad58..1d9d1dad58 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/audmux_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/audmux_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/ccm_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/ccm_iomux_config.c
index e934c67870..e934c67870 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/ccm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/ccm_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/dcic_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/dcic_iomux_config.c
index 8039037dd9..8039037dd9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/dcic_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/dcic_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/ecspi1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/ecspi1_iomux_config.c
index 2fa2cfbc6b..2fa2cfbc6b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/ecspi1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/ecspi1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/ecspi_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/ecspi_iomux_config.c
index a4b466d88d..a4b466d88d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/ecspi_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/ecspi_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/eim_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/eim_iomux_config.c
index 751433d224..751433d224 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/eim_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/eim_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/enet_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/enet_iomux_config.c
index 31557f8493..31557f8493 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/enet_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/enet_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/epit_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/epit_iomux_config.c
index 01dbe1e09c..01dbe1e09c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/epit_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/epit_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/esai_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/esai_iomux_config.c
index 88a5ceefa0..88a5ceefa0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/esai_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/esai_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/flexcan1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/flexcan1_iomux_config.c
index 2a6e781a24..2a6e781a24 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/flexcan1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/flexcan1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/flexcan2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/flexcan2_iomux_config.c
index 28da8d2350..28da8d2350 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/flexcan2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/flexcan2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/flexcan_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/flexcan_iomux_config.c
index 9c95ba7856..9c95ba7856 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/flexcan_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/flexcan_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/gpio1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/gpio1_iomux_config.c
index 80fc38adac..80fc38adac 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/gpio1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/gpio1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/gpio2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/gpio2_iomux_config.c
index a730e07a4b..a730e07a4b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/gpio2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/gpio2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/gpio4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/gpio4_iomux_config.c
index b13ebcf252..b13ebcf252 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/gpio4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/gpio4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/gpio5_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/gpio5_iomux_config.c
index bcfad9a7ab..bcfad9a7ab 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/gpio5_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/gpio5_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/gpio6_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/gpio6_iomux_config.c
index 622c505413..622c505413 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/gpio6_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/gpio6_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/gpio_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/gpio_iomux_config.c
index b4eb910c61..b4eb910c61 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/gpio_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/gpio_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/gpmi_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/gpmi_iomux_config.c
index 38da88793f..38da88793f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/gpmi_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/gpmi_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/i2c2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/i2c2_iomux_config.c
index 496445e092..496445e092 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/i2c2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/i2c2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/i2c3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/i2c3_iomux_config.c
index fa3742f315..fa3742f315 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/i2c3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/i2c3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/i2c_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/i2c_iomux_config.c
index 5c3915ee56..5c3915ee56 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/i2c_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/i2c_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/iomux_config.c
index 89756a9bb4..89756a9bb4 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/ipu1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/ipu1_iomux_config.c
index 5166735784..5166735784 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/ipu1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/ipu1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/ipu_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/ipu_iomux_config.c
index 16f23f17c9..16f23f17c9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/ipu_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/ipu_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/mlb_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/mlb_iomux_config.c
index 3eaf51d186..3eaf51d186 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/mlb_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/mlb_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/mmdc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/mmdc_iomux_config.c
index 03d251aedb..03d251aedb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/mmdc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/mmdc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/pwm3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/pwm3_iomux_config.c
index 7a8eb678d2..7a8eb678d2 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/pwm3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/pwm3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/pwm4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/pwm4_iomux_config.c
index 4e6c29899d..4e6c29899d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/pwm4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/pwm4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/pwm_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/pwm_iomux_config.c
index cbfbaeebfb..cbfbaeebfb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/pwm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/pwm_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/sjc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/sjc_iomux_config.c
index 7df975efdb..7df975efdb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/sjc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/sjc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/spdif_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/spdif_iomux_config.c
index 991f561a8a..991f561a8a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/spdif_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/spdif_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/uart2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/uart2_iomux_config.c
index 9268b419fe..9268b419fe 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/uart2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/uart2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/uart3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/uart3_iomux_config.c
index 4d3f5c5318..4d3f5c5318 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/uart3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/uart3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/uart4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/uart4_iomux_config.c
index 2a7bfccceb..2a7bfccceb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/uart4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/uart4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/uart_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/uart_iomux_config.c
index f438e1415f..f438e1415f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/uart_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/uart_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/usdhc1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/usdhc1_iomux_config.c
index e3f49b7411..e3f49b7411 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/usdhc1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/usdhc1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/usdhc3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/usdhc3_iomux_config.c
index d953564bcb..d953564bcb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/usdhc3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/usdhc3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/usdhc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/usdhc_iomux_config.c
index 9c14062475..9c14062475 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/usdhc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/usdhc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/wdog1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/wdog1_iomux_config.c
index 84bbdbabe1..84bbdbabe1 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/wdog1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/wdog1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/wdog_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/wdog_iomux_config.c
index d1faa6536a..d1faa6536a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/wdog_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_a_iomux/wdog_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/audmux_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/audmux_iomux_config.c
index 1d9d1dad58..1d9d1dad58 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/audmux_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/audmux_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/ccm_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/ccm_iomux_config.c
index e934c67870..e934c67870 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/ccm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/ccm_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/dcic_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/dcic_iomux_config.c
index 8039037dd9..8039037dd9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/dcic_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/dcic_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/ecspi1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/ecspi1_iomux_config.c
index d994f08c1c..d994f08c1c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/ecspi1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/ecspi1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/ecspi_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/ecspi_iomux_config.c
index a4b466d88d..a4b466d88d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/ecspi_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/ecspi_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/eim_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/eim_iomux_config.c
index 44a8605daf..44a8605daf 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/eim_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/eim_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/enet_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/enet_iomux_config.c
index 49ac153395..49ac153395 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/enet_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/enet_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/epit_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/epit_iomux_config.c
index 01dbe1e09c..01dbe1e09c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/epit_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/epit_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/esai_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/esai_iomux_config.c
index 88a5ceefa0..88a5ceefa0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/esai_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/esai_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/flexcan1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/flexcan1_iomux_config.c
index 80536ef4ef..80536ef4ef 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/flexcan1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/flexcan1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/flexcan2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/flexcan2_iomux_config.c
index 28da8d2350..28da8d2350 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/flexcan2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/flexcan2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/flexcan_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/flexcan_iomux_config.c
index 9c95ba7856..9c95ba7856 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/flexcan_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/flexcan_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/gpio1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/gpio1_iomux_config.c
index 50ceac2087..50ceac2087 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/gpio1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/gpio1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/gpio2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/gpio2_iomux_config.c
index a3970c58a4..a3970c58a4 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/gpio2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/gpio2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/gpio4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/gpio4_iomux_config.c
index cdfcff9f11..cdfcff9f11 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/gpio4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/gpio4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/gpio5_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/gpio5_iomux_config.c
index b7bddfe233..b7bddfe233 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/gpio5_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/gpio5_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/gpio6_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/gpio6_iomux_config.c
index 7ef99b2391..7ef99b2391 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/gpio6_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/gpio6_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/gpio_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/gpio_iomux_config.c
index b4eb910c61..b4eb910c61 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/gpio_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/gpio_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/gpmi_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/gpmi_iomux_config.c
index 38da88793f..38da88793f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/gpmi_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/gpmi_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/i2c2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/i2c2_iomux_config.c
index 2db0c274a3..2db0c274a3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/i2c2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/i2c2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/i2c3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/i2c3_iomux_config.c
index 2c7d71292c..2c7d71292c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/i2c3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/i2c3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/i2c_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/i2c_iomux_config.c
index 5c3915ee56..5c3915ee56 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/i2c_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/i2c_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/iomux_config.c
index 967178be63..967178be63 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/ipu1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/ipu1_iomux_config.c
index 5166735784..5166735784 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/ipu1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/ipu1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/ipu_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/ipu_iomux_config.c
index 16f23f17c9..16f23f17c9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/ipu_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/ipu_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/mlb_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/mlb_iomux_config.c
index 3eaf51d186..3eaf51d186 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/mlb_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/mlb_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/mmdc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/mmdc_iomux_config.c
index 03d251aedb..03d251aedb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/mmdc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/mmdc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/pwm3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/pwm3_iomux_config.c
index 7a8eb678d2..7a8eb678d2 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/pwm3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/pwm3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/pwm4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/pwm4_iomux_config.c
index 4e6c29899d..4e6c29899d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/pwm4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/pwm4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/pwm_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/pwm_iomux_config.c
index cbfbaeebfb..cbfbaeebfb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/pwm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/pwm_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/sjc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/sjc_iomux_config.c
index 7df975efdb..7df975efdb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/sjc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/sjc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/spdif_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/spdif_iomux_config.c
index 991f561a8a..991f561a8a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/spdif_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/spdif_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/uart2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/uart2_iomux_config.c
index b07eecc904..b07eecc904 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/uart2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/uart2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/uart3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/uart3_iomux_config.c
index 69f242c23b..69f242c23b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/uart3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/uart3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/uart4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/uart4_iomux_config.c
index 3ca3b1b5f1..3ca3b1b5f1 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/uart4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/uart4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/uart_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/uart_iomux_config.c
index f438e1415f..f438e1415f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/uart_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/uart_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/usdhc1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/usdhc1_iomux_config.c
index 4b743c268e..4b743c268e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/usdhc1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/usdhc1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/usdhc3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/usdhc3_iomux_config.c
index 5ce9a6db92..5ce9a6db92 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/usdhc3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/usdhc3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/usdhc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/usdhc_iomux_config.c
index 9c14062475..9c14062475 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/usdhc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/usdhc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/wdog1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/wdog1_iomux_config.c
index f19cb8163a..f19cb8163a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/wdog1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/wdog1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/wdog_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/wdog_iomux_config.c
index d1faa6536a..d1faa6536a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/wdog_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_b_iomux/wdog_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/audmux_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/audmux_iomux_config.c
index 1d9d1dad58..1d9d1dad58 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/audmux_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/audmux_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/ccm_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/ccm_iomux_config.c
index e934c67870..e934c67870 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/ccm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/ccm_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/dcic_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/dcic_iomux_config.c
index 8039037dd9..8039037dd9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/dcic_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/dcic_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/ecspi1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/ecspi1_iomux_config.c
index d994f08c1c..d994f08c1c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/ecspi1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/ecspi1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/ecspi_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/ecspi_iomux_config.c
index a4b466d88d..a4b466d88d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/ecspi_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/ecspi_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/eim_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/eim_iomux_config.c
index 44a8605daf..44a8605daf 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/eim_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/eim_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/enet_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/enet_iomux_config.c
index 49ac153395..49ac153395 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/enet_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/enet_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/epit_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/epit_iomux_config.c
index 01dbe1e09c..01dbe1e09c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/epit_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/epit_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/esai_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/esai_iomux_config.c
index 88a5ceefa0..88a5ceefa0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/esai_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/esai_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/flexcan1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/flexcan1_iomux_config.c
index 80536ef4ef..80536ef4ef 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/flexcan1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/flexcan1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/flexcan2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/flexcan2_iomux_config.c
index 28da8d2350..28da8d2350 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/flexcan2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/flexcan2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/flexcan_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/flexcan_iomux_config.c
index 9c95ba7856..9c95ba7856 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/flexcan_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/flexcan_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/gpio1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/gpio1_iomux_config.c
index 50ceac2087..50ceac2087 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/gpio1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/gpio1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/gpio2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/gpio2_iomux_config.c
index a3970c58a4..a3970c58a4 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/gpio2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/gpio2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/gpio4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/gpio4_iomux_config.c
index cdfcff9f11..cdfcff9f11 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/gpio4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/gpio4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/gpio5_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/gpio5_iomux_config.c
index b7bddfe233..b7bddfe233 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/gpio5_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/gpio5_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/gpio6_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/gpio6_iomux_config.c
index 7ef99b2391..7ef99b2391 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/gpio6_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/gpio6_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/gpio_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/gpio_iomux_config.c
index b4eb910c61..b4eb910c61 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/gpio_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/gpio_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/gpmi_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/gpmi_iomux_config.c
index 38da88793f..38da88793f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/gpmi_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/gpmi_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/i2c2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/i2c2_iomux_config.c
index 2db0c274a3..2db0c274a3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/i2c2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/i2c2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/i2c3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/i2c3_iomux_config.c
index 2c7d71292c..2c7d71292c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/i2c3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/i2c3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/i2c_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/i2c_iomux_config.c
index 5c3915ee56..5c3915ee56 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/i2c_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/i2c_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/iomux_config.c
index 967178be63..967178be63 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/ipu1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/ipu1_iomux_config.c
index 5166735784..5166735784 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/ipu1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/ipu1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/ipu_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/ipu_iomux_config.c
index 16f23f17c9..16f23f17c9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/ipu_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/ipu_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/mlb_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/mlb_iomux_config.c
index 3eaf51d186..3eaf51d186 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/mlb_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/mlb_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/mmdc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/mmdc_iomux_config.c
index 03d251aedb..03d251aedb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/mmdc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/mmdc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/pwm3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/pwm3_iomux_config.c
index 7a8eb678d2..7a8eb678d2 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/pwm3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/pwm3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/pwm4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/pwm4_iomux_config.c
index 4e6c29899d..4e6c29899d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/pwm4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/pwm4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/pwm_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/pwm_iomux_config.c
index cbfbaeebfb..cbfbaeebfb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/pwm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/pwm_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/sjc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/sjc_iomux_config.c
index 7df975efdb..7df975efdb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/sjc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/sjc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/spdif_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/spdif_iomux_config.c
index 991f561a8a..991f561a8a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/spdif_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/spdif_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/uart2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/uart2_iomux_config.c
index b07eecc904..b07eecc904 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/uart2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/uart2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/uart3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/uart3_iomux_config.c
index 69f242c23b..69f242c23b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/uart3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/uart3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/uart4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/uart4_iomux_config.c
index 3ca3b1b5f1..3ca3b1b5f1 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/uart4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/uart4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/uart_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/uart_iomux_config.c
index f438e1415f..f438e1415f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/uart_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/uart_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/usdhc1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/usdhc1_iomux_config.c
index 4b743c268e..4b743c268e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/usdhc1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/usdhc1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/usdhc3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/usdhc3_iomux_config.c
index 5ce9a6db92..5ce9a6db92 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/usdhc3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/usdhc3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/usdhc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/usdhc_iomux_config.c
index 9c14062475..9c14062475 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/usdhc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/usdhc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/wdog1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/wdog1_iomux_config.c
index f19cb8163a..f19cb8163a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/wdog1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/wdog1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/wdog_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/wdog_iomux_config.c
index d1faa6536a..d1faa6536a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/wdog_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/sabre_ai/rev_c_iomux/wdog_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/Makefile
index 06b9f051ff..06b9f051ff 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/dcd.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/dcd.c
index e05f2b4cec..e05f2b4cec 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/dcd.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/dcd.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/i.MX6SDL_Smart_Device.RevA.IoMuxDesign.xml b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/i.MX6SDL_Smart_Device.RevA.IoMuxDesign.xml
index d7a7f0b5b1..d7a7f0b5b1 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/i.MX6SDL_Smart_Device.RevA.IoMuxDesign.xml
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/i.MX6SDL_Smart_Device.RevA.IoMuxDesign.xml
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/i.MX6SDL_Smart_Device.RevB.IoMuxDesign.xml b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/i.MX6SDL_Smart_Device.RevB.IoMuxDesign.xml
index f0aad9532a..f0aad9532a 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/i.MX6SDL_Smart_Device.RevB.IoMuxDesign.xml
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/i.MX6SDL_Smart_Device.RevB.IoMuxDesign.xml
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/iomux_config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/iomux_config.h
index 01515ae6eb..01515ae6eb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/iomux_config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/iomux_config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/audmux_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/audmux_iomux_config.c
index a60682e99c..a60682e99c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/audmux_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/audmux_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/ccm_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/ccm_iomux_config.c
index e934c67870..e934c67870 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/ccm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/ccm_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/dcic_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/dcic_iomux_config.c
index 8039037dd9..8039037dd9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/dcic_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/dcic_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/ecspi1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/ecspi1_iomux_config.c
index ea4c61bbf7..ea4c61bbf7 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/ecspi1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/ecspi1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/ecspi_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/ecspi_iomux_config.c
index a4b466d88d..a4b466d88d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/ecspi_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/ecspi_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/enet_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/enet_iomux_config.c
index c08006aaa1..c08006aaa1 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/enet_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/enet_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/epdc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/epdc_iomux_config.c
index db6fff7efd..db6fff7efd 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/epdc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/epdc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/epit_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/epit_iomux_config.c
index 01dbe1e09c..01dbe1e09c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/epit_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/epit_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/flexcan1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/flexcan1_iomux_config.c
index 2cd8984775..2cd8984775 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/flexcan1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/flexcan1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/flexcan_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/flexcan_iomux_config.c
index 9c95ba7856..9c95ba7856 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/flexcan_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/flexcan_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio1_iomux_config.c
index 0122135363..0122135363 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio2_iomux_config.c
index fee39f50ea..fee39f50ea 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio3_iomux_config.c
index 7a908a4497..7a908a4497 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio4_iomux_config.c
index 835fa4c210..835fa4c210 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio5_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio5_iomux_config.c
index 66c07e1c3b..66c07e1c3b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio5_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio5_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio6_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio6_iomux_config.c
index 3a89c7b250..3a89c7b250 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio6_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio6_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio7_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio7_iomux_config.c
index 801d4522c2..801d4522c2 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio7_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio7_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio_iomux_config.c
index b4eb910c61..b4eb910c61 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gpio_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gps_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gps_iomux_config.c
index 407020b3e7..407020b3e7 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gps_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/gps_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/i2c1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/i2c1_iomux_config.c
index b6418b4362..b6418b4362 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/i2c1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/i2c1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/i2c2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/i2c2_iomux_config.c
index 8c3c37f972..8c3c37f972 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/i2c2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/i2c2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/i2c3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/i2c3_iomux_config.c
index fa3742f315..fa3742f315 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/i2c3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/i2c3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/i2c_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/i2c_iomux_config.c
index 5c3915ee56..5c3915ee56 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/i2c_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/i2c_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/iomux_config.c
index 8acd07b5eb..8acd07b5eb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/ipu1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/ipu1_iomux_config.c
index 0923c58451..0923c58451 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/ipu1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/ipu1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/ipu_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/ipu_iomux_config.c
index 16f23f17c9..16f23f17c9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/ipu_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/ipu_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/kpp_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/kpp_iomux_config.c
index 392b60effe..392b60effe 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/kpp_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/kpp_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/mmdc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/mmdc_iomux_config.c
index 03d251aedb..03d251aedb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/mmdc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/mmdc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/pwm1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/pwm1_iomux_config.c
index 81612d72af..81612d72af 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/pwm1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/pwm1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/pwm_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/pwm_iomux_config.c
index cbfbaeebfb..cbfbaeebfb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/pwm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/pwm_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/sjc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/sjc_iomux_config.c
index 7df975efdb..7df975efdb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/sjc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/sjc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/uart1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/uart1_iomux_config.c
index 9f3b6689c8..9f3b6689c8 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/uart1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/uart1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/uart_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/uart_iomux_config.c
index f438e1415f..f438e1415f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/uart_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/uart_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/usdhc2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/usdhc2_iomux_config.c
index 6fbcf08398..6fbcf08398 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/usdhc2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/usdhc2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/usdhc3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/usdhc3_iomux_config.c
index f92e7aec78..f92e7aec78 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/usdhc3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/usdhc3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/usdhc4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/usdhc4_iomux_config.c
index 05e10e4ff9..05e10e4ff9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/usdhc4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/usdhc4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/usdhc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/usdhc_iomux_config.c
index 9c14062475..9c14062475 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/usdhc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/usdhc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/wdog_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/wdog_iomux_config.c
index d1faa6536a..d1faa6536a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/wdog_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_a_iomux/wdog_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/audmux_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/audmux_iomux_config.c
index a60682e99c..a60682e99c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/audmux_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/audmux_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/ccm_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/ccm_iomux_config.c
index e934c67870..e934c67870 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/ccm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/ccm_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/dcic_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/dcic_iomux_config.c
index 8039037dd9..8039037dd9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/dcic_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/dcic_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/ecspi1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/ecspi1_iomux_config.c
index 2af11646fe..2af11646fe 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/ecspi1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/ecspi1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/ecspi_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/ecspi_iomux_config.c
index a4b466d88d..a4b466d88d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/ecspi_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/ecspi_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/enet_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/enet_iomux_config.c
index adcb28aab7..adcb28aab7 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/enet_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/enet_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/epdc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/epdc_iomux_config.c
index db6fff7efd..db6fff7efd 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/epdc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/epdc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/epit_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/epit_iomux_config.c
index 01dbe1e09c..01dbe1e09c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/epit_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/epit_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/flexcan1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/flexcan1_iomux_config.c
index 2cd8984775..2cd8984775 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/flexcan1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/flexcan1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/flexcan_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/flexcan_iomux_config.c
index 9c95ba7856..9c95ba7856 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/flexcan_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/flexcan_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio1_iomux_config.c
index 64e88fc094..64e88fc094 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio2_iomux_config.c
index fee39f50ea..fee39f50ea 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio3_iomux_config.c
index 098f7b0284..098f7b0284 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio4_iomux_config.c
index acb49c502c..acb49c502c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio5_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio5_iomux_config.c
index cfc4656e6e..cfc4656e6e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio5_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio5_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio6_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio6_iomux_config.c
index e249224c15..e249224c15 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio6_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio6_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio7_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio7_iomux_config.c
index 801d4522c2..801d4522c2 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio7_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio7_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio_iomux_config.c
index b4eb910c61..b4eb910c61 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gpio_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gps_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gps_iomux_config.c
index 407020b3e7..407020b3e7 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gps_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/gps_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/i2c1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/i2c1_iomux_config.c
index b6418b4362..b6418b4362 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/i2c1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/i2c1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/i2c2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/i2c2_iomux_config.c
index 8c3c37f972..8c3c37f972 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/i2c2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/i2c2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/i2c3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/i2c3_iomux_config.c
index 0461745972..0461745972 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/i2c3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/i2c3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/i2c_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/i2c_iomux_config.c
index 5c3915ee56..5c3915ee56 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/i2c_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/i2c_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/iomux_config.c
index 3455a75a06..3455a75a06 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/ipu1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/ipu1_iomux_config.c
index 3fb92c792e..3fb92c792e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/ipu1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/ipu1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/ipu_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/ipu_iomux_config.c
index 16f23f17c9..16f23f17c9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/ipu_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/ipu_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/kpp_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/kpp_iomux_config.c
index 392b60effe..392b60effe 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/kpp_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/kpp_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/mmdc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/mmdc_iomux_config.c
index 03d251aedb..03d251aedb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/mmdc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/mmdc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/pwm1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/pwm1_iomux_config.c
index 81612d72af..81612d72af 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/pwm1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/pwm1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/pwm_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/pwm_iomux_config.c
index cbfbaeebfb..cbfbaeebfb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/pwm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/pwm_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/sjc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/sjc_iomux_config.c
index 7df975efdb..7df975efdb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/sjc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/sjc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/uart1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/uart1_iomux_config.c
index 9f3b6689c8..9f3b6689c8 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/uart1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/uart1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/uart_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/uart_iomux_config.c
index f438e1415f..f438e1415f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/uart_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/uart_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/usb_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/usb_iomux_config.c
index 250d889942..250d889942 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/usb_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/usb_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/usdhc2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/usdhc2_iomux_config.c
index 6fbcf08398..6fbcf08398 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/usdhc2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/usdhc2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/usdhc3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/usdhc3_iomux_config.c
index f92e7aec78..f92e7aec78 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/usdhc3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/usdhc3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/usdhc4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/usdhc4_iomux_config.c
index 05e10e4ff9..05e10e4ff9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/usdhc4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/usdhc4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/usdhc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/usdhc_iomux_config.c
index 9c14062475..9c14062475 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/usdhc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/usdhc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/wdog_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/wdog_iomux_config.c
index d1faa6536a..d1faa6536a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/wdog_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_b_iomux/wdog_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/audmux_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/audmux_iomux_config.c
index a60682e99c..a60682e99c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/audmux_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/audmux_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/ccm_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/ccm_iomux_config.c
index e934c67870..e934c67870 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/ccm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/ccm_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/dcic_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/dcic_iomux_config.c
index 8039037dd9..8039037dd9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/dcic_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/dcic_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/ecspi1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/ecspi1_iomux_config.c
index 2af11646fe..2af11646fe 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/ecspi1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/ecspi1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/ecspi_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/ecspi_iomux_config.c
index a4b466d88d..a4b466d88d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/ecspi_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/ecspi_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/enet_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/enet_iomux_config.c
index adcb28aab7..adcb28aab7 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/enet_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/enet_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/epdc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/epdc_iomux_config.c
index db6fff7efd..db6fff7efd 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/epdc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/epdc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/epit_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/epit_iomux_config.c
index 01dbe1e09c..01dbe1e09c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/epit_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/epit_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/flexcan1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/flexcan1_iomux_config.c
index 2cd8984775..2cd8984775 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/flexcan1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/flexcan1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/flexcan_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/flexcan_iomux_config.c
index 9c95ba7856..9c95ba7856 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/flexcan_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/flexcan_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio1_iomux_config.c
index 64e88fc094..64e88fc094 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio2_iomux_config.c
index fee39f50ea..fee39f50ea 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio3_iomux_config.c
index 098f7b0284..098f7b0284 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio4_iomux_config.c
index acb49c502c..acb49c502c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio5_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio5_iomux_config.c
index cfc4656e6e..cfc4656e6e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio5_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio5_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio6_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio6_iomux_config.c
index e249224c15..e249224c15 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio6_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio6_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio7_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio7_iomux_config.c
index 801d4522c2..801d4522c2 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio7_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio7_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio_iomux_config.c
index b4eb910c61..b4eb910c61 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gpio_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gps_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gps_iomux_config.c
index 407020b3e7..407020b3e7 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gps_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/gps_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/i2c1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/i2c1_iomux_config.c
index b6418b4362..b6418b4362 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/i2c1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/i2c1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/i2c2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/i2c2_iomux_config.c
index 8c3c37f972..8c3c37f972 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/i2c2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/i2c2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/i2c3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/i2c3_iomux_config.c
index 0461745972..0461745972 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/i2c3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/i2c3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/i2c_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/i2c_iomux_config.c
index 5c3915ee56..5c3915ee56 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/i2c_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/i2c_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/iomux_config.c
index 3455a75a06..3455a75a06 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/ipu1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/ipu1_iomux_config.c
index 3fb92c792e..3fb92c792e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/ipu1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/ipu1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/ipu_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/ipu_iomux_config.c
index 16f23f17c9..16f23f17c9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/ipu_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/ipu_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/kpp_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/kpp_iomux_config.c
index 392b60effe..392b60effe 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/kpp_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/kpp_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/mmdc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/mmdc_iomux_config.c
index 03d251aedb..03d251aedb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/mmdc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/mmdc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/pwm1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/pwm1_iomux_config.c
index 81612d72af..81612d72af 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/pwm1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/pwm1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/pwm_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/pwm_iomux_config.c
index cbfbaeebfb..cbfbaeebfb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/pwm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/pwm_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/sjc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/sjc_iomux_config.c
index 7df975efdb..7df975efdb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/sjc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/sjc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/uart1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/uart1_iomux_config.c
index 9f3b6689c8..9f3b6689c8 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/uart1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/uart1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/uart_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/uart_iomux_config.c
index f438e1415f..f438e1415f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/uart_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/uart_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/usb_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/usb_iomux_config.c
index 250d889942..250d889942 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/usb_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/usb_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/usdhc2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/usdhc2_iomux_config.c
index 6fbcf08398..6fbcf08398 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/usdhc2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/usdhc2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/usdhc3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/usdhc3_iomux_config.c
index f92e7aec78..f92e7aec78 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/usdhc3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/usdhc3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/usdhc4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/usdhc4_iomux_config.c
index 05e10e4ff9..05e10e4ff9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/usdhc4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/usdhc4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/usdhc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/usdhc_iomux_config.c
index 9c14062475..9c14062475 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/usdhc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/usdhc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/wdog_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/wdog_iomux_config.c
index d1faa6536a..d1faa6536a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/wdog_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sdl/smart_device/rev_c_iomux/wdog_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/Makefile
index c48f034a9b..c48f034a9b 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_audio.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_audio.c
index fe468e1ba8..fe468e1ba8 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_audio.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_audio.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_camera.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_camera.c
index e909ab36d9..e909ab36d9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_camera.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_camera.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_display.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_display.c
index e288adc274..e288adc274 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_display.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_display.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_i2c.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_i2c.c
index f7d88b375c..f7d88b375c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_i2c.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_i2c.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_io_expanders.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_io_expanders.c
index 2d40ceb42d..2d40ceb42d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_io_expanders.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_io_expanders.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_io_expanders.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_io_expanders.h
index e836dd0178..e836dd0178 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_io_expanders.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_io_expanders.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_network.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_network.c
index 02e5eba7be..02e5eba7be 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_network.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_network.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_usb.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_usb.c
index c6dacd01a8..c6dacd01a8 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_usb.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_usb.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_usdhc.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_usdhc.c
index a825fb2208..a825fb2208 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_usdhc.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/board_usdhc.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/dcd.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/dcd.c
index 74d589ef5f..74d589ef5f 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/dcd.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/dcd.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/hardware_modules.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/hardware_modules.c
index 1176190bec..1176190bec 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/hardware_modules.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/hardware_modules.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/i.MX6SL_BGA_EVK_BD.xml b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/i.MX6SL_BGA_EVK_BD.xml
index 24117aff66..24117aff66 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/i.MX6SL_BGA_EVK_BD.xml
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/i.MX6SL_BGA_EVK_BD.xml
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/audmux_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/audmux_iomux_config.c
index a27e8b29aa..a27e8b29aa 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/audmux_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/audmux_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/csi_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/csi_iomux_config.c
index 0fe0752d91..0fe0752d91 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/csi_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/csi_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/ecspi1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/ecspi1_iomux_config.c
index 41ce8ff11b..41ce8ff11b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/ecspi1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/ecspi1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/ecspi2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/ecspi2_iomux_config.c
index cbead4e179..cbead4e179 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/ecspi2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/ecspi2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/ecspi_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/ecspi_iomux_config.c
index a4b466d88d..a4b466d88d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/ecspi_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/ecspi_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/epdc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/epdc_iomux_config.c
index ddbfff5209..ddbfff5209 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/epdc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/epdc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/epit_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/epit_iomux_config.c
index 01dbe1e09c..01dbe1e09c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/epit_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/epit_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/fec_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/fec_iomux_config.c
index 33920fdf87..33920fdf87 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/fec_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/fec_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/gpio1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/gpio1_iomux_config.c
index e6431a59bb..e6431a59bb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/gpio1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/gpio1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/gpio4_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/gpio4_iomux_config.c
index a62541ca37..a62541ca37 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/gpio4_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/gpio4_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/gpio_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/gpio_iomux_config.c
index 63ae333e52..63ae333e52 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/gpio_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/gpio_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/i2c1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/i2c1_iomux_config.c
index cfbad87c44..cfbad87c44 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/i2c1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/i2c1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/i2c2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/i2c2_iomux_config.c
index 01307ec52f..01307ec52f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/i2c2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/i2c2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/i2c3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/i2c3_iomux_config.c
index 8c4b4a834b..8c4b4a834b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/i2c3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/i2c3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/i2c_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/i2c_iomux_config.c
index 16305b5153..16305b5153 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/i2c_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/i2c_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/iomux_config.c
index 6bb151f80c..6bb151f80c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/kpp_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/kpp_iomux_config.c
index 86e575fc6b..86e575fc6b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/kpp_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/kpp_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/lcd_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/lcd_iomux_config.c
index 1aa8eaefe9..1aa8eaefe9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/lcd_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/lcd_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/mmdc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/mmdc_iomux_config.c
index e90fc1a048..e90fc1a048 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/mmdc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/mmdc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/pwm1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/pwm1_iomux_config.c
index 39ebb319b3..39ebb319b3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/pwm1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/pwm1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/pwm_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/pwm_iomux_config.c
index cbfbaeebfb..cbfbaeebfb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/pwm_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/pwm_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/sjc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/sjc_iomux_config.c
index f5db33aef3..f5db33aef3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/sjc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/sjc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/spdc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/spdc_iomux_config.c
index ed8d5bc76d..ed8d5bc76d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/spdc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/spdc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/uart1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/uart1_iomux_config.c
index 759b59d93e..759b59d93e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/uart1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/uart1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/uart_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/uart_iomux_config.c
index f438e1415f..f438e1415f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/uart_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/uart_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/usb_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/usb_iomux_config.c
index 24590d07a0..24590d07a0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/usb_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/usb_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/usdhc1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/usdhc1_iomux_config.c
index cdf67fdbcf..cdf67fdbcf 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/usdhc1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/usdhc1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/usdhc2_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/usdhc2_iomux_config.c
index cd64e4c03b..cd64e4c03b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/usdhc2_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/usdhc2_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/usdhc3_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/usdhc3_iomux_config.c
index bd4fa77e40..bd4fa77e40 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/usdhc3_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/usdhc3_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/usdhc_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/usdhc_iomux_config.c
index 9c14062475..9c14062475 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/usdhc_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/usdhc_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/wdog1_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/wdog1_iomux_config.c
index 4476e1d9d4..4476e1d9d4 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/wdog1_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/wdog1_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/wdog_iomux_config.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/wdog_iomux_config.c
index d1faa6536a..d1faa6536a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/wdog_iomux_config.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux/wdog_iomux_config.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux_config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux_config.h
index 014f3f63a0..014f3f63a0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux_config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/board/mx6sl/evk/iomux_config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/list.txt b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/list.txt
index 300fce2b0c..300fce2b0c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/list.txt
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/list.txt
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/Makefile
index 3c4b12195e..3c4b12195e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/Makefile
index 73479d3890..73479d3890 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/Makefile
index b0892d5b4a..b0892d5b4a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/base.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/base.c
index cec8ad332d..cec8ad332d 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/base.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/base.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/bootsecoffset.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/bootsecoffset.h
index 891d92e185..891d92e185 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/bootsecoffset.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/bootsecoffset.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/cache_wrappers.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/cache_wrappers.c
index ace69f0d0f..ace69f0d0f 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/cache_wrappers.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/cache_wrappers.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/chdir.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/chdir.c
index c95d03fa7c..c95d03fa7c 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/chdir.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/chdir.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/deletetree.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/deletetree.c
index ee60a8f587..ee60a8f587 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/deletetree.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/deletetree.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/devicetable.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/devicetable.h
index afd74f9a13..afd74f9a13 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/devicetable.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/devicetable.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/directories.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/directories.c
index ecde61e344..ecde61e344 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/directories.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/directories.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/diroffset.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/diroffset.h
index f4354b81c1..f4354b81c1 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/diroffset.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/diroffset.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fat_internal.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fat_internal.h
index 39f0d3720b..39f0d3720b 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fat_internal.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fat_internal.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fatapi.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fatapi.c
index 28983a1bc2..28983a1bc2 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fatapi.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fatapi.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/filegetattrib.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/filegetattrib.c
index 397601acf2..397601acf2 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/filegetattrib.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/filegetattrib.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/filespec.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/filespec.h
index 190e579090..190e579090 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/filespec.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/filespec.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/findfirst.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/findfirst.c
index 872106466f..872106466f 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/findfirst.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/findfirst.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/findnextsector.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/findnextsector.c
index 21818ae4af..21818ae4af 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/findnextsector.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/findnextsector.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fopen.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fopen.c
index a2f9ef1b74..a2f9ef1b74 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fopen.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fopen.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fs_fat_memory.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fs_fat_memory.c
index 11a652f601..11a652f601 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fs_fat_memory.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fs_fat_memory.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fs_steering.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fs_steering.c
index df531495f8..df531495f8 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fs_steering.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fs_steering.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fsinit.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fsinit.c
index 966e5e252a..966e5e252a 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fsinit.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fsinit.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fstypes.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fstypes.h
index b12059839d..b12059839d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fstypes.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fstypes.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fsunicode.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fsunicode.c
index d1cee8b570..d1cee8b570 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fsunicode.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/fsunicode.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/handle.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/handle.c
index d5969b22c2..d5969b22c2 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/handle.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/handle.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/handletable.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/handletable.h
index 5a8897ad93..5a8897ad93 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/handletable.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/handletable.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/longfilename.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/longfilename.c
index 09245bf038..09245bf038 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/longfilename.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/longfilename.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/readdevicerecord.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/readdevicerecord.c
index 2c9fac9313..2c9fac9313 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/readdevicerecord.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/readdevicerecord.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/reentrant_section.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/reentrant_section.c
index c8e06c0dc1..c8e06c0dc1 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/reentrant_section.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/reentrant_section.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/standardapi.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/standardapi.c
index d08aab127b..d08aab127b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/standardapi.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/standardapi.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/string_utilities.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/string_utilities.c
index b321eaf125..b321eaf125 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/string_utilities.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fat/string_utilities.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fsapi.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fsapi.h
index e0d2bf138d..e0d2bf138d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fsapi.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/fsapi.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/include/ddi_media.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/include/ddi_media.h
index b628f17511..b628f17511 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/include/ddi_media.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/include/ddi_media.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/include/fs_steering.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/include/fs_steering.h
index 2fa8f5511c..2fa8f5511c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/include/fs_steering.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/include/fs_steering.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/include/media_cache.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/include/media_cache.h
index e466391a1c..e466391a1c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/include/media_cache.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/include/media_cache.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/include/sectordef.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/include/sectordef.h
index 85386d7bdf..85386d7bdf 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/include/sectordef.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/include/sectordef.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/include/types.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/include/types.h
index 35829848fc..35829848fc 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/include/types.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/include/types.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/os_filesystem_errordefs.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/os_filesystem_errordefs.h
index 38d627e999..38d627e999 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/os_filesystem_errordefs.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/filesystem/os_filesystem_errordefs.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/ioexpander/max7310.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/ioexpander/max7310.h
index bd0e310db8..bd0e310db8 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/ioexpander/max7310.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/ioexpander/max7310.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/ioexpander/src/max7310.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/ioexpander/src/max7310.c
index 3cae18f5bd..3cae18f5bd 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/ioexpander/src/max7310.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/ioexpander/src/max7310.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/ioexpander/src/max7310_registers.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/ioexpander/src/max7310_registers.h
index ad9f803f65..ad9f803f65 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/ioexpander/src/max7310_registers.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/ioexpander/src/max7310_registers.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/ioexpander/test/max7310_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/ioexpander/test/max7310_test.c
index bef3c86fb8..bef3c86fb8 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/ioexpander/test/max7310_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/ioexpander/test/max7310_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/pmic/pfuse/pf0100.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/pmic/pfuse/pf0100.c
index caf2cf0789..caf2cf0789 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/pmic/pfuse/pf0100.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/pmic/pfuse/pf0100.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/profile/profile.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/profile/profile.c
index 6810ed36ad..6810ed36ad 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/profile/profile.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/profile/profile.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/profile/profile.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/profile/profile.h
index c4d974b4d4..c4d974b4d4 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/profile/profile.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/profile/profile.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_generator/USB_Config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_generator/USB_Config.h
index 935a344d9f..935a344d9f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_generator/USB_Config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_generator/USB_Config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_generator/audio_data.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_generator/audio_data.c
index d29b622320..d29b622320 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_generator/audio_data.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_generator/audio_data.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_generator/audio_generator.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_generator/audio_generator.c
index 3fac5cc9a5..3fac5cc9a5 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_generator/audio_generator.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_generator/audio_generator.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_generator/audio_generator.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_generator/audio_generator.h
index fdb85a21ad..fdb85a21ad 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_generator/audio_generator.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_generator/audio_generator.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_generator/usb_descriptor.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_generator/usb_descriptor.c
index 0cf7f6a5b6..0cf7f6a5b6 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_generator/usb_descriptor.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_generator/usb_descriptor.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_generator/usb_descriptor.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_generator/usb_descriptor.h
index 24b7479f57..24b7479f57 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_generator/usb_descriptor.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_generator/usb_descriptor.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_generator/user_config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_generator/user_config.h
index 0dd2de6e11..0dd2de6e11 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_generator/user_config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_generator/user_config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/USB_Config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/USB_Config.h
index 37afb14afb..37afb14afb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/USB_Config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/USB_Config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_cmt.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_cmt.c
index 9e92709caa..9e92709caa 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_cmt.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_cmt.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_cmt.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_cmt.h
index 515aad4131..515aad4131 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_cmt.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_cmt.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_pit1_kinetis.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_pit1_kinetis.c
index 481a2249a1..481a2249a1 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_pit1_kinetis.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_pit1_kinetis.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_pit1_kinetis.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_pit1_kinetis.h
index 30acd034e1..30acd034e1 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_pit1_kinetis.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_pit1_kinetis.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_pwm.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_pwm.c
index abf6f5ba34..abf6f5ba34 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_pwm.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_pwm.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_pwm.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_pwm.h
index 166231d39f..166231d39f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_pwm.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_pwm.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_pwm_kinetis.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_pwm_kinetis.c
index 088fac297d..088fac297d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_pwm_kinetis.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_pwm_kinetis.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_rtc.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_rtc.c
index de66477140..de66477140 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_rtc.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_rtc.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_rtc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_rtc.h
index c2a799f511..c2a799f511 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_rtc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_rtc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_speaker.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_speaker.c
index 2b3fbfb102..2b3fbfb102 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_speaker.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_speaker.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_speaker.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_speaker.h
index a57b8c3474..a57b8c3474 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_speaker.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/audio_speaker.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/usb_descriptor.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/usb_descriptor.c
index 5839a821a8..5839a821a8 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/usb_descriptor.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/usb_descriptor.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/usb_descriptor.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/usb_descriptor.h
index 2cdb8a1947..2cdb8a1947 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/usb_descriptor.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/usb_descriptor.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/user_config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/user_config.h
index 5948af89fc..5948af89fc 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/user_config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/audio_speaker/user_config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/batt_chg/USB_Config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/batt_chg/USB_Config.h
index 109a75fecb..109a75fecb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/batt_chg/USB_Config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/batt_chg/USB_Config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/batt_chg/usb_batt_chg_app.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/batt_chg/usb_batt_chg_app.c
index 2d985fa21a..2d985fa21a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/batt_chg/usb_batt_chg_app.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/batt_chg/usb_batt_chg_app.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/batt_chg/usb_batt_chg_app.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/batt_chg/usb_batt_chg_app.h
index e408e8041b..e408e8041b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/batt_chg/usb_batt_chg_app.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/batt_chg/usb_batt_chg_app.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/batt_chg/usb_descriptor.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/batt_chg/usb_descriptor.c
index 2e96ec8d18..2e96ec8d18 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/batt_chg/usb_descriptor.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/batt_chg/usb_descriptor.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/batt_chg/usb_descriptor.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/batt_chg/usb_descriptor.h
index 03fd399b3f..03fd399b3f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/batt_chg/usb_descriptor.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/batt_chg/usb_descriptor.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/batt_chg/user_config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/batt_chg/user_config.h
index 40f64ea670..40f64ea670 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/batt_chg/user_config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/batt_chg/user_config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/cdc/USB_Config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/cdc/USB_Config.h
index cdacff3b70..cdacff3b70 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/cdc/USB_Config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/cdc/USB_Config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/cdc/usb_descriptor.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/cdc/usb_descriptor.c
index f6bb408e4a..f6bb408e4a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/cdc/usb_descriptor.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/cdc/usb_descriptor.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/cdc/usb_descriptor.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/cdc/usb_descriptor.h
index b35fcffa36..b35fcffa36 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/cdc/usb_descriptor.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/cdc/usb_descriptor.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/cdc/user_config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/cdc/user_config.h
index 7fd27a8452..7fd27a8452 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/cdc/user_config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/cdc/user_config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/cdc/virtual_com.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/cdc/virtual_com.c
index 595dded5d5..595dded5d5 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/cdc/virtual_com.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/cdc/virtual_com.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/cdc/virtual_com.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/cdc/virtual_com.h
index 19fbc5aa85..19fbc5aa85 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/cdc/virtual_com.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/cdc/virtual_com.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/common/mx6x/derivative.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/common/mx6x/derivative.h
index d068259737..d068259737 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/common/mx6x/derivative.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/common/mx6x/derivative.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/common/mx6x/hidef.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/common/mx6x/hidef.h
index bdda9fd4b0..bdda9fd4b0 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/common/mx6x/hidef.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/common/mx6x/hidef.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/common/types.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/common/types.h
index c0f6001e29..c0f6001e29 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/common/types.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/common/types.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/USB_Config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/USB_Config.h
index 8c06a60b9f..8c06a60b9f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/USB_Config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/USB_Config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/dfu_mouse.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/dfu_mouse.c
index 0719efae8a..0719efae8a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/dfu_mouse.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/dfu_mouse.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/dfu_mouse.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/dfu_mouse.h
index 75c058f506..75c058f506 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/dfu_mouse.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/dfu_mouse.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/flash.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/flash.c
index 75fc4e5125..75fc4e5125 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/flash.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/flash.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/flash.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/flash.h
index a60b14b7f6..a60b14b7f6 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/flash.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/flash.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/flash_FTFL.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/flash_FTFL.c
index a165c21d77..a165c21d77 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/flash_FTFL.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/flash_FTFL.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/flash_FTFL.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/flash_FTFL.h
index 8d4886b00f..8d4886b00f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/flash_FTFL.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/flash_FTFL.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/flash_NAND.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/flash_NAND.c
index 83cb54dda6..83cb54dda6 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/flash_NAND.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/flash_NAND.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/flash_NAND.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/flash_NAND.h
index 64d2ff6a78..64d2ff6a78 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/flash_NAND.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/flash_NAND.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/usb_descriptor.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/usb_descriptor.c
index fcfafedb99..fcfafedb99 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/usb_descriptor.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/usb_descriptor.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/usb_descriptor.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/usb_descriptor.h
index b8e6c76687..b8e6c76687 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/usb_descriptor.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/usb_descriptor.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/user_config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/user_config.h
index 39fce2b7cc..39fce2b7cc 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/user_config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/dfu/user_config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid/USB_Config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid/USB_Config.h
index 8c06a60b9f..8c06a60b9f 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid/USB_Config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid/USB_Config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid/mouse_button.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid/mouse_button.c
index 5a9ff71c24..5a9ff71c24 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid/mouse_button.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid/mouse_button.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid/mouse_button.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid/mouse_button.h
index d61d8a71fb..d61d8a71fb 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid/mouse_button.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid/mouse_button.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid/usb_descriptor.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid/usb_descriptor.c
index 45dfd78fa8..45dfd78fa8 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid/usb_descriptor.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid/usb_descriptor.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid/usb_descriptor.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid/usb_descriptor.h
index 878e02e574..878e02e574 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid/usb_descriptor.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid/usb_descriptor.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid/user_config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid/user_config.h
index 40414b48bc..40414b48bc 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid/user_config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid/user_config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid_keyboard/USB_Config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid_keyboard/USB_Config.h
index f06c823b68..f06c823b68 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid_keyboard/USB_Config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid_keyboard/USB_Config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid_keyboard/keyboard.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid_keyboard/keyboard.c
index 5e59f6bb6d..5e59f6bb6d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid_keyboard/keyboard.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid_keyboard/keyboard.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid_keyboard/keyboard.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid_keyboard/keyboard.h
index b90c5c1410..b90c5c1410 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid_keyboard/keyboard.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid_keyboard/keyboard.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid_keyboard/usb_descriptor.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid_keyboard/usb_descriptor.c
index 75f4d8beb4..75f4d8beb4 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid_keyboard/usb_descriptor.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid_keyboard/usb_descriptor.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid_keyboard/usb_descriptor.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid_keyboard/usb_descriptor.h
index 11faeab8a3..11faeab8a3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid_keyboard/usb_descriptor.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid_keyboard/usb_descriptor.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid_keyboard/user_config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid_keyboard/user_config.h
index 9937dce3ff..9937dce3ff 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid_keyboard/user_config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/hid_keyboard/user_config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/USB_Config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/USB_Config.h
index 42bdf7fa23..42bdf7fa23 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/USB_Config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/USB_Config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/disk.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/disk.c
index 5e0b25ad85..5e0b25ad85 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/disk.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/disk.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/disk.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/disk.h
index 8e3e32c950..8e3e32c950 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/disk.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/disk.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/kinetis_sdhc/SD_esdhc_kinetis.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/kinetis_sdhc/SD_esdhc_kinetis.c
index 19d476cb66..19d476cb66 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/kinetis_sdhc/SD_esdhc_kinetis.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/kinetis_sdhc/SD_esdhc_kinetis.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/kinetis_sdhc/SD_esdhc_kinetis.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/kinetis_sdhc/SD_esdhc_kinetis.h
index 07cbdce217..07cbdce217 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/kinetis_sdhc/SD_esdhc_kinetis.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/kinetis_sdhc/SD_esdhc_kinetis.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/kinetis_sdhc/esdhc_kinetis.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/kinetis_sdhc/esdhc_kinetis.c
index b4536b6bfe..b4536b6bfe 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/kinetis_sdhc/esdhc_kinetis.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/kinetis_sdhc/esdhc_kinetis.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/kinetis_sdhc/esdhc_kinetis.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/kinetis_sdhc/esdhc_kinetis.h
index 0ec8f8f774..0ec8f8f774 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/kinetis_sdhc/esdhc_kinetis.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/kinetis_sdhc/esdhc_kinetis.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/usb_descriptor.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/usb_descriptor.c
index 4ffce0f554..4ffce0f554 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/usb_descriptor.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/usb_descriptor.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/usb_descriptor.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/usb_descriptor.h
index 916175b965..916175b965 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/usb_descriptor.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/usb_descriptor.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/user_config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/user_config.h
index 69a5085344..69a5085344 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/user_config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/msd/user_config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/USB_Config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/USB_Config.h
index d6316bc0c1..d6316bc0c1 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/USB_Config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/USB_Config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/ieee11073_nom_codes.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/ieee11073_nom_codes.h
index 7666797338..7666797338 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/ieee11073_nom_codes.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/ieee11073_nom_codes.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/ieee11073_phd_types.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/ieee11073_phd_types.h
index 0dc037bce9..0dc037bce9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/ieee11073_phd_types.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/ieee11073_phd_types.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/ieee11073_phd_types_kinetis.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/ieee11073_phd_types_kinetis.h
index c860c50169..c860c50169 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/ieee11073_phd_types_kinetis.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/ieee11073_phd_types_kinetis.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/phd_com_model.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/phd_com_model.c
index e7d4f7aa80..e7d4f7aa80 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/phd_com_model.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/phd_com_model.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/phd_com_model.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/phd_com_model.h
index f9767fb438..f9767fb438 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/phd_com_model.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/phd_com_model.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/phdc_app.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/phdc_app.c
index 2e57a7667e..2e57a7667e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/phdc_app.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/phdc_app.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/phdc_app.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/phdc_app.h
index 2b722da70c..2b722da70c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/phdc_app.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/phdc_app.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/usb_descriptor.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/usb_descriptor.c
index 78b07de83e..78b07de83e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/usb_descriptor.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/usb_descriptor.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/usb_descriptor.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/usb_descriptor.h
index 6e0891f225..6e0891f225 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/usb_descriptor.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/usb_descriptor.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/user_config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/user_config.h
index 4aab1c499f..4aab1c499f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/user_config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc/user_config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/USB_Config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/USB_Config.h
index d6316bc0c1..d6316bc0c1 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/USB_Config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/USB_Config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/ieee11073_nom_codes.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/ieee11073_nom_codes.h
index 7666797338..7666797338 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/ieee11073_nom_codes.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/ieee11073_nom_codes.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/ieee11073_phd_types.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/ieee11073_phd_types.h
index f2337b5c57..f2337b5c57 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/ieee11073_phd_types.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/ieee11073_phd_types.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/ieee11073_phd_types_kinetis.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/ieee11073_phd_types_kinetis.h
index 76d89355bb..76d89355bb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/ieee11073_phd_types_kinetis.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/ieee11073_phd_types_kinetis.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/phd_com_model.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/phd_com_model.c
index 3a056ed61e..3a056ed61e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/phd_com_model.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/phd_com_model.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/phd_com_model.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/phd_com_model.h
index 1593aff5ff..1593aff5ff 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/phd_com_model.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/phd_com_model.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/phd_device_spec.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/phd_device_spec.c
index 270448c2b8..270448c2b8 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/phd_device_spec.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/phd_device_spec.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/phd_device_spec.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/phd_device_spec.h
index 6c6317359b..6c6317359b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/phd_device_spec.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/phd_device_spec.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/phdc_app.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/phdc_app.c
index d89172265f..d89172265f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/phdc_app.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/phdc_app.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/phdc_app.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/phdc_app.h
index e288271abb..e288271abb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/phdc_app.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/phdc_app.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/usb_descriptor.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/usb_descriptor.c
index 853511af22..853511af22 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/usb_descriptor.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/usb_descriptor.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/usb_descriptor.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/usb_descriptor.h
index 4af0ff2b1c..4af0ff2b1c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/usb_descriptor.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/usb_descriptor.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/user_config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/user_config.h
index cfcc5b71ab..cfcc5b71ab 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/user_config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/phdc_multi_specialization/user_config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/FAT16.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/FAT16.c
index d0e58ab470..d0e58ab470 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/FAT16.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/FAT16.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/FAT16.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/FAT16.h
index 137c9dc601..137c9dc601 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/FAT16.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/FAT16.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/USB_Config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/USB_Config.h
index 45f1fc02e4..45f1fc02e4 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/USB_Config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/USB_Config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/disk.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/disk.c
index ecf486b20c..ecf486b20c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/disk.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/disk.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/disk.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/disk.h
index 1783fefce0..1783fefce0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/disk.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/disk.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/usb_descriptor.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/usb_descriptor.c
index ab7e405109..ab7e405109 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/usb_descriptor.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/usb_descriptor.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/usb_descriptor.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/usb_descriptor.h
index 706181b029..706181b029 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/usb_descriptor.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/usb_descriptor.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/user_config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/user_config.h
index bbebb0dc3e..bbebb0dc3e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/user_config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/sd_bootloader/user_config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/USB_Config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/USB_Config.h
index 3daa213de0..3daa213de0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/USB_Config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/USB_Config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/usb_descriptor.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/usb_descriptor.c
index 743c2a10e0..743c2a10e0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/usb_descriptor.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/usb_descriptor.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/usb_descriptor.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/usb_descriptor.h
index 87b3d96697..87b3d96697 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/usb_descriptor.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/usb_descriptor.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/user_config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/user_config.h
index 25b56a610d..25b56a610d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/user_config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/user_config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/video_data_kinetis_audio_solution.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/video_data_kinetis_audio_solution.c
index a3c7c8dc03..a3c7c8dc03 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/video_data_kinetis_audio_solution.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/video_data_kinetis_audio_solution.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/video_data_ski_176x144.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/video_data_ski_176x144.c
index a3441cdcf8..a3441cdcf8 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/video_data_ski_176x144.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/video_data_ski_176x144.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/video_data_terminator2_normal_176x144.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/video_data_terminator2_normal_176x144.c
index 6f501cd9bb..6f501cd9bb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/video_data_terminator2_normal_176x144.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/video_data_terminator2_normal_176x144.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/virtual_camera.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/virtual_camera.c
index 5ca10e48ac..5ca10e48ac 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/virtual_camera.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/virtual_camera.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/virtual_camera.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/virtual_camera.h
index d24ff8b7dd..d24ff8b7dd 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/virtual_camera.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera/virtual_camera.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD/USB_Config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD/USB_Config.h
index 50e7983005..50e7983005 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD/USB_Config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD/USB_Config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD/Virtual_camera_SD.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD/Virtual_camera_SD.c
index b9247fcab2..b9247fcab2 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD/Virtual_camera_SD.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD/Virtual_camera_SD.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD/Virtual_camera_SD.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD/Virtual_camera_SD.h
index 1b1b976233..1b1b976233 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD/Virtual_camera_SD.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD/Virtual_camera_SD.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD/usb_descriptor.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD/usb_descriptor.c
index e0b9d9f439..e0b9d9f439 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD/usb_descriptor.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD/usb_descriptor.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD/usb_descriptor.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD/usb_descriptor.h
index ee3c302aab..ee3c302aab 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD/usb_descriptor.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD/usb_descriptor.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD/user_config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD/user_config.h
index eeffa73cd4..eeffa73cd4 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD/user_config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD/user_config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/FAT16.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/FAT16.c
index 53dce3906b..53dce3906b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/FAT16.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/FAT16.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/FAT16.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/FAT16.h
index 137c9dc601..137c9dc601 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/FAT16.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/FAT16.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/USB_Config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/USB_Config.h
index 635522a1fc..635522a1fc 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/USB_Config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/USB_Config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/Virtual_camera_SD.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/Virtual_camera_SD.c
index 707764e658..707764e658 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/Virtual_camera_SD.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/Virtual_camera_SD.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/Virtual_camera_SD.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/Virtual_camera_SD.h
index ce35ead944..ce35ead944 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/Virtual_camera_SD.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/Virtual_camera_SD.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/usb_descriptor.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/usb_descriptor.c
index c01beae5be..c01beae5be 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/usb_descriptor.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/usb_descriptor.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/usb_descriptor.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/usb_descriptor.h
index 43a43e9f41..43a43e9f41 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/usb_descriptor.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/usb_descriptor.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/user_config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/user_config.h
index 51fe2db10a..51fe2db10a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/user_config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/user_config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/write_sd_data.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/write_sd_data.c
index 1eda0749bf..1eda0749bf 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/write_sd_data.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/write_sd_data.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/write_sd_data.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/write_sd_data.h
index e6e0f92007..e6e0f92007 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/write_sd_data.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/app/virtual_camera_SD_and_loader/write_sd_data.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_audio.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_audio.c
index b961534db3..b961534db3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_audio.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_audio.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_audio.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_audio.h
index 52720a36bf..52720a36bf 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_audio.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_audio.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_batt_chg.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_batt_chg.c
index 95fcc53532..95fcc53532 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_batt_chg.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_batt_chg.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_batt_chg.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_batt_chg.h
index 0d277a7b33..0d277a7b33 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_batt_chg.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_batt_chg.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_cdc.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_cdc.c
index 9d61dc01f3..9d61dc01f3 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_cdc.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_cdc.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_cdc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_cdc.h
index 952d1415a0..952d1415a0 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_cdc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_cdc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_cdc_pstn.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_cdc_pstn.c
index 35379a6380..35379a6380 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_cdc_pstn.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_cdc_pstn.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_cdc_pstn.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_cdc_pstn.h
index 9b1b2c7673..9b1b2c7673 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_cdc_pstn.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_cdc_pstn.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_composite.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_composite.c
index 1518486bb8..1518486bb8 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_composite.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_composite.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_composite.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_composite.h
index 9ccf1dfa84..9ccf1dfa84 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_composite.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_composite.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_dfu.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_dfu.c
index 446f23bce9..446f23bce9 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_dfu.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_dfu.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_dfu.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_dfu.h
index d817a15e43..d817a15e43 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_dfu.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_dfu.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_hid.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_hid.c
index 8e43e4af93..8e43e4af93 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_hid.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_hid.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_hid.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_hid.h
index cabb2b3bad..cabb2b3bad 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_hid.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_hid.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_msc.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_msc.c
index 1dffa02269..1dffa02269 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_msc.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_msc.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_msc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_msc.h
index 6d8836946e..6d8836946e 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_msc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_msc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_msc_scsi.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_msc_scsi.c
index 4adf83a71d..4adf83a71d 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_msc_scsi.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_msc_scsi.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_msc_scsi.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_msc_scsi.h
index 2968947e27..2968947e27 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_msc_scsi.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_msc_scsi.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_phdc.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_phdc.c
index 6c5f306353..6c5f306353 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_phdc.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_phdc.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_phdc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_phdc.h
index 83a149240e..83a149240e 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_phdc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_phdc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_video.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_video.c
index 7212746c97..7212746c97 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_video.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_video.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_video.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_video.h
index 655db2a580..655db2a580 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_video.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/class/usb_video.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/common/usb_class.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/common/usb_class.c
index 8ec55faf8e..8ec55faf8e 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/common/usb_class.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/common/usb_class.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/common/usb_class.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/common/usb_class.h
index 0bbf55679d..0bbf55679d 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/common/usb_class.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/common/usb_class.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/common/usb_descriptor.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/common/usb_descriptor.h
index 4912f1d81e..4912f1d81e 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/common/usb_descriptor.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/common/usb_descriptor.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/common/usb_framework.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/common/usb_framework.c
index b202526568..b202526568 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/common/usb_framework.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/common/usb_framework.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/common/usb_framework.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/common/usb_framework.h
index 708a58bf0f..708a58bf0f 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/common/usb_framework.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/common/usb_framework.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/common/user_config.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/common/user_config.h
index bb6a4f7dd2..bb6a4f7dd2 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/common/user_config.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/common/user_config.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/mx6x/usb_ch9.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/mx6x/usb_ch9.h
index 8feda063c0..8feda063c0 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/mx6x/usb_ch9.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/mx6x/usb_ch9.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/mx6x/usb_dci_imx6.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/mx6x/usb_dci_imx6.c
index 5c96cfa3d9..5c96cfa3d9 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/mx6x/usb_dci_imx6.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/mx6x/usb_dci_imx6.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/mx6x/usb_dciapi.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/mx6x/usb_dciapi.h
index 0c91b79f3f..0c91b79f3f 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/mx6x/usb_dciapi.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/mx6x/usb_dciapi.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/mx6x/usb_mx6.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/mx6x/usb_mx6.h
index 9d3a095cf4..9d3a095cf4 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/mx6x/usb_mx6.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/mx6x/usb_mx6.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/usb_devapi.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/usb_devapi.h
index 7b43085a13..7b43085a13 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/usb_devapi.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/usb_devapi.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/usb_driver.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/usb_driver.c
index f2bfaec7b6..f2bfaec7b6 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/usb_driver.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/usb_driver.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/usbevent.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/usbevent.c
index 9e55f79751..9e55f79751 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/usbevent.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/usbevent.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/usbevent.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/usbevent.h
index 1871f5e5f7..1871f5e5f7 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/usbevent.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Device/source/driver/usbevent.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/License.txt b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/License.txt
index d1991921a0..d1991921a0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/License.txt
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/License.txt
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Makefile
index 0c2efbc221..0c2efbc221 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/readme.txt b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/readme.txt
index 9207be51b2..9207be51b2 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/readme.txt
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/common/usb_stack/readme.txt
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/Makefile
index d6792871e8..d6792871e8 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/ccm_pll.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/ccm_pll.h
index 4bd4715c1c..4bd4715c1c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/ccm_pll.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/ccm_pll.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/cortex_a9.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/cortex_a9.h
index c445e4fb41..c445e4fb41 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/cortex_a9.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/cortex_a9.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/gic.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/gic.h
index f3eee8499c..f3eee8499c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/gic.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/gic.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/interrupt.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/interrupt.h
index 318e34f3bd..318e34f3bd 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/interrupt.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/interrupt.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/mmu.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/mmu.h
index 961c17f541..961c17f541 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/mmu.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/mmu.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/src/abort_handler.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/src/abort_handler.c
index 9202c5ad23..9202c5ad23 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/src/abort_handler.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/src/abort_handler.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/src/arm_abort.S b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/src/arm_abort.S
index 6e7351118f..6e7351118f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/src/arm_abort.S
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/src/arm_abort.S
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/src/arm_cp_registers.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/src/arm_cp_registers.h
index cce58197f3..cce58197f3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/src/arm_cp_registers.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/src/arm_cp_registers.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/src/armv7_cache.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/src/armv7_cache.c
index 39c168812b..39c168812b 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/src/armv7_cache.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/src/armv7_cache.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/src/ccm_pll.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/src/ccm_pll.c
index 9419d7e044..9419d7e044 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/src/ccm_pll.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/src/ccm_pll.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/src/cortexA9.s b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/src/cortexA9.s
index ce34242fc9..ce34242fc9 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/src/cortexA9.s
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/src/cortexA9.s
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/src/gic.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/src/gic.c
index 5249d76e4c..5249d76e4c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/src/gic.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/src/gic.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/src/gic_registers.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/src/gic_registers.h
index bf9a11851b..bf9a11851b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/src/gic_registers.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/src/gic_registers.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/src/interrupt.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/src/interrupt.c
index a774d8baec..a774d8baec 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/src/interrupt.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/src/interrupt.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/src/mmu.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/src/mmu.c
index fbef4f1d7c..fbef4f1d7c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/src/mmu.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/src/mmu.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/src/startup.S b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/src/startup.S
index 732688c44c..732688c44c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/src/startup.S
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/src/startup.S
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/src/vectors.S b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/src/vectors.S
index f923457646..f923457646 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/src/vectors.S
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/src/vectors.S
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/test/Makefile
index 95ebad33c8..95ebad33c8 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/test/gic_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/test/gic_test.c
index 7d66213c35..7d66213c35 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/core/test/gic_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/core/test/gic_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/Makefile
index 4d3b481f02..4d3b481f02 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/accelerometer/mma8451.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/accelerometer/mma8451.h
index c3d8ac2b73..c3d8ac2b73 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/accelerometer/mma8451.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/accelerometer/mma8451.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/accelerometer/src/mma8451.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/accelerometer/src/mma8451.c
index efdb53333a..efdb53333a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/accelerometer/src/mma8451.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/accelerometer/src/mma8451.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/accelerometer/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/accelerometer/test/Makefile
index da83178dfd..da83178dfd 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/accelerometer/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/accelerometer/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/accelerometer/test/accelerometer_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/accelerometer/test/accelerometer_test.c
index 4d7167f491..4d7167f491 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/accelerometer/test/accelerometer_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/accelerometer/test/accelerometer_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/audio.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/audio.h
index 26e097f75b..26e097f75b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/audio.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/audio.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/imx_audmux.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/imx_audmux.h
index c2a80a1bce..c2a80a1bce 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/imx_audmux.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/imx_audmux.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/snd_card.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/snd_card.h
index 07dcca6afd..07dcca6afd 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/snd_card.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/snd_card.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/cs42888.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/cs42888.c
index 1eb13b2150..1eb13b2150 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/cs42888.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/cs42888.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/cs42888.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/cs42888.h
index c09cbecf42..c09cbecf42 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/cs42888.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/cs42888.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx-ssi.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx-ssi.c
index 842d637bf0..842d637bf0 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx-ssi.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx-ssi.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx-ssi.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx-ssi.h
index abfba9de59..abfba9de59 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx-ssi.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx-ssi.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx_audmux.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx_audmux.c
index a4e9d1fb2f..a4e9d1fb2f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx_audmux.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx_audmux.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx_audmux_priv.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx_audmux_priv.h
index a2c1fe9e49..a2c1fe9e49 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx_audmux_priv.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx_audmux_priv.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx_esai.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx_esai.c
index 481a072858..481a072858 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx_esai.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx_esai.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx_esai.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx_esai.h
index c9415f2b05..c9415f2b05 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx_esai.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx_esai.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx_esai_priv.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx_esai_priv.h
index 72a6c0d2ec..72a6c0d2ec 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx_esai_priv.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx_esai_priv.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx_spdif.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx_spdif.c
index 2a49c826bf..2a49c826bf 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx_spdif.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx_spdif.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx_spdif.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx_spdif.h
index 66d25b680d..66d25b680d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx_spdif.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/imx_spdif.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/sgtl5000.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/sgtl5000.c
index 9df21ffbc6..9df21ffbc6 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/sgtl5000.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/sgtl5000.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/sgtl5000.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/sgtl5000.h
index de6bdbb491..de6bdbb491 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/sgtl5000.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/sgtl5000.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/sgtl5000_priv.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/sgtl5000_priv.h
index 42ba6b1845..42ba6b1845 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/sgtl5000_priv.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/sgtl5000_priv.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/snd_card.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/snd_card.c
index 2113fd2f39..2113fd2f39 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/snd_card.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/snd_card.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/wm8958_dac.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/wm8958_dac.c
index dc6099634d..dc6099634d 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/wm8958_dac.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/wm8958_dac.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/wm8958_dac.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/wm8958_dac.h
index 8c0a93e201..8c0a93e201 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/wm8958_dac.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/wm8958_dac.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/wm8962.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/wm8962.c
index 11a1ebb8c6..11a1ebb8c6 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/wm8962.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/wm8962.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/wm8962.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/wm8962.h
index 2e0f2458d1..2e0f2458d1 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/wm8962.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/src/wm8962.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/Makefile
index 57c2349dfb..57c2349dfb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/audio_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/audio_test.c
index 53a9085d37..53a9085d37 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/audio_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/audio_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/esai_playback.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/esai_playback.c
index 2c39de6785..2c39de6785 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/esai_playback.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/esai_playback.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/music.wav b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/music.wav
index bcfe157187..bcfe157187 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/music.wav
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/music.wav
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/spdif_playback.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/spdif_playback.c
index 03d648697e..03d648697e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/spdif_playback.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/spdif_playback.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/ssi_playback.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/ssi_playback.c
index f141743d03..f141743d03 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/ssi_playback.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/ssi_playback.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/wav_data.data b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/wav_data.data
index b01ace52bf..b01ace52bf 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/wav_data.data
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/wav_data.data
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/wav_file.S b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/wav_file.S
index ed5da48661..ed5da48661 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/wav_file.S
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/audio/test/wav_file.S
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/board_id/board_id.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/board_id/board_id.h
index 93c18b38e8..93c18b38e8 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/board_id/board_id.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/board_id/board_id.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/board_id/board_id_registers.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/board_id/board_id_registers.h
index 7aca267c34..7aca267c34 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/board_id/board_id_registers.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/board_id/board_id_registers.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/board_id/src/board_id.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/board_id/src/board_id.c
index f2997fc72a..f2997fc72a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/board_id/src/board_id.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/board_id/src/board_id.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/caam/caam.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/caam/caam.h
index 695ef5a057..695ef5a057 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/caam/caam.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/caam/caam.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/caam/src/caam.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/caam/src/caam.c
index 35a5f60a0c..35a5f60a0c 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/caam/src/caam.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/caam/src/caam.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/caam/src/caam_internal.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/caam/src/caam_internal.h
index e482214c82..e482214c82 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/caam/src/caam_internal.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/caam/src/caam_internal.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/caam/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/caam/test/Makefile
index 5944727a1e..5944727a1e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/caam/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/caam/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/caam/test/caam_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/caam/test/caam_test.c
index 6278e714bb..6278e714bb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/caam/test/caam_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/caam/test/caam_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/camera_def.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/camera_def.h
index 6fe5d2f847..6fe5d2f847 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/camera_def.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/camera_def.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/src/camera_profile.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/src/camera_profile.c
index 51099370df..51099370df 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/src/camera_profile.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/src/camera_profile.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/src/csi_drv.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/src/csi_drv.c
index 3ad0dc0dba..3ad0dc0dba 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/src/csi_drv.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/src/csi_drv.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/src/lightflash_drv.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/src/lightflash_drv.c
index 0e5f05539a..0e5f05539a 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/src/lightflash_drv.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/src/lightflash_drv.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/src/smd_sensor.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/src/smd_sensor.c
index 504d364d92..504d364d92 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/src/smd_sensor.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/src/smd_sensor.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/test/Makefile
index 7d4acf61e4..7d4acf61e4 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/test/adv7180_capture.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/test/adv7180_capture.c
index 3fe12c822c..3fe12c822c 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/test/adv7180_capture.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/test/adv7180_capture.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/test/camera_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/test/camera_test.c
index ce664fa709..ce664fa709 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/test/camera_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/test/camera_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/test/csi_sensor_capture.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/test/csi_sensor_capture.c
index 07be81ea01..07be81ea01 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/test/csi_sensor_capture.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/test/csi_sensor_capture.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/test/csi_test_mode.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/test/csi_test_mode.c
index 22ab76311e..22ab76311e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/test/csi_test_mode.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/test/csi_test_mode.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/test/sensor_capture.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/test/sensor_capture.c
index 8e18f2b8a0..8e18f2b8a0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/test/sensor_capture.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/camera/test/sensor_capture.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/cpu_utility.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/cpu_utility.h
index 928ddd4370..928ddd4370 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/cpu_utility.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/cpu_utility.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/src/cpu_get_cores.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/src/cpu_get_cores.c
index e271fa1234..e271fa1234 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/src/cpu_get_cores.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/src/cpu_get_cores.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/src/cpu_multicore.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/src/cpu_multicore.c
index 532f77a344..532f77a344 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/src/cpu_multicore.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/src/cpu_multicore.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/src/cpu_workpoint.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/src/cpu_workpoint.c
index 1163431abd..1163431abd 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/src/cpu_workpoint.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/src/cpu_workpoint.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/test/Makefile
index 0f68e66ce3..0f68e66ce3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/test/cpu_get_cores_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/test/cpu_get_cores_test.c
index 2a1cc0c836..2a1cc0c836 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/test/cpu_get_cores_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/test/cpu_get_cores_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/test/cpu_wp_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/test/cpu_wp_test.c
index 3d994c6181..3d994c6181 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/test/cpu_wp_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/test/cpu_wp_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/test/multicore_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/test/multicore_test.c
index 760e7352a8..760e7352a8 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/test/multicore_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/cpu_utility/test/multicore_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/dcp/dcp.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/dcp/dcp.h
index 191af9e091..191af9e091 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/dcp/dcp.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/dcp/dcp.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/dcp/src/dcp.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/dcp/src/dcp.c
index 933bd35e8c..933bd35e8c 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/dcp/src/dcp.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/dcp/src/dcp.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/dcp/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/dcp/test/Makefile
index d371bc6143..d371bc6143 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/dcp/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/dcp/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/dcp/test/dcp_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/dcp/test/dcp_test.c
index 89d62647df..89d62647df 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/dcp/test/dcp_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/dcp/test/dcp_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/eim_ifc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/eim_ifc.h
index b02bdaacf8..b02bdaacf8 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/eim_ifc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/eim_ifc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/src/eim.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/src/eim.c
index bc0310f4aa..bc0310f4aa 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/src/eim.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/src/eim.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/src/eim.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/src/eim.h
index 3a7d37ad82..3a7d37ad82 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/src/eim.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/src/eim.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/test/Makefile
index e89ad633ba..e89ad633ba 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/test/cfi_flash.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/test/cfi_flash.h
index 041817ed39..041817ed39 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/test/cfi_flash.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/test/cfi_flash.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/test/cfi_flash_api.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/test/cfi_flash_api.c
index dc5a324fe0..dc5a324fe0 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/test/cfi_flash_api.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/test/cfi_flash_api.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/test/cfi_flash_driver.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/test/cfi_flash_driver.c
index f0f963a4ae..f0f963a4ae 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/test/cfi_flash_driver.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/test/cfi_flash_driver.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/test/eim_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/test/eim_test.c
index 3e1cd19da8..3e1cd19da8 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/test/eim_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/eim/test/eim_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/enet/enet.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/enet/enet.h
index 954fe65d2e..954fe65d2e 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/enet/enet.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/enet/enet.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/enet/src/enet_drv.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/enet/src/enet_drv.c
index 7d8c0b216a..7d8c0b216a 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/enet/src/enet_drv.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/enet/src/enet_drv.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/enet/src/enet_private.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/enet/src/enet_private.h
index 61a133d2d7..61a133d2d7 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/enet/src/enet_private.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/enet/src/enet_private.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/enet/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/enet/test/Makefile
index 580120c12c..580120c12c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/enet/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/enet/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/enet/test/enet_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/enet/test/enet_test.c
index 3493e20247..3493e20247 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/enet/test/enet_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/enet/test/enet_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/epdc/epdc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/epdc/epdc.h
index 9d4d1b7b77..9d4d1b7b77 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/epdc/epdc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/epdc/epdc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/epdc/epdc_regs.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/epdc/epdc_regs.h
index 35bc2ca5fd..35bc2ca5fd 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/epdc/epdc_regs.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/epdc/epdc_regs.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/epdc/fsl_image.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/epdc/fsl_image.h
index 5b1469b4b9..5b1469b4b9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/epdc/fsl_image.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/epdc/fsl_image.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/epdc/src/mxc_epdc.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/epdc/src/mxc_epdc.c
index 4c3b94c3b7..4c3b94c3b7 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/epdc/src/mxc_epdc.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/epdc/src/mxc_epdc.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/epdc/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/epdc/test/Makefile
index 4d87d30fc5..4d87d30fc5 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/epdc/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/epdc/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/epdc/test/epdc_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/epdc/test/epdc_test.c
index 4ad1801911..4ad1801911 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/epdc/test/epdc_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/epdc/test/epdc_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/epdc/waveform_data.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/epdc/waveform_data.h
index 9b6d7b02ac..9b6d7b02ac 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/epdc/waveform_data.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/epdc/waveform_data.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/fec/fec.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/fec/fec.h
index 90429d5701..90429d5701 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/fec/fec.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/fec/fec.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/fec/src/fec_drv.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/fec/src/fec_drv.c
index 4c169eef4a..4c169eef4a 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/fec/src/fec_drv.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/fec/src/fec_drv.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/fec/src/fec_private.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/fec/src/fec_private.h
index 39defcc6ba..39defcc6ba 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/fec/src/fec_private.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/fec/src/fec_private.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/fec/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/fec/test/Makefile
index 3d4b2b1880..3d4b2b1880 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/fec/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/fec/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/fec/test/fec_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/fec/test/fec_test.c
index df7e3d8d06..df7e3d8d06 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/fec/test/fec_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/fec/test/fec_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/flexcan/flexcan.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/flexcan/flexcan.h
index 2d62af484b..2d62af484b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/flexcan/flexcan.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/flexcan/flexcan.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/flexcan/src/can.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/flexcan/src/can.c
index 7d44b66fd1..7d44b66fd1 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/flexcan/src/can.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/flexcan/src/can.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/flexcan/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/flexcan/test/Makefile
index 73c7ba060c..73c7ba060c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/flexcan/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/flexcan/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/flexcan/test/can_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/flexcan/test/can_test.c
index 9f6e626bd0..9f6e626bd0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/flexcan/test/can_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/flexcan/test/can_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/gpio.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/gpio.h
index a2aa6c7728..a2aa6c7728 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/gpio.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/gpio.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/gpio_pin.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/gpio_pin.h
index 74f87a0521..74f87a0521 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/gpio_pin.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/gpio_pin.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/src/gpio.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/src/gpio.c
index 230f8180ea..230f8180ea 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/src/gpio.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/src/gpio.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/src/gpio_map.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/src/gpio_map.h
index 542230d2ec..542230d2ec 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/src/gpio_map.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/src/gpio_map.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/src/gpio_pin.cpp b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/src/gpio_pin.cpp
index f5d534a0cb..f5d534a0cb 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/src/gpio_pin.cpp
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/src/gpio_pin.cpp
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/src/imx6dq_gpio_map.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/src/imx6dq_gpio_map.c
index a214c2e9ce..a214c2e9ce 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/src/imx6dq_gpio_map.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/src/imx6dq_gpio_map.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/src/imx6sdl_gpio_map.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/src/imx6sdl_gpio_map.c
index a214c2e9ce..a214c2e9ce 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/src/imx6sdl_gpio_map.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/src/imx6sdl_gpio_map.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/src/imx6sl_gpio_map.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/src/imx6sl_gpio_map.c
index f67adfbf92..f67adfbf92 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/src/imx6sl_gpio_map.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/src/imx6sl_gpio_map.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/test/Makefile
index 1425b7563d..1425b7563d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/test/gpio_led_test.cpp b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/test/gpio_led_test.cpp
index 9aa1abf3c1..9aa1abf3c1 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/test/gpio_led_test.cpp
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpio/test/gpio_led_test.cpp
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/bch_ecc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/bch_ecc.h
index 7e8373809b..7e8373809b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/bch_ecc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/bch_ecc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/gpmi.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/gpmi.h
index d18919d084..d18919d084 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/gpmi.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/gpmi.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/bch_ecc.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/bch_ecc.c
index ebc3614173..ebc3614173 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/bch_ecc.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/bch_ecc.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/gpmi.cpp b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/gpmi.cpp
index 21994d4863..21994d4863 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/gpmi.cpp
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/gpmi.cpp
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/gpmi_dma_components.cpp b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/gpmi_dma_components.cpp
index 50eee3a0bc..50eee3a0bc 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/gpmi_dma_components.cpp
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/gpmi_dma_components.cpp
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/gpmi_dma_isr.cpp b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/gpmi_dma_isr.cpp
index 4c81a0b4d4..4c81a0b4d4 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/gpmi_dma_isr.cpp
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/gpmi_dma_isr.cpp
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/gpmi_dma_sequences.cpp b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/gpmi_dma_sequences.cpp
index 0db08e2950..0db08e2950 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/gpmi_dma_sequences.cpp
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/gpmi_dma_sequences.cpp
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/gpmi_internal.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/gpmi_internal.h
index a4337252f2..a4337252f2 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/gpmi_internal.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/gpmi_internal.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/gpmi_nand_dma.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/gpmi_nand_dma.h
index 751687e7d7..751687e7d7 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/gpmi_nand_dma.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/gpmi_nand_dma.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/gpmi_nand_operations.cpp b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/gpmi_nand_operations.cpp
index c789eebeea..c789eebeea 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/gpmi_nand_operations.cpp
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/src/gpmi_nand_operations.cpp
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/test/Makefile
index 4a317bfab2..4a317bfab2 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/test/gpmi_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/test/gpmi_test.c
index eb9536a1ef..eb9536a1ef 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/test/gpmi_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/gpmi/test/gpmi_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/src/hdmi_common.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/src/hdmi_common.c
index 780e6f5fb3..780e6f5fb3 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/src/hdmi_common.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/src/hdmi_common.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/src/hdmi_tx.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/src/hdmi_tx.c
index 37b2bbd238..37b2bbd238 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/src/hdmi_tx.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/src/hdmi_tx.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/src/hdmi_tx.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/src/hdmi_tx.h
index 503629b364..503629b364 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/src/hdmi_tx.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/src/hdmi_tx.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/src/hdmi_tx_audio.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/src/hdmi_tx_audio.c
index 9446f2ec36..9446f2ec36 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/src/hdmi_tx_audio.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/src/hdmi_tx_audio.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/src/hdmi_tx_phy.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/src/hdmi_tx_phy.c
index d3b4e1e571..d3b4e1e571 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/src/hdmi_tx_phy.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/src/hdmi_tx_phy.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/test/Makefile
index 15c39bfb1b..15c39bfb1b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/test/hdmi_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/test/hdmi_test.c
index 427c4cb70d..427c4cb70d 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/test/hdmi_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/test/hdmi_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/test/init_dma_data.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/test/init_dma_data.c
index 2beb766061..2beb766061 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/test/init_dma_data.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/hdmi/test/init_dma_data.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/i2c_device.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/i2c_device.h
index 6dae31b88e..6dae31b88e 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/i2c_device.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/i2c_device.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/imx_i2c.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/imx_i2c.h
index 5f91a1a5f2..5f91a1a5f2 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/imx_i2c.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/imx_i2c.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/software_i2c_port.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/software_i2c_port.h
index 4a07d64e28..4a07d64e28 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/software_i2c_port.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/software_i2c_port.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/src/i2c_device.cpp b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/src/i2c_device.cpp
index 2429f3492a..2429f3492a 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/src/i2c_device.cpp
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/src/i2c_device.cpp
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/src/imx_i2c.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/src/imx_i2c.c
index ef5839d869..ef5839d869 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/src/imx_i2c.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/src/imx_i2c.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/src/imx_i2c_internal.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/src/imx_i2c_internal.h
index 142156c8f3..142156c8f3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/src/imx_i2c_internal.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/src/imx_i2c_internal.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/src/imx_i2c_slave.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/src/imx_i2c_slave.c
index ca1f7ae681..ca1f7ae681 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/src/imx_i2c_slave.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/src/imx_i2c_slave.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/src/software_i2c_port.cpp b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/src/software_i2c_port.cpp
index 7630e93b8c..7630e93b8c 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/src/software_i2c_port.cpp
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/src/software_i2c_port.cpp
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/test/Makefile
index 46cc3212cf..46cc3212cf 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/test/at24cxx.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/test/at24cxx.c
index c35dfb43f7..c35dfb43f7 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/test/at24cxx.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/test/at24cxx.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/test/i2c_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/test/i2c_test.c
index bb85444978..bb85444978 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/test/i2c_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/test/i2c_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/test/imx6_i2c_device.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/test/imx6_i2c_device.c
index 9b4eb6d60a..9b4eb6d60a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/test/imx6_i2c_device.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/i2c/test/imx6_i2c_device.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/ipu_common.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/ipu_common.h
index 2ba51e9d7f..2ba51e9d7f 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/ipu_common.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/ipu_common.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ips_disp_panel.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ips_disp_panel.c
index 5bde8e2075..5bde8e2075 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ips_disp_panel.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ips_disp_panel.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_common.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_common.c
index f77ca8cadc..f77ca8cadc 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_common.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_common.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_csi.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_csi.c
index 2fb2444279..2fb2444279 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_csi.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_csi.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_dc.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_dc.c
index 408d18fe85..408d18fe85 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_dc.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_dc.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_di.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_di.c
index 2adf613d8e..2adf613d8e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_di.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_di.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_dmfc.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_dmfc.c
index 317a8bd255..317a8bd255 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_dmfc.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_dmfc.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_dp.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_dp.c
index 36d9f9d365..36d9f9d365 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_dp.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_dp.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_ic.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_ic.c
index 14add06d70..14add06d70 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_ic.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_ic.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_idmac.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_idmac.c
index 8e87508bad..8e87508bad 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_idmac.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_idmac.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_vdi.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_vdi.c
index 6c0c00f876..6c0c00f876 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_vdi.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/src/ipu_vdi.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/Makefile
index 2d7c4dd7c9..2d7c4dd7c9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ips_combiner.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ips_combiner.c
index 97ed0fb58b..97ed0fb58b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ips_combiner.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ips_combiner.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ips_csc.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ips_csc.c
index c20e583518..c20e583518 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ips_csc.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ips_csc.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ips_display.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ips_display.c
index 209b7b54bb..209b7b54bb 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ips_display.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ips_display.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ips_resize.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ips_resize.c
index 1a00ab74d8..1a00ab74d8 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ips_resize.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ips_resize.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ips_rotate.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ips_rotate.c
index 5b51de2463..5b51de2463 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ips_rotate.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ips_rotate.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ips_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ips_test.c
index 4e31e40fb1..4e31e40fb1 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ips_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ips_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ips_test.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ips_test.h
index 11fc0cf90a..11fc0cf90a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ips_test.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ips_test.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ipu_image.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ipu_image.c
index d41d5a014b..d41d5a014b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ipu_image.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ipu/test/ipu_image.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/keypad/keypad_port.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/keypad/keypad_port.h
index 06a152c017..06a152c017 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/keypad/keypad_port.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/keypad/keypad_port.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/keypad/src/keypad_port.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/keypad/src/keypad_port.c
index 7bf5b59c45..7bf5b59c45 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/keypad/src/keypad_port.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/keypad/src/keypad_port.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/keypad/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/keypad/test/Makefile
index 8e160be864..8e160be864 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/keypad/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/keypad/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/keypad/test/keypad_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/keypad/test/keypad_test.c
index 3e16afd77a..3e16afd77a 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/keypad/test/keypad_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/keypad/test/keypad_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/keypad/test/keypad_test.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/keypad/test/keypad_test.h
index 6b808e5072..6b808e5072 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/keypad/test/keypad_test.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/keypad/test/keypad_test.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/lcdif/lcdif_common.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/lcdif/lcdif_common.h
index 150c27c719..150c27c719 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/lcdif/lcdif_common.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/lcdif/lcdif_common.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/lcdif/src/lcdif_drv.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/lcdif/src/lcdif_drv.c
index 86cab4c167..86cab4c167 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/lcdif/src/lcdif_drv.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/lcdif/src/lcdif_drv.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/lcdif/src/pxp_drv.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/lcdif/src/pxp_drv.c
index e739c25098..e739c25098 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/lcdif/src/pxp_drv.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/lcdif/src/pxp_drv.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/lcdif/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/lcdif/test/Makefile
index 3ed717a4cd..3ed717a4cd 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/lcdif/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/lcdif/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/lcdif/test/lcdif_display.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/lcdif/test/lcdif_display.c
index f9fec0bc96..f9fec0bc96 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/lcdif/test/lcdif_display.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/lcdif/test/lcdif_display.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/lcdif/test/lcdif_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/lcdif/test/lcdif_test.c
index 62bc8c0a39..62bc8c0a39 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/lcdif/test/lcdif_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/lcdif/test/lcdif_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ldb/ldb_def.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ldb/ldb_def.h
index 849197a243..849197a243 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ldb/ldb_def.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ldb/ldb_def.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ldb/src/ldb.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ldb/src/ldb.c
index 3064513200..3064513200 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ldb/src/ldb.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ldb/src/ldb.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/mipi_common.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/mipi_common.h
index ed603cb3ff..ed603cb3ff 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/mipi_common.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/mipi_common.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/src/mipi_csi2_common.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/src/mipi_csi2_common.c
index b6e80943b6..b6e80943b6 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/src/mipi_csi2_common.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/src/mipi_csi2_common.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/src/mipi_dsi_common.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/src/mipi_dsi_common.c
index 0179794af5..0179794af5 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/src/mipi_dsi_common.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/src/mipi_dsi_common.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/src/ov5640_mipi_fm.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/src/ov5640_mipi_fm.c
index 7f2f864dba..7f2f864dba 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/src/ov5640_mipi_fm.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/src/ov5640_mipi_fm.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/src/truly_hx8369.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/src/truly_hx8369.h
index a7cc149d56..a7cc149d56 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/src/truly_hx8369.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/src/truly_hx8369.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/test/Makefile
index e258d27c2b..e258d27c2b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/test/mipi_csi2_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/test/mipi_csi2_test.c
index f4212aefad..f4212aefad 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/test/mipi_csi2_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/test/mipi_csi2_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/test/mipi_dsi_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/test/mipi_dsi_test.c
index 55b8943a56..55b8943a56 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/test/mipi_dsi_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/test/mipi_dsi_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/test/mipi_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/test/mipi_test.c
index 324a3ee1cf..324a3ee1cf 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/test/mipi_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/mipi/test/mipi_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ocotp/ocotp.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ocotp/ocotp.h
index dbe3b0bacc..dbe3b0bacc 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ocotp/ocotp.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ocotp/ocotp.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ocotp/src/ocotp.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ocotp/src/ocotp.c
index 508255fdb8..508255fdb8 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ocotp/src/ocotp.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ocotp/src/ocotp.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ocotp/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ocotp/test/Makefile
index 0259afdccf..0259afdccf 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ocotp/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ocotp/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ocotp/test/ocotp_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ocotp/test/ocotp_test.c
index a0ba6627da..a0ba6627da 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/ocotp/test/ocotp_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/ocotp/test/ocotp_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/pcie_common.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/pcie_common.h
index df047eee48..df047eee48 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/pcie_common.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/pcie_common.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/pcie_phy.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/pcie_phy.h
index fbe755442d..fbe755442d 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/pcie_phy.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/pcie_phy.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/pcie_prot.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/pcie_prot.h
index cf29e383fd..cf29e383fd 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/pcie_prot.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/pcie_prot.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/src/pcie.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/src/pcie.c
index beafd47486..beafd47486 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/src/pcie.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/src/pcie.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/src/pcie_phy.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/src/pcie_phy.c
index 1987774297..1987774297 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/src/pcie_phy.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/src/pcie_phy.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/src/pcie_prot.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/src/pcie_prot.c
index 12813acc2d..12813acc2d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/src/pcie_prot.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/src/pcie_prot.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/test/Makefile
index 5a41b6dbfa..5a41b6dbfa 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/test/pcie_test_rc.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/test/pcie_test_rc.c
index 1ad8f14aac..1ad8f14aac 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/test/pcie_test_rc.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pcie/test/pcie_test_rc.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pmu/pmu_driver.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pmu/pmu_driver.h
index 98bfe0ccbc..98bfe0ccbc 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pmu/pmu_driver.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pmu/pmu_driver.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pmu/src/pmu_driver.cpp b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pmu/src/pmu_driver.cpp
index 8dfd95278d..8dfd95278d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pmu/src/pmu_driver.cpp
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pmu/src/pmu_driver.cpp
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pmu/src/pmu_driver_internal.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pmu/src/pmu_driver_internal.h
index f45f2f4251..f45f2f4251 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pmu/src/pmu_driver_internal.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pmu/src/pmu_driver_internal.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pmu/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pmu/test/Makefile
index fafe66ae46..fafe66ae46 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pmu/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pmu/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pmu/test/pmu_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pmu/test/pmu_test.c
index 837ccd4b7b..837ccd4b7b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pmu/test/pmu_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pmu/test/pmu_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pwm/pwm_ifc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pwm/pwm_ifc.h
index ce852ae02f..ce852ae02f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pwm/pwm_ifc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pwm/pwm_ifc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pwm/src/pwm.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pwm/src/pwm.c
index 9c39a6fff0..9c39a6fff0 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pwm/src/pwm.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pwm/src/pwm.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pwm/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pwm/test/Makefile
index b55d44f73c..b55d44f73c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pwm/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pwm/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pwm/test/pwm_output.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pwm/test/pwm_output.c
index c9235974bc..c9235974bc 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pwm/test/pwm_output.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pwm/test/pwm_output.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pwm/test/pwm_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pwm/test/pwm_test.c
index 868118af4a..868118af4a 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/pwm/test/pwm_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/pwm/test/pwm_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/rtc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/rtc.h
index 8b8bde7b12..8b8bde7b12 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/rtc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/rtc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/src/rtc.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/src/rtc.c
index 556a0390d9..556a0390d9 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/src/rtc.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/src/rtc.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/src/srtc.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/src/srtc.c
index fd4167516d..fd4167516d 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/src/srtc.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/src/srtc.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/srtc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/srtc.h
index 0abc2aae37..0abc2aae37 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/srtc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/srtc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/test/Makefile
index 3994f92831..3994f92831 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/test/snvs_rtc_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/test/snvs_rtc_test.c
index e368114b2d..e368114b2d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/test/snvs_rtc_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/test/snvs_rtc_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/test/snvs_rtc_test.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/test/snvs_rtc_test.h
index 4f322f28b3..4f322f28b3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/test/snvs_rtc_test.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/test/snvs_rtc_test.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/test/snvs_srtc_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/test/snvs_srtc_test.c
index e98f73003e..e98f73003e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/test/snvs_srtc_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/test/snvs_srtc_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/test/snvs_srtc_test.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/test/snvs_srtc_test.h
index 6e1f8d6815..6e1f8d6815 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/test/snvs_srtc_test.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/rtc/test/snvs_srtc_test.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sata/imx_sata.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sata/imx_sata.h
index f9270ba95c..f9270ba95c 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sata/imx_sata.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sata/imx_sata.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sata/src/atapi.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sata/src/atapi.h
index 2add5524b0..2add5524b0 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sata/src/atapi.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sata/src/atapi.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sata/src/sata.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sata/src/sata.c
index 24942ec8b6..24942ec8b6 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sata/src/sata.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sata/src/sata.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sata/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sata/test/Makefile
index 6949b97fbe..6949b97fbe 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sata/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sata/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sata/test/sata_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sata/test/sata_test.c
index b787010b8c..b787010b8c 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sata/test/sata_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sata/test/sata_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/doc/SDMA SDK User Guide.doc b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/doc/SDMA SDK User Guide.doc
index 5a07b93c07..5a07b93c07 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/doc/SDMA SDK User Guide.doc
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/doc/SDMA SDK User Guide.doc
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/sdma.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/sdma.h
index c3d08c08e9..c3d08c08e9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/sdma.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/sdma.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/src/sdma.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/src/sdma.c
index 50573781a0..50573781a0 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/src/sdma.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/src/sdma.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/src/sdma_priv.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/src/sdma_priv.h
index 3a82928b3e..3a82928b3e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/src/sdma_priv.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/src/sdma_priv.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/src/sdma_script_code_mx6dq.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/src/sdma_script_code_mx6dq.h
index 3e11b36526..3e11b36526 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/src/sdma_script_code_mx6dq.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/src/sdma_script_code_mx6dq.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/src/sdma_script_code_mx6sdl.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/src/sdma_script_code_mx6sdl.h
index 3e11b36526..3e11b36526 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/src/sdma_script_code_mx6sdl.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/src/sdma_script_code_mx6sdl.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/src/sdma_script_info.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/src/sdma_script_info.c
index 031d735ab7..031d735ab7 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/src/sdma_script_info.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/src/sdma_script_info.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/src/sdma_script_info.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/src/sdma_script_info.h
index e704290186..e704290186 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/src/sdma_script_info.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/src/sdma_script_info.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/test/Makefile
index 213a87775b..213a87775b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/test/ecspi.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/test/ecspi.h
index a364ca045e..a364ca045e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/test/ecspi.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/test/ecspi.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/test/mem_2_mem.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/test/mem_2_mem.c
index c5dc58fa41..c5dc58fa41 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/test/mem_2_mem.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/test/mem_2_mem.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/test/sdma_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/test/sdma_test.c
index 0caa711e51..0caa711e51 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/test/sdma_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/test/sdma_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/test/sdma_test.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/test/sdma_test.h
index 6417642698..6417642698 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/test/sdma_test.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/test/sdma_test.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/test/spi_lpb.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/test/spi_lpb.c
index 17645fd10f..17645fd10f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/test/spi_lpb.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/test/spi_lpb.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/test/uart_loopback.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/test/uart_loopback.c
index 3e8658cea6..3e8658cea6 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/test/uart_loopback.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/sdma/test/uart_loopback.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/snvs/snvs.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/snvs/snvs.h
index 788d06b362..788d06b362 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/snvs/snvs.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/snvs/snvs.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/snvs/src/snvs.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/snvs/src/snvs.c
index 54867384c6..54867384c6 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/snvs/src/snvs.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/snvs/src/snvs.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spdc/spdc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spdc/spdc.h
index b67e2feb43..b67e2feb43 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spdc/spdc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spdc/spdc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spdc/spdc_regs.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spdc/spdc_regs.h
index cd7840690e..cd7840690e 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spdc/spdc_regs.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spdc/spdc_regs.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spdc/src/mxc_spdc.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spdc/src/mxc_spdc.c
index 3b8fcb701f..3b8fcb701f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spdc/src/mxc_spdc.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spdc/src/mxc_spdc.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spdc/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spdc/test/Makefile
index 3fff5c0f82..3fff5c0f82 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spdc/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spdc/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spdc/test/auo_lut.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spdc/test/auo_lut.c
index 2c32c668b1..2c32c668b1 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spdc/test/auo_lut.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spdc/test/auo_lut.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spdc/test/spdc_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spdc/test/spdc_test.c
index d9cb8890dd..d9cb8890dd 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spdc/test/spdc_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spdc/test/spdc_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/ecspi_ifc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/ecspi_ifc.h
index 43687d091c..43687d091c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/ecspi_ifc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/ecspi_ifc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/spi_device.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/spi_device.h
index 0bef001a9b..0bef001a9b 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/spi_device.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/spi_device.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/src/ecspi.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/src/ecspi.c
index b483bfa17e..b483bfa17e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/src/ecspi.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/src/ecspi.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/src/spi_device.cpp b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/src/spi_device.cpp
index f25ebf1aa1..f25ebf1aa1 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/src/spi_device.cpp
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/src/spi_device.cpp
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/test/Makefile
index ebe2a374e0..ebe2a374e0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/test/imx_spi_nor_atmel.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/test/imx_spi_nor_atmel.c
index 424abddeb6..424abddeb6 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/test/imx_spi_nor_atmel.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/test/imx_spi_nor_atmel.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/test/imx_spi_nor_atmel.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/test/imx_spi_nor_atmel.h
index 41474e0b1a..41474e0b1a 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/test/imx_spi_nor_atmel.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/test/imx_spi_nor_atmel.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/test/spi_nor_numonyx.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/test/spi_nor_numonyx.c
index d2c5de5521..d2c5de5521 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/test/spi_nor_numonyx.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/test/spi_nor_numonyx.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/test/spi_nor_numonyx.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/test/spi_nor_numonyx.h
index 594e73f568..594e73f568 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/test/spi_nor_numonyx.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/test/spi_nor_numonyx.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/test/spi_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/test/spi_test.c
index fbbe855eda..fbbe855eda 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/test/spi_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/test/spi_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/test/spi_test.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/test/spi_test.h
index bb68e8f4d4..bb68e8f4d4 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/test/spi_test.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/spi/test/spi_test.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/tempmon/src/tempmon.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/tempmon/src/tempmon.c
index 32e02200aa..32e02200aa 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/tempmon/src/tempmon.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/tempmon/src/tempmon.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/tempmon/tempmon.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/tempmon/tempmon.h
index 643dc69526..643dc69526 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/tempmon/tempmon.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/tempmon/tempmon.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/tempmon/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/tempmon/test/Makefile
index b35dea71e3..b35dea71e3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/tempmon/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/tempmon/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/tempmon/test/tempmon_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/tempmon/test/tempmon_test.c
index feff4f4014..feff4f4014 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/tempmon/test/tempmon_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/tempmon/test/tempmon_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/epit.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/epit.h
index 20f6acba6b..20f6acba6b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/epit.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/epit.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/gpt.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/gpt.h
index 1e29b43b08..1e29b43b08 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/gpt.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/gpt.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/src/epit.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/src/epit.c
index e9edab36db..e9edab36db 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/src/epit.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/src/epit.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/src/gpt.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/src/gpt.c
index a967eb7f70..a967eb7f70 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/src/gpt.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/src/gpt.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/src/timer.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/src/timer.c
index cb94bb8c37..cb94bb8c37 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/src/timer.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/src/timer.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/test/Makefile
index 71caaaec8f..71caaaec8f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/test/epit_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/test/epit_test.c
index ca1234c849..ca1234c849 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/test/epit_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/test/epit_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/test/epit_test.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/test/epit_test.h
index 46be7e6529..46be7e6529 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/test/epit_test.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/test/epit_test.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/test/gpt_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/test/gpt_test.c
index 08fd764390..08fd764390 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/test/gpt_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/test/gpt_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/test/gpt_test.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/test/gpt_test.h
index 710a58bbe2..710a58bbe2 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/test/gpt_test.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/test/gpt_test.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/test/timer_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/test/timer_test.c
index 372dee7698..372dee7698 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/test/timer_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/test/timer_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/timer.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/timer.h
index ab18823498..ab18823498 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/timer.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/timer/timer.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/uart/imx_uart.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/uart/imx_uart.h
index b663bdaef3..b663bdaef3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/uart/imx_uart.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/uart/imx_uart.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/uart/src/imx_uart.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/uart/src/imx_uart.c
index 4e5b143a47..4e5b143a47 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/uart/src/imx_uart.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/uart/src/imx_uart.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/uart/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/uart/test/Makefile
index 80c0024819..80c0024819 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/uart/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/uart/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/uart/test/uart_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/uart/test/uart_test.c
index 71f08ac37b..71f08ac37b 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/uart/test/uart_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/uart/test/uart_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/uart/test/uart_test.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/uart/test/uart_test.h
index 5f59869757..5f59869757 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/uart/test/uart_test.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/uart/test/uart_test.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/src/mx6x_usb.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/src/mx6x_usb.c
index 528e86c070..528e86c070 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/src/mx6x_usb.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/src/mx6x_usb.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/src/usb_common.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/src/usb_common.c
index 69a4d7807e..69a4d7807e 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/src/usb_common.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/src/usb_common.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/src/usbd_drv.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/src/usbd_drv.c
index abcff76ca7..abcff76ca7 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/src/usbd_drv.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/src/usbd_drv.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/src/usbh_drv.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/src/usbh_drv.c
index 0552427b5b..0552427b5b 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/src/usbh_drv.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/src/usbh_drv.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/test/Makefile
index 09abc40a06..09abc40a06 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/test/usb0_device_mouse_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/test/usb0_device_mouse_test.c
index b5c75950a3..b5c75950a3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/test/usb0_device_mouse_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/test/usb0_device_mouse_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/test/usb0_host_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/test/usb0_host_test.c
index bcb137de60..bcb137de60 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/test/usb0_host_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/test/usb0_host_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/test/usb0_host_testmodes_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/test/usb0_host_testmodes_test.c
index c7f83c0121..c7f83c0121 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/test/usb0_host_testmodes_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/test/usb0_host_testmodes_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/test/usb_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/test/usb_test.c
index 344a01e3c1..344a01e3c1 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/test/usb_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/test/usb_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/usb.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/usb.h
index 90b4921eca..90b4921eca 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/usb.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/usb.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/usb_defines.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/usb_defines.h
index 54ec0c68c8..54ec0c68c8 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/usb_defines.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/usb_defines.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/usb_registers.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/usb_registers.h
index 3804f342a4..3804f342a4 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/usb_registers.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usb/usb_registers.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/src/usdhc.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/src/usdhc.c
index 1f8508186d..1f8508186d 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/src/usdhc.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/src/usdhc.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/src/usdhc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/src/usdhc.h
index f74f1edf6e..f74f1edf6e 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/src/usdhc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/src/usdhc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/src/usdhc_host.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/src/usdhc_host.c
index cc2a66122c..cc2a66122c 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/src/usdhc_host.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/src/usdhc_host.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/src/usdhc_host.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/src/usdhc_host.h
index 77b0ad1e47..77b0ad1e47 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/src/usdhc_host.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/src/usdhc_host.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/src/usdhc_mmc.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/src/usdhc_mmc.c
index bdf61fab00..bdf61fab00 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/src/usdhc_mmc.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/src/usdhc_mmc.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/src/usdhc_mmc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/src/usdhc_mmc.h
index d6870a9530..d6870a9530 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/src/usdhc_mmc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/src/usdhc_mmc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/src/usdhc_sd.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/src/usdhc_sd.c
index 86944c7ac8..86944c7ac8 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/src/usdhc_sd.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/src/usdhc_sd.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/test/Makefile
index 4fba8ae736..4fba8ae736 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/test/usdhc_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/test/usdhc_test.c
index dc76f4fa65..dc76f4fa65 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/test/usdhc_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/test/usdhc_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/test/usdhc_test.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/test/usdhc_test.h
index 192aa11eec..192aa11eec 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/test/usdhc_test.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/test/usdhc_test.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/usdhc_ifc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/usdhc_ifc.h
index 75436ae307..75436ae307 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/usdhc_ifc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/usdhc/usdhc_ifc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vdoa/src/vdoa.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vdoa/src/vdoa.c
index a01fd5816a..a01fd5816a 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vdoa/src/vdoa.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vdoa/src/vdoa.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vdoa/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vdoa/test/Makefile
index 41b24a20eb..41b24a20eb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vdoa/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vdoa/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vdoa/test/vdoa_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vdoa/test/vdoa_test.c
index 01b1480ca8..01b1480ca8 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vdoa/test/vdoa_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vdoa/test/vdoa_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vdoa/vdoa.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vdoa/vdoa.h
index 989c1bab0f..989c1bab0f 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vdoa/vdoa.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vdoa/vdoa.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/video/adv7180_def.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/video/adv7180_def.h
index 8eea426158..8eea426158 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/video/adv7180_def.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/video/adv7180_def.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/video/src/adv7180.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/video/src/adv7180.c
index 920bb0e8ee..920bb0e8ee 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/video/src/adv7180.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/video/src/adv7180.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/src/BitAsmTable_CODA_960.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/src/BitAsmTable_CODA_960.h
index b56e1fe42c..b56e1fe42c 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/src/BitAsmTable_CODA_960.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/src/BitAsmTable_CODA_960.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/src/vpu_gdi.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/src/vpu_gdi.c
index f943cf2f89..f943cf2f89 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/src/vpu_gdi.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/src/vpu_gdi.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/src/vpu_io.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/src/vpu_io.c
index d301a083b6..d301a083b6 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/src/vpu_io.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/src/vpu_io.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/src/vpu_lib.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/src/vpu_lib.c
index df3eaca600..df3eaca600 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/src/vpu_lib.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/src/vpu_lib.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/src/vpu_util.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/src/vpu_util.c
index d0d29bac3b..d0d29bac3b 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/src/vpu_util.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/src/vpu_util.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/test/Makefile
index 285d7805d2..285d7805d2 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/test/dec.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/test/dec.c
index 8e151d9663..8e151d9663 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/test/dec.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/test/dec.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/test/enc.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/test/enc.c
index 9dc3c64a8f..9dc3c64a8f 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/test/enc.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/test/enc.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/test/fb.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/test/fb.c
index 253c7da4d1..253c7da4d1 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/test/fb.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/test/fb.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/test/utils.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/test/utils.c
index 852515ece7..852515ece7 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/test/utils.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/test/utils.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/test/vpu_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/test/vpu_test.c
index 93b622cf64..93b622cf64 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/test/vpu_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/test/vpu_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/test/vpu_test.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/test/vpu_test.h
index 2c00d0c35c..2c00d0c35c 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/test/vpu_test.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/test/vpu_test.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/vpu_debug.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/vpu_debug.h
index 13eeb1ba5c..13eeb1ba5c 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/vpu_debug.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/vpu_debug.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/vpu_gdi.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/vpu_gdi.h
index 3e9853f70c..3e9853f70c 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/vpu_gdi.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/vpu_gdi.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/vpu_io.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/vpu_io.h
index c293092b30..c293092b30 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/vpu_io.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/vpu_io.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/vpu_lib.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/vpu_lib.h
index 99a49430a3..99a49430a3 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/vpu_lib.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/vpu_lib.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/vpu_reg.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/vpu_reg.h
index 6a666943ef..6a666943ef 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/vpu_reg.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/vpu_reg.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/vpu_util.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/vpu_util.h
index b503e8a85c..b503e8a85c 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/vpu_util.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/vpu/vpu_util.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/wdog/test/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/wdog/test/Makefile
index 57da3eda17..57da3eda17 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/wdog/test/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/wdog/test/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/wdog/test/watchdog_test.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/wdog/test/watchdog_test.c
index 9b20b5e3d3..9b20b5e3d3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/wdog/test/watchdog_test.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/wdog/test/watchdog_test.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/wdog/watchdog.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/wdog/watchdog.h
index f8cbd7e4d9..f8cbd7e4d9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/drivers/wdog/watchdog.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/drivers/wdog/watchdog.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/asm_defines.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/asm_defines.h
index beee15cb1b..beee15cb1b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/asm_defines.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/asm_defines.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/hab_defines.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/hab_defines.h
index 1fcf5d5444..1fcf5d5444 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/hab_defines.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/hab_defines.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/io.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/io.h
index e4f2dc595a..e4f2dc595a 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/io.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/io.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/logo.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/logo.h
index 68037d4466..68037d4466 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/logo.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/logo.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/hdmi_regs.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/hdmi_regs.h
index f3479ba3dc..f3479ba3dc 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/hdmi_regs.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/hdmi_regs.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/iomux_define.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/iomux_define.h
index 908b265c43..908b265c43 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/iomux_define.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/iomux_define.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/iomux_register.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/iomux_register.h
index 17868c97ae..17868c97ae 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/iomux_register.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/iomux_register.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/ipu_reg_def.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/ipu_reg_def.h
index 8443cb62b9..8443cb62b9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/ipu_reg_def.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/ipu_reg_def.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/irq_numbers.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/irq_numbers.h
index fdaf576663..fdaf576663 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/irq_numbers.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/irq_numbers.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers.h
index 401f26b1ab..401f26b1ab 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regs.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regs.h
index fe0b81e486..fe0b81e486 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regs.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regs.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsaipstz.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsaipstz.h
index 38a723b71d..38a723b71d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsaipstz.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsaipstz.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsapbh.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsapbh.h
index 2dccb144e6..2dccb144e6 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsapbh.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsapbh.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsarmglobaltimer.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsarmglobaltimer.h
index be3ac52d89..be3ac52d89 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsarmglobaltimer.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsarmglobaltimer.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsasrc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsasrc.h
index 8e71deaefe..8e71deaefe 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsasrc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsasrc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsaudmux.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsaudmux.h
index 175b1ec3c0..175b1ec3c0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsaudmux.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsaudmux.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsbch.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsbch.h
index 2024b1a59b..2024b1a59b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsbch.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsbch.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsccm.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsccm.h
index 75352f7173..75352f7173 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsccm.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsccm.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsccmanalog.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsccmanalog.h
index ea84b90b51..ea84b90b51 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsccmanalog.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsccmanalog.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regscsi2ipu.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regscsi2ipu.h
index 9bee6602a7..9bee6602a7 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regscsi2ipu.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regscsi2ipu.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regscsu.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regscsu.h
index 13ce74fd61..13ce74fd61 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regscsu.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regscsu.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsdcic.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsdcic.h
index 6422f677eb..6422f677eb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsdcic.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsdcic.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsdvfs.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsdvfs.h
index 5677168091..5677168091 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsdvfs.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsdvfs.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsecspi.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsecspi.h
index 06c5de5225..06c5de5225 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsecspi.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsecspi.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regseim.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regseim.h
index 2fa3dfa423..2fa3dfa423 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regseim.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regseim.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsenet.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsenet.h
index c6cb17fd8a..c6cb17fd8a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsenet.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsenet.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsepit.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsepit.h
index fd4633f108..fd4633f108 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsepit.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsepit.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsesai.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsesai.h
index 9674ff3c87..9674ff3c87 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsesai.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsesai.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsflexcan.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsflexcan.h
index f4c42490fd..f4c42490fd 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsflexcan.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsflexcan.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsgpc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsgpc.h
index 6736e668ee..6736e668ee 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsgpc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsgpc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsgpio.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsgpio.h
index 4f5ed8abdf..4f5ed8abdf 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsgpio.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsgpio.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsgpmi.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsgpmi.h
index 35d73eb8cc..35d73eb8cc 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsgpmi.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsgpmi.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsgpt.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsgpt.h
index 57a0fac354..57a0fac354 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsgpt.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsgpt.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsgpu2d.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsgpu2d.h
index e63922a972..e63922a972 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsgpu2d.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsgpu2d.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsgpu3d.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsgpu3d.h
index 269c287729..269c287729 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsgpu3d.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsgpu3d.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regshdmi.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regshdmi.h
index 68bf172e56..68bf172e56 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regshdmi.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regshdmi.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regshdmiphy.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regshdmiphy.h
index b21398ab71..b21398ab71 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regshdmiphy.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regshdmiphy.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsi2c.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsi2c.h
index 7331b49143..7331b49143 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsi2c.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsi2c.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsiomuxc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsiomuxc.h
index 4493edbfb8..4493edbfb8 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsiomuxc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsiomuxc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsipu.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsipu.h
index 766f61abcf..766f61abcf 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsipu.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsipu.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regskpp.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regskpp.h
index 70c5faae53..70c5faae53 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regskpp.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regskpp.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsldb.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsldb.h
index 5c8f2b7bc8..5c8f2b7bc8 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsldb.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsldb.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsmipicsi.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsmipicsi.h
index 608089758f..608089758f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsmipicsi.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsmipicsi.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsmipidsi.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsmipidsi.h
index 79a73e6dd9..79a73e6dd9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsmipidsi.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsmipidsi.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsmipihsi.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsmipihsi.h
index d9b3acdbc5..d9b3acdbc5 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsmipihsi.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsmipihsi.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsmlb150.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsmlb150.h
index a5fda4fbfb..a5fda4fbfb 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsmlb150.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsmlb150.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsmmdc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsmmdc.h
index 577388dc6d..577388dc6d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsmmdc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsmmdc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsocotp.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsocotp.h
index a54f357cba..a54f357cba 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsocotp.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsocotp.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regspcieep.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regspcieep.h
index 01abbe688a..01abbe688a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regspcieep.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regspcieep.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regspciephy.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regspciephy.h
index 11aa5b2df8..11aa5b2df8 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regspciephy.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regspciephy.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regspciepl.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regspciepl.h
index 3ceea7aa86..3ceea7aa86 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regspciepl.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regspciepl.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regspcierc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regspcierc.h
index a696b97f53..a696b97f53 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regspcierc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regspcierc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regspgc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regspgc.h
index e43a7a00f8..e43a7a00f8 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regspgc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regspgc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regspmu.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regspmu.h
index f24b4dd79b..f24b4dd79b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regspmu.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regspmu.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regspwm.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regspwm.h
index e8e10714e7..e8e10714e7 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regspwm.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regspwm.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsromc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsromc.h
index 6cd95eba2b..6cd95eba2b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsromc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsromc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssata.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssata.h
index f490ac2e31..f490ac2e31 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssata.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssata.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssataphyclock.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssataphyclock.h
index 4e6cf1328d..4e6cf1328d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssataphyclock.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssataphyclock.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssataphylane.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssataphylane.h
index d6c191ed96..d6c191ed96 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssataphylane.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssataphylane.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssdmaarm.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssdmaarm.h
index c9364b4baf..c9364b4baf 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssdmaarm.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssdmaarm.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssdmabp.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssdmabp.h
index d10c84749c..d10c84749c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssdmabp.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssdmabp.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssdmacore.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssdmacore.h
index e2e5cf1fdd..e2e5cf1fdd 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssdmacore.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssdmacore.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssjc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssjc.h
index fd03d50cda..fd03d50cda 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssjc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssjc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssnvs.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssnvs.h
index fa4d550d65..fa4d550d65 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssnvs.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssnvs.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsspba.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsspba.h
index 191da87857..191da87857 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsspba.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsspba.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsspdif.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsspdif.h
index f0f81d5438..f0f81d5438 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsspdif.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsspdif.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssrc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssrc.h
index e41b9dac0b..e41b9dac0b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssrc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regssrc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsssi.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsssi.h
index a186f97168..a186f97168 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsssi.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsssi.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regstempmon.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regstempmon.h
index 025d5456b6..025d5456b6 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regstempmon.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regstempmon.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsuart.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsuart.h
index e76c38c470..e76c38c470 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsuart.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsuart.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsusbanalog.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsusbanalog.h
index 6cfe9166ca..6cfe9166ca 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsusbanalog.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsusbanalog.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsusbcore.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsusbcore.h
index 85ce939e08..85ce939e08 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsusbcore.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsusbcore.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsusbnoncore.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsusbnoncore.h
index 2faa230ee1..2faa230ee1 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsusbnoncore.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsusbnoncore.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsusbphy.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsusbphy.h
index 422ca97a21..422ca97a21 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsusbphy.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsusbphy.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsusdhc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsusdhc.h
index dbda424b87..dbda424b87 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsusdhc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsusdhc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsvdoa.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsvdoa.h
index 44fdf26f24..44fdf26f24 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsvdoa.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsvdoa.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsvpu.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsvpu.h
index fe3d029478..fe3d029478 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsvpu.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsvpu.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regswdog.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regswdog.h
index 06757dd25a..06757dd25a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regswdog.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regswdog.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsxtalosc24.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsxtalosc24.h
index 479b49d9bc..479b49d9bc 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsxtalosc24.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/registers/regsxtalosc24.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/sdma_event.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/sdma_event.h
index c26d700c8a..c26d700c8a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/sdma_event.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/sdma_event.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/soc_memory_map.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/soc_memory_map.h
index 759b8a51c9..759b8a51c9 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/soc_memory_map.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6dq/soc_memory_map.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/hdmi_regs.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/hdmi_regs.h
index f3479ba3dc..f3479ba3dc 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/hdmi_regs.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/hdmi_regs.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/iomux_define.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/iomux_define.h
index 10b2bec436..10b2bec436 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/iomux_define.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/iomux_define.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/iomux_register.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/iomux_register.h
index 26914386e3..26914386e3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/iomux_register.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/iomux_register.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/ipu_reg_def.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/ipu_reg_def.h
index dd4bf2b3e0..dd4bf2b3e0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/ipu_reg_def.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/ipu_reg_def.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/irq_numbers.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/irq_numbers.h
index fdaf576663..fdaf576663 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/irq_numbers.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/irq_numbers.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers.h
index 8b3ddf2806..8b3ddf2806 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regs.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regs.h
index fe0b81e486..fe0b81e486 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regs.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regs.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsaipstz.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsaipstz.h
index de10f9d8c8..de10f9d8c8 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsaipstz.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsaipstz.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsapbh.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsapbh.h
index 2dccb144e6..2dccb144e6 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsapbh.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsapbh.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsarmglobaltimer.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsarmglobaltimer.h
index c63659b996..c63659b996 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsarmglobaltimer.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsarmglobaltimer.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsasrc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsasrc.h
index a4dc191630..a4dc191630 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsasrc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsasrc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsaudmux.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsaudmux.h
index a766b80227..a766b80227 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsaudmux.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsaudmux.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsbch.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsbch.h
index 2024b1a59b..2024b1a59b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsbch.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsbch.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsccm.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsccm.h
index 2a1eff50bc..2a1eff50bc 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsccm.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsccm.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsccmanalog.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsccmanalog.h
index 2671b1355d..2671b1355d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsccmanalog.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsccmanalog.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regscsi2ipu.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regscsi2ipu.h
index 8b7094a511..8b7094a511 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regscsi2ipu.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regscsi2ipu.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regscsu.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regscsu.h
index e112c48cab..e112c48cab 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regscsu.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regscsu.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsdcic.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsdcic.h
index d90addcf73..d90addcf73 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsdcic.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsdcic.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsdvfs.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsdvfs.h
index 1b7088e7ad..1b7088e7ad 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsdvfs.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsdvfs.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsecspi.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsecspi.h
index bccccf325e..bccccf325e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsecspi.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsecspi.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regseim.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regseim.h
index de5fb839b8..de5fb839b8 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regseim.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regseim.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsenet.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsenet.h
index a1a238caf0..a1a238caf0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsenet.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsenet.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsepdc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsepdc.h
index 133a79bc2f..133a79bc2f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsepdc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsepdc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsepit.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsepit.h
index 2787bf9a31..2787bf9a31 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsepit.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsepit.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsesai.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsesai.h
index e155491bc2..e155491bc2 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsesai.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsesai.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsflexcan.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsflexcan.h
index ae8da9566f..ae8da9566f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsflexcan.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsflexcan.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsgpc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsgpc.h
index 90bb29e69e..90bb29e69e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsgpc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsgpc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsgpio.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsgpio.h
index 93dcf309c0..93dcf309c0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsgpio.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsgpio.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsgpmi.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsgpmi.h
index 35d73eb8cc..35d73eb8cc 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsgpmi.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsgpmi.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsgpt.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsgpt.h
index 905e140929..905e140929 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsgpt.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsgpt.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsgpu2d.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsgpu2d.h
index 85ba115c7e..85ba115c7e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsgpu2d.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsgpu2d.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsgpu3d.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsgpu3d.h
index a2ca487a08..a2ca487a08 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsgpu3d.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsgpu3d.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regshdmi.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regshdmi.h
index 03f360c7ec..03f360c7ec 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regshdmi.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regshdmi.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regshdmiphy.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regshdmiphy.h
index 23241c135a..23241c135a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regshdmiphy.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regshdmiphy.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsi2c.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsi2c.h
index 0ab3828248..0ab3828248 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsi2c.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsi2c.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsiomuxc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsiomuxc.h
index a06ddbc244..a06ddbc244 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsiomuxc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsiomuxc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsipu.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsipu.h
index 5e01f049a3..5e01f049a3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsipu.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsipu.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regskpp.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regskpp.h
index 01a2b8d82d..01a2b8d82d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regskpp.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regskpp.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsldb.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsldb.h
index 5a3ba45d48..5a3ba45d48 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsldb.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsldb.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsmipicsi.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsmipicsi.h
index fdd76bceaf..fdd76bceaf 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsmipicsi.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsmipicsi.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsmipidsi.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsmipidsi.h
index 2ebad24894..2ebad24894 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsmipidsi.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsmipidsi.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsmipihsi.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsmipihsi.h
index fa4220ff4f..fa4220ff4f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsmipihsi.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsmipihsi.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsmlb150.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsmlb150.h
index 92335f5eab..92335f5eab 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsmlb150.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsmlb150.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsmmdc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsmmdc.h
index 902531f08c..902531f08c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsmmdc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsmmdc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsocotp.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsocotp.h
index caa055814d..caa055814d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsocotp.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsocotp.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspcieep.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspcieep.h
index 22ff3ae11f..22ff3ae11f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspcieep.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspcieep.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspciephy.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspciephy.h
index daf2462d97..daf2462d97 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspciephy.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspciephy.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspciepl.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspciepl.h
index 2f228f0287..2f228f0287 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspciepl.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspciepl.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspcierc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspcierc.h
index 11e98ac0bf..11e98ac0bf 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspcierc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspcierc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspgc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspgc.h
index a6a531bb6f..a6a531bb6f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspgc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspgc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspmu.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspmu.h
index b777a14c8a..b777a14c8a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspmu.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspmu.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspwm.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspwm.h
index c20b7e67d6..c20b7e67d6 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspwm.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspwm.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspxp.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspxp.h
index 4d19c6ad68..4d19c6ad68 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspxp.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regspxp.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsromc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsromc.h
index 92d1e2ac86..92d1e2ac86 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsromc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsromc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regssdmaarm.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regssdmaarm.h
index 20fe39aff4..20fe39aff4 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regssdmaarm.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regssdmaarm.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regssdmabp.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regssdmabp.h
index ae95596e08..ae95596e08 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regssdmabp.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regssdmabp.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regssdmacore.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regssdmacore.h
index 8ca623da53..8ca623da53 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regssdmacore.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regssdmacore.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regssjc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regssjc.h
index 0c245a7418..0c245a7418 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regssjc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regssjc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regssnvs.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regssnvs.h
index 2205b13a97..2205b13a97 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regssnvs.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regssnvs.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsspba.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsspba.h
index d108caa50c..d108caa50c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsspba.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsspba.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsspdif.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsspdif.h
index 8e5119149b..8e5119149b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsspdif.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsspdif.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regssrc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regssrc.h
index bfb997703a..bfb997703a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regssrc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regssrc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsssi.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsssi.h
index 4ace196a4e..4ace196a4e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsssi.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsssi.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regstempmon.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regstempmon.h
index 882a62ea03..882a62ea03 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regstempmon.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regstempmon.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsuart.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsuart.h
index c56d9d08ad..c56d9d08ad 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsuart.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsuart.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsusbanalog.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsusbanalog.h
index 644cc531a7..644cc531a7 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsusbanalog.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsusbanalog.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsusbcore.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsusbcore.h
index f00aec8a5b..f00aec8a5b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsusbcore.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsusbcore.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsusbnoncore.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsusbnoncore.h
index a4bfe03f6b..a4bfe03f6b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsusbnoncore.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsusbnoncore.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsusbphy.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsusbphy.h
index be3675f1f3..be3675f1f3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsusbphy.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsusbphy.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsusdhc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsusdhc.h
index 389057b6a3..389057b6a3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsusdhc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsusdhc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsvdoa.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsvdoa.h
index 0c15c458cd..0c15c458cd 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsvdoa.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsvdoa.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsvpu.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsvpu.h
index d8090a3a6b..d8090a3a6b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsvpu.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsvpu.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regswdog.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regswdog.h
index 2f9845abaa..2f9845abaa 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regswdog.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regswdog.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsxtalosc24.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsxtalosc24.h
index d4c988032a..d4c988032a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsxtalosc24.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/registers/regsxtalosc24.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/sdma_event.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/sdma_event.h
index c26d700c8a..c26d700c8a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/sdma_event.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/sdma_event.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/soc_memory_map.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/soc_memory_map.h
index bb609db08f..bb609db08f 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/soc_memory_map.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sdl/soc_memory_map.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/iomux_define.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/iomux_define.h
index 2ffbe7d3ae..2ffbe7d3ae 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/iomux_define.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/iomux_define.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/iomux_register.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/iomux_register.h
index 0d80f77cfe..0d80f77cfe 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/iomux_register.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/iomux_register.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/irq_numbers.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/irq_numbers.h
index 8345afeef3..8345afeef3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/irq_numbers.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/irq_numbers.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers.h
index 4dc59719d3..4dc59719d3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regs.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regs.h
index fe0b81e486..fe0b81e486 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regs.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regs.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsaipstz.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsaipstz.h
index 641261f8c9..641261f8c9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsaipstz.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsaipstz.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsarmglobaltimer.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsarmglobaltimer.h
index 3f01265c26..3f01265c26 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsarmglobaltimer.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsarmglobaltimer.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsaudmux.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsaudmux.h
index 3caf294b32..3caf294b32 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsaudmux.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsaudmux.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsccm.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsccm.h
index 3fee3937fd..3fee3937fd 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsccm.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsccm.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsccmanalog.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsccmanalog.h
index ef73c000f1..ef73c000f1 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsccmanalog.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsccmanalog.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regscsi.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regscsi.h
index 4c66fb13d0..4c66fb13d0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regscsi.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regscsi.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regscsu.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regscsu.h
index defe57780e..defe57780e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regscsu.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regscsu.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsdbgmon.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsdbgmon.h
index 51ce5e1723..51ce5e1723 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsdbgmon.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsdbgmon.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsdcp.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsdcp.h
index a8a4e45ef6..a8a4e45ef6 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsdcp.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsdcp.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsdvfs.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsdvfs.h
index bb3f973239..bb3f973239 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsdvfs.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsdvfs.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsecspi.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsecspi.h
index 2de01afa13..2de01afa13 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsecspi.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsecspi.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regseim.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regseim.h
index 5bba6e0a0f..5bba6e0a0f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regseim.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regseim.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regselcdif.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regselcdif.h
index ee6fdcdfb1..ee6fdcdfb1 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regselcdif.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regselcdif.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsepdc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsepdc.h
index 64f97f4ac0..64f97f4ac0 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsepdc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsepdc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsepit.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsepit.h
index a3b0e08a1c..a3b0e08a1c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsepit.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsepit.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsfec.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsfec.h
index 6d5a6f0073..6d5a6f0073 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsfec.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsfec.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsgpc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsgpc.h
index ed9d0a9c3e..ed9d0a9c3e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsgpc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsgpc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsgpio.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsgpio.h
index edc5bb4343..edc5bb4343 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsgpio.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsgpio.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsgpt.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsgpt.h
index c167af0985..c167af0985 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsgpt.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsgpt.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsgpu2d.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsgpu2d.h
index 822bf52b91..822bf52b91 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsgpu2d.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsgpu2d.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsi2c.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsi2c.h
index 6cbda10b0f..6cbda10b0f 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsi2c.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsi2c.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsiomuxc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsiomuxc.h
index 79a5ce0b8c..79a5ce0b8c 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsiomuxc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsiomuxc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regskpp.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regskpp.h
index 0e90b10c11..0e90b10c11 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regskpp.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regskpp.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsmmdc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsmmdc.h
index ce03050544..ce03050544 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsmmdc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsmmdc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsocotp.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsocotp.h
index 89c01da084..89c01da084 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsocotp.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsocotp.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regspgc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regspgc.h
index f2a07d8b06..f2a07d8b06 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regspgc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regspgc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regspmu.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regspmu.h
index 001637c371..001637c371 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regspmu.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regspmu.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regspwm.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regspwm.h
index a6c3768ca3..a6c3768ca3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regspwm.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regspwm.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regspxp.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regspxp.h
index 457db8d29a..457db8d29a 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regspxp.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regspxp.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsqosc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsqosc.h
index 2c66442697..2c66442697 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsqosc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsqosc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsrng.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsrng.h
index d0023de3ac..d0023de3ac 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsrng.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsrng.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsromc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsromc.h
index 65661a560b..65661a560b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsromc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsromc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regssdmaarm.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regssdmaarm.h
index 2a792332b9..2a792332b9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regssdmaarm.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regssdmaarm.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regssdmabp.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regssdmabp.h
index 3320327d67..3320327d67 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regssdmabp.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regssdmabp.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regssdmacore.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regssdmacore.h
index 53602842fc..53602842fc 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regssdmacore.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regssdmacore.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regssjc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regssjc.h
index 600ee7fd19..600ee7fd19 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regssjc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regssjc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regssnvs.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regssnvs.h
index 16bb2cdc50..16bb2cdc50 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regssnvs.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regssnvs.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsspba.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsspba.h
index a52bdfcb00..a52bdfcb00 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsspba.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsspba.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsspdc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsspdc.h
index 9e3f34b3ab..9e3f34b3ab 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsspdc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsspdc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsspdif.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsspdif.h
index ff1293ee68..ff1293ee68 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsspdif.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsspdif.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regssrc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regssrc.h
index a567db67b9..a567db67b9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regssrc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regssrc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsssi.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsssi.h
index 1d4f82c0df..1d4f82c0df 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsssi.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsssi.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regstempmon.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regstempmon.h
index 39a6485f3b..39a6485f3b 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regstempmon.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regstempmon.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsuart.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsuart.h
index ad570d99a7..ad570d99a7 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsuart.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsuart.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsusbanalog.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsusbanalog.h
index 7974e11ce6..7974e11ce6 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsusbanalog.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsusbanalog.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsusbcore.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsusbcore.h
index 923ec77912..923ec77912 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsusbcore.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsusbcore.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsusbnoncore.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsusbnoncore.h
index 66b6c69fc1..66b6c69fc1 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsusbnoncore.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsusbnoncore.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsusbphy.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsusbphy.h
index 655ce50fec..655ce50fec 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsusbphy.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsusbphy.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsusdhc.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsusdhc.h
index f91ed5d2e6..f91ed5d2e6 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsusdhc.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsusdhc.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regswdog.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regswdog.h
index 3c6df2c8f8..3c6df2c8f8 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regswdog.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regswdog.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsxtalosc24.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsxtalosc24.h
index 03538c5b9e..03538c5b9e 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsxtalosc24.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/registers/regsxtalosc24.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/sdma_event.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/sdma_event.h
index 370ca3ddbd..370ca3ddbd 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/sdma_event.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/sdma_event.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/soc_memory_map.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/soc_memory_map.h
index 638534f454..638534f454 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/soc_memory_map.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/mx6sl/soc_memory_map.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/sdk.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/sdk.h
index 8408d8ac1f..8408d8ac1f 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/sdk.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/sdk.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/sdk_types.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/sdk_types.h
index 0b7bc4b767..0b7bc4b767 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/sdk_types.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/sdk_types.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/sdk_version.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/sdk_version.h
index ee05224744..ee05224744 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/include/sdk_version.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/include/sdk_version.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/sdk.dox b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/sdk.dox
index 580806d668..580806d668 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/sdk.dox
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/sdk.dox
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/utility/Makefile b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/utility/Makefile
index a2d85116d3..a2d85116d3 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/utility/Makefile
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/utility/Makefile
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/utility/atomics.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/utility/atomics.h
index 25cbd96fec..25cbd96fec 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/utility/atomics.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/utility/atomics.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/utility/menu.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/utility/menu.h
index dca0bedc33..dca0bedc33 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/utility/menu.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/utility/menu.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/utility/spinlock.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/utility/spinlock.h
index 4bb0252be1..4bb0252be1 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/utility/spinlock.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/utility/spinlock.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/utility/src/atomics.s b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/utility/src/atomics.s
index 9e6aa09db6..9e6aa09db6 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/utility/src/atomics.s
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/utility/src/atomics.s
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/utility/src/menu.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/utility/src/menu.c
index 86e2de5323..86e2de5323 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/utility/src/menu.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/utility/src/menu.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/utility/src/runtime_support.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/utility/src/runtime_support.c
index 1eae80afac..1eae80afac 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/utility/src/runtime_support.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/utility/src/runtime_support.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/utility/src/sdk_version.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/utility/src/sdk_version.c
index b5dd97ada9..b5dd97ada9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/utility/src/sdk_version.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/utility/src/sdk_version.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/utility/src/spinlock.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/utility/src/spinlock.c
index 93f9bfb414..93f9bfb414 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/utility/src/spinlock.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/utility/src/spinlock.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/utility/src/spinlock_lock_unlock.S b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/utility/src/spinlock_lock_unlock.S
index c52677b3a9..c52677b3a9 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/utility/src/spinlock_lock_unlock.S
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/utility/src/spinlock_lock_unlock.S
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/utility/src/system_util.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/utility/src/system_util.c
index 19ef020bba..19ef020bba 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/utility/src/system_util.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/utility/src/system_util.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/utility/src/text_color.c b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/utility/src/text_color.c
index f47930c728..f47930c728 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/utility/src/text_color.c
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/utility/src/text_color.c
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/utility/system_util.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/utility/system_util.h
index 0e72fc3fc2..0e72fc3fc2 100755..100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/utility/system_util.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/utility/system_util.h
diff --git a/bsp/imx6sx/iMX6_Platform_SDK/sdk/utility/text_color.h b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/utility/text_color.h
index ed666b125d..ed666b125d 100644
--- a/bsp/imx6sx/iMX6_Platform_SDK/sdk/utility/text_color.h
+++ b/bsp/nxp/imx/imx6sx/iMX6_Platform_SDK/sdk/utility/text_color.h
diff --git a/bsp/imx6ul/.config b/bsp/nxp/imx/imx6ul/.config
index 739b96c1bf..739b96c1bf 100644
--- a/bsp/imx6ul/.config
+++ b/bsp/nxp/imx/imx6ul/.config
diff --git a/bsp/imx6ul/Kconfig b/bsp/nxp/imx/imx6ul/Kconfig
index 79d11ee201..086021305b 100644
--- a/bsp/imx6ul/Kconfig
+++ b/bsp/nxp/imx/imx6ul/Kconfig
@@ -8,7 +8,7 @@ config BSP_DIR
 config RTT_DIR
     string
     option env="RTT_ROOT"
-    default "../.."
+    default "../../../.."
 
 config PKGS_DIR
     string
diff --git a/bsp/imx6ul/Makefile b/bsp/nxp/imx/imx6ul/Makefile
index f9b884d9d3..f9b884d9d3 100644
--- a/bsp/imx6ul/Makefile
+++ b/bsp/nxp/imx/imx6ul/Makefile
diff --git a/bsp/imx6ul/README.md b/bsp/nxp/imx/imx6ul/README.md
index 3dc29e5c93..3dc29e5c93 100644
--- a/bsp/imx6ul/README.md
+++ b/bsp/nxp/imx/imx6ul/README.md
diff --git a/bsp/imx6ul/SConscript b/bsp/nxp/imx/imx6ul/SConscript
index fe0ae941ae..fe0ae941ae 100644
--- a/bsp/imx6ul/SConscript
+++ b/bsp/nxp/imx/imx6ul/SConscript
diff --git a/bsp/imx6ul/SConstruct b/bsp/nxp/imx/imx6ul/SConstruct
index b3f7bff960..8373428f69 100644
--- a/bsp/imx6ul/SConstruct
+++ b/bsp/nxp/imx/imx6ul/SConstruct
@@ -5,7 +5,7 @@ import rtconfig
 if os.getenv('RTT_ROOT'):
     RTT_ROOT = os.getenv('RTT_ROOT')
 else:
-    RTT_ROOT = os.path.join(os.getcwd(), '..', '..')
+    RTT_ROOT = os.path.join(os.getcwd(), '..', '..', '..', '..')
 
 sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')]
 from building import *
diff --git a/bsp/imx6ul/applications/SConscript b/bsp/nxp/imx/imx6ul/applications/SConscript
index 9bb9abae89..9bb9abae89 100644
--- a/bsp/imx6ul/applications/SConscript
+++ b/bsp/nxp/imx/imx6ul/applications/SConscript
diff --git a/bsp/imx6ul/applications/application.c b/bsp/nxp/imx/imx6ul/applications/application.c
index 98fcbfc883..98fcbfc883 100644
--- a/bsp/imx6ul/applications/application.c
+++ b/bsp/nxp/imx/imx6ul/applications/application.c
diff --git a/bsp/imx6ul/applications/startup.c b/bsp/nxp/imx/imx6ul/applications/startup.c
index 4c1f83619e..4c1f83619e 100644
--- a/bsp/imx6ul/applications/startup.c
+++ b/bsp/nxp/imx/imx6ul/applications/startup.c
diff --git a/bsp/imx6ul/drivers/Kconfig b/bsp/nxp/imx/imx6ul/drivers/Kconfig
index 95c536178d..95c536178d 100644
--- a/bsp/imx6ul/drivers/Kconfig
+++ b/bsp/nxp/imx/imx6ul/drivers/Kconfig
diff --git a/bsp/imx6ul/drivers/SConscript b/bsp/nxp/imx/imx6ul/drivers/SConscript
index 33a0d51429..33a0d51429 100644
--- a/bsp/imx6ul/drivers/SConscript
+++ b/bsp/nxp/imx/imx6ul/drivers/SConscript
diff --git a/bsp/imx6ul/drivers/board.c b/bsp/nxp/imx/imx6ul/drivers/board.c
index 015a3709c1..015a3709c1 100644
--- a/bsp/imx6ul/drivers/board.c
+++ b/bsp/nxp/imx/imx6ul/drivers/board.c
diff --git a/bsp/imx6ul/drivers/board.h b/bsp/nxp/imx/imx6ul/drivers/board.h
index 76593e2f08..76593e2f08 100644
--- a/bsp/imx6ul/drivers/board.h
+++ b/bsp/nxp/imx/imx6ul/drivers/board.h
diff --git a/bsp/imx6ul/drivers/imx6ul.h b/bsp/nxp/imx/imx6ul/drivers/imx6ul.h
index 7f0db1354f..7f0db1354f 100644
--- a/bsp/imx6ul/drivers/imx6ul.h
+++ b/bsp/nxp/imx/imx6ul/drivers/imx6ul.h
diff --git a/bsp/imx6ul/drivers/iomux/iomux_config.c b/bsp/nxp/imx/imx6ul/drivers/iomux/iomux_config.c
index dc0cbc5cb1..dc0cbc5cb1 100644
--- a/bsp/imx6ul/drivers/iomux/iomux_config.c
+++ b/bsp/nxp/imx/imx6ul/drivers/iomux/iomux_config.c
diff --git a/bsp/imx6ul/drivers/iomux/iomux_config.h b/bsp/nxp/imx/imx6ul/drivers/iomux/iomux_config.h
index 50be6390b3..50be6390b3 100644
--- a/bsp/imx6ul/drivers/iomux/iomux_config.h
+++ b/bsp/nxp/imx/imx6ul/drivers/iomux/iomux_config.h
diff --git a/bsp/imx6ul/drivers/iomux/uart_iomux_config.c b/bsp/nxp/imx/imx6ul/drivers/iomux/uart_iomux_config.c
index 4da7598986..4da7598986 100644
--- a/bsp/imx6ul/drivers/iomux/uart_iomux_config.c
+++ b/bsp/nxp/imx/imx6ul/drivers/iomux/uart_iomux_config.c
diff --git a/bsp/imx6ul/drivers/serial.c b/bsp/nxp/imx/imx6ul/drivers/serial.c
index 5764d088de..5764d088de 100644
--- a/bsp/imx6ul/drivers/serial.c
+++ b/bsp/nxp/imx/imx6ul/drivers/serial.c
diff --git a/bsp/imx6ul/drivers/serial.h b/bsp/nxp/imx/imx6ul/drivers/serial.h
index 862ba65ef7..862ba65ef7 100644
--- a/bsp/imx6ul/drivers/serial.h
+++ b/bsp/nxp/imx/imx6ul/drivers/serial.h
diff --git a/bsp/imx6ul/link.lds b/bsp/nxp/imx/imx6ul/link.lds
index 4beeb3770e..4beeb3770e 100644
--- a/bsp/imx6ul/link.lds
+++ b/bsp/nxp/imx/imx6ul/link.lds
diff --git a/bsp/imx6ul/platform/SConscript b/bsp/nxp/imx/imx6ul/platform/SConscript
index 9ba43b1483..9ba43b1483 100644
--- a/bsp/imx6ul/platform/SConscript
+++ b/bsp/nxp/imx/imx6ul/platform/SConscript
diff --git a/bsp/imx6ul/platform/cpu/arm_cp_registers.h b/bsp/nxp/imx/imx6ul/platform/cpu/arm_cp_registers.h
index cce58197f3..cce58197f3 100644
--- a/bsp/imx6ul/platform/cpu/arm_cp_registers.h
+++ b/bsp/nxp/imx/imx6ul/platform/cpu/arm_cp_registers.h
diff --git a/bsp/imx6ul/platform/cpu/armv7_cache.c b/bsp/nxp/imx/imx6ul/platform/cpu/armv7_cache.c
index e030bcb070..e030bcb070 100644
--- a/bsp/imx6ul/platform/cpu/armv7_cache.c
+++ b/bsp/nxp/imx/imx6ul/platform/cpu/armv7_cache.c
diff --git a/bsp/imx6ul/platform/cpu/ccm_pll.h b/bsp/nxp/imx/imx6ul/platform/cpu/ccm_pll.h
index 8bd9cccdf2..8bd9cccdf2 100644
--- a/bsp/imx6ul/platform/cpu/ccm_pll.h
+++ b/bsp/nxp/imx/imx6ul/platform/cpu/ccm_pll.h
diff --git a/bsp/imx6ul/platform/cpu/ccm_pll2.c b/bsp/nxp/imx/imx6ul/platform/cpu/ccm_pll2.c
index b92a325f69..b92a325f69 100644
--- a/bsp/imx6ul/platform/cpu/ccm_pll2.c
+++ b/bsp/nxp/imx/imx6ul/platform/cpu/ccm_pll2.c
diff --git a/bsp/imx6ul/platform/cpu/cortex_a.h b/bsp/nxp/imx/imx6ul/platform/cpu/cortex_a.h
index cb815615bd..cb815615bd 100644
--- a/bsp/imx6ul/platform/cpu/cortex_a.h
+++ b/bsp/nxp/imx/imx6ul/platform/cpu/cortex_a.h
diff --git a/bsp/imx6ul/platform/cpu/cortex_a_gcc.S b/bsp/nxp/imx/imx6ul/platform/cpu/cortex_a_gcc.S
index ce34242fc9..ce34242fc9 100644
--- a/bsp/imx6ul/platform/cpu/cortex_a_gcc.S
+++ b/bsp/nxp/imx/imx6ul/platform/cpu/cortex_a_gcc.S
diff --git a/bsp/imx6ul/platform/cpu/gic_registers.h b/bsp/nxp/imx/imx6ul/platform/cpu/gic_registers.h
index 20d41716f2..20d41716f2 100644
--- a/bsp/imx6ul/platform/cpu/gic_registers.h
+++ b/bsp/nxp/imx/imx6ul/platform/cpu/gic_registers.h
diff --git a/bsp/imx6ul/platform/drivers/epit.c b/bsp/nxp/imx/imx6ul/platform/drivers/epit.c
index efc88c7865..efc88c7865 100644
--- a/bsp/imx6ul/platform/drivers/epit.c
+++ b/bsp/nxp/imx/imx6ul/platform/drivers/epit.c
diff --git a/bsp/imx6ul/platform/drivers/gpt.c b/bsp/nxp/imx/imx6ul/platform/drivers/gpt.c
index 558bf03104..558bf03104 100644
--- a/bsp/imx6ul/platform/drivers/gpt.c
+++ b/bsp/nxp/imx/imx6ul/platform/drivers/gpt.c
diff --git a/bsp/imx6ul/platform/drivers/imx_i2c.c b/bsp/nxp/imx/imx6ul/platform/drivers/imx_i2c.c
index a862bc6b19..a862bc6b19 100644
--- a/bsp/imx6ul/platform/drivers/imx_i2c.c
+++ b/bsp/nxp/imx/imx6ul/platform/drivers/imx_i2c.c
diff --git a/bsp/imx6ul/platform/drivers/imx_i2c_internal.h b/bsp/nxp/imx/imx6ul/platform/drivers/imx_i2c_internal.h
index 184d9bb950..184d9bb950 100644
--- a/bsp/imx6ul/platform/drivers/imx_i2c_internal.h
+++ b/bsp/nxp/imx/imx6ul/platform/drivers/imx_i2c_internal.h
diff --git a/bsp/imx6ul/platform/drivers/imx_timer.c b/bsp/nxp/imx/imx6ul/platform/drivers/imx_timer.c
index f348070157..f348070157 100644
--- a/bsp/imx6ul/platform/drivers/imx_timer.c
+++ b/bsp/nxp/imx/imx6ul/platform/drivers/imx_timer.c
diff --git a/bsp/imx6ul/platform/drivers/imx_uart.c b/bsp/nxp/imx/imx6ul/platform/drivers/imx_uart.c
index 7485dd5e66..7485dd5e66 100644
--- a/bsp/imx6ul/platform/drivers/imx_uart.c
+++ b/bsp/nxp/imx/imx6ul/platform/drivers/imx_uart.c
diff --git a/bsp/imx6ul/platform/include/epit.h b/bsp/nxp/imx/imx6ul/platform/include/epit.h
index 86955f80ac..86955f80ac 100644
--- a/bsp/imx6ul/platform/include/epit.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/epit.h
diff --git a/bsp/imx6ul/platform/include/gpt.h b/bsp/nxp/imx/imx6ul/platform/include/gpt.h
index bc239281c4..bc239281c4 100644
--- a/bsp/imx6ul/platform/include/gpt.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/gpt.h
diff --git a/bsp/imx6ul/platform/include/hab_defines.h b/bsp/nxp/imx/imx6ul/platform/include/hab_defines.h
index 1fcf5d5444..1fcf5d5444 100644
--- a/bsp/imx6ul/platform/include/hab_defines.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/hab_defines.h
diff --git a/bsp/imx6ul/platform/include/imx_i2c.h b/bsp/nxp/imx/imx6ul/platform/include/imx_i2c.h
index 5f91a1a5f2..5f91a1a5f2 100644
--- a/bsp/imx6ul/platform/include/imx_i2c.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/imx_i2c.h
diff --git a/bsp/imx6ul/platform/include/imx_timer.h b/bsp/nxp/imx/imx6ul/platform/include/imx_timer.h
index ab18823498..ab18823498 100644
--- a/bsp/imx6ul/platform/include/imx_timer.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/imx_timer.h
diff --git a/bsp/imx6ul/platform/include/imx_uart.h b/bsp/nxp/imx/imx6ul/platform/include/imx_uart.h
index b663bdaef3..b663bdaef3 100644
--- a/bsp/imx6ul/platform/include/imx_uart.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/imx_uart.h
diff --git a/bsp/imx6ul/platform/include/io.h b/bsp/nxp/imx/imx6ul/platform/include/io.h
index e4f2dc595a..e4f2dc595a 100644
--- a/bsp/imx6ul/platform/include/io.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/io.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/ccm_pll_reg_define.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/ccm_pll_reg_define.h
index 87237ad1a2..87237ad1a2 100644
--- a/bsp/imx6ul/platform/include/mx6ul/ccm_pll_reg_define.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/ccm_pll_reg_define.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/fsl_bitaccess.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/fsl_bitaccess.h
index ef70794521..ef70794521 100644
--- a/bsp/imx6ul/platform/include/mx6ul/fsl_bitaccess.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/fsl_bitaccess.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/functions.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/functions.h
index ab162a082b..ab162a082b 100644
--- a/bsp/imx6ul/platform/include/mx6ul/functions.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/functions.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/gpio_define.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/gpio_define.h
index 72050f371c..72050f371c 100644
--- a/bsp/imx6ul/platform/include/mx6ul/gpio_define.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/gpio_define.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/hardware.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/hardware.h
index 86507e3990..86507e3990 100644
--- a/bsp/imx6ul/platform/include/mx6ul/hardware.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/hardware.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/hdmi_regs.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/hdmi_regs.h
index a0982709e8..a0982709e8 100644
--- a/bsp/imx6ul/platform/include/mx6ul/hdmi_regs.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/hdmi_regs.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/iim_fuse.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/iim_fuse.h
index 41e1518f31..41e1518f31 100644
--- a/bsp/imx6ul/platform/include/mx6ul/iim_fuse.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/iim_fuse.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/iomux_define.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/iomux_define.h
index f7c6806437..f7c6806437 100644
--- a/bsp/imx6ul/platform/include/mx6ul/iomux_define.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/iomux_define.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/iomux_register.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/iomux_register.h
index fe92524cfb..fe92524cfb 100644
--- a/bsp/imx6ul/platform/include/mx6ul/iomux_register.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/iomux_register.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/irq_numbers.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/irq_numbers.h
index a962db8c1b..a962db8c1b 100644
--- a/bsp/imx6ul/platform/include/mx6ul/irq_numbers.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/irq_numbers.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/plat_startup.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/plat_startup.h
index 2c02ec7f58..2c02ec7f58 100644
--- a/bsp/imx6ul/platform/include/mx6ul/plat_startup.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/plat_startup.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/registers.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers.h
index 0fcaecf15c..0fcaecf15c 100644
--- a/bsp/imx6ul/platform/include/mx6ul/registers.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/registers/regs.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regs.h
index fe0b81e486..fe0b81e486 100644
--- a/bsp/imx6ul/platform/include/mx6ul/registers/regs.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regs.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/registers/regsarmglobaltimer.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regsarmglobaltimer.h
index 94837c46f3..94837c46f3 100644
--- a/bsp/imx6ul/platform/include/mx6ul/registers/regsarmglobaltimer.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regsarmglobaltimer.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/registers/regsccm.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regsccm.h
index f2f516644c..f2f516644c 100644
--- a/bsp/imx6ul/platform/include/mx6ul/registers/regsccm.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regsccm.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/registers/regsccmanalog.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regsccmanalog.h
index 8ae2222a71..8ae2222a71 100644
--- a/bsp/imx6ul/platform/include/mx6ul/registers/regsccmanalog.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regsccmanalog.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/registers/regsecspi.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regsecspi.h
index 24172aa575..24172aa575 100644
--- a/bsp/imx6ul/platform/include/mx6ul/registers/regsecspi.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regsecspi.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/registers/regsenet.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regsenet.h
index 5ea22e18a0..5ea22e18a0 100644
--- a/bsp/imx6ul/platform/include/mx6ul/registers/regsenet.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regsenet.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/registers/regsepit.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regsepit.h
index f058483925..f058483925 100644
--- a/bsp/imx6ul/platform/include/mx6ul/registers/regsepit.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regsepit.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/registers/regsgpmi.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regsgpmi.h
index 35d73eb8cc..35d73eb8cc 100644
--- a/bsp/imx6ul/platform/include/mx6ul/registers/regsgpmi.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regsgpmi.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/registers/regsgpt.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regsgpt.h
index b2dd86622a..b2dd86622a 100644
--- a/bsp/imx6ul/platform/include/mx6ul/registers/regsgpt.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regsgpt.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/registers/regsi2c.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regsi2c.h
index 0ab3828248..0ab3828248 100644
--- a/bsp/imx6ul/platform/include/mx6ul/registers/regsi2c.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regsi2c.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/registers/regsocotp.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regsocotp.h
index da17cd8672..da17cd8672 100644
--- a/bsp/imx6ul/platform/include/mx6ul/registers/regsocotp.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regsocotp.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/registers/regssdmaarm.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regssdmaarm.h
index 6186745f70..6186745f70 100644
--- a/bsp/imx6ul/platform/include/mx6ul/registers/regssdmaarm.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regssdmaarm.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/registers/regsspba.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regsspba.h
index 01fd2cbc30..01fd2cbc30 100644
--- a/bsp/imx6ul/platform/include/mx6ul/registers/regsspba.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regsspba.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/registers/regsuart.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regsuart.h
index 7309438067..7309438067 100644
--- a/bsp/imx6ul/platform/include/mx6ul/registers/regsuart.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regsuart.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/registers/regsusbanalog.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regsusbanalog.h
index 4866cec5b0..4866cec5b0 100644
--- a/bsp/imx6ul/platform/include/mx6ul/registers/regsusbanalog.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regsusbanalog.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/registers/regsusdhc.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regsusdhc.h
index 210862393b..210862393b 100644
--- a/bsp/imx6ul/platform/include/mx6ul/registers/regsusdhc.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/registers/regsusdhc.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/regs.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/regs.h
index ed11722e85..ed11722e85 100644
--- a/bsp/imx6ul/platform/include/mx6ul/regs.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/regs.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/regsapbh.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/regsapbh.h
index be19ed6989..be19ed6989 100644
--- a/bsp/imx6ul/platform/include/mx6ul/regsapbh.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/regsapbh.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/regsbch.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/regsbch.h
index 1aef875d37..1aef875d37 100644
--- a/bsp/imx6ul/platform/include/mx6ul/regsbch.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/regsbch.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/regsgpmi.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/regsgpmi.h
index 60b8cda3b7..60b8cda3b7 100644
--- a/bsp/imx6ul/platform/include/mx6ul/regsgpmi.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/regsgpmi.h
diff --git a/bsp/imx6ul/platform/include/mx6ul/soc_memory_map.h b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/soc_memory_map.h
index 7c126b2384..7c126b2384 100644
--- a/bsp/imx6ul/platform/include/mx6ul/soc_memory_map.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/mx6ul/soc_memory_map.h
diff --git a/bsp/imx6ul/platform/include/sdk.h b/bsp/nxp/imx/imx6ul/platform/include/sdk.h
index eeea34c7bf..eeea34c7bf 100644
--- a/bsp/imx6ul/platform/include/sdk.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/sdk.h
diff --git a/bsp/imx6ul/platform/include/sdk_types.h b/bsp/nxp/imx/imx6ul/platform/include/sdk_types.h
index 0b7bc4b767..0b7bc4b767 100644
--- a/bsp/imx6ul/platform/include/sdk_types.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/sdk_types.h
diff --git a/bsp/imx6ul/platform/include/sdk_version.h b/bsp/nxp/imx/imx6ul/platform/include/sdk_version.h
index e6917f9a43..e6917f9a43 100644
--- a/bsp/imx6ul/platform/include/sdk_version.h
+++ b/bsp/nxp/imx/imx6ul/platform/include/sdk_version.h
diff --git a/bsp/imx6ul/rtconfig.h b/bsp/nxp/imx/imx6ul/rtconfig.h
index e71a36b7c5..e71a36b7c5 100644
--- a/bsp/imx6ul/rtconfig.h
+++ b/bsp/nxp/imx/imx6ul/rtconfig.h
diff --git a/bsp/imx6ul/rtconfig.py b/bsp/nxp/imx/imx6ul/rtconfig.py
index 258e035e5a..258e035e5a 100644
--- a/bsp/imx6ul/rtconfig.py
+++ b/bsp/nxp/imx/imx6ul/rtconfig.py
diff --git a/bsp/imx/imx6ull-smart/.config b/bsp/nxp/imx/imx6ull-smart/.config
index f85555a659..f85555a659 100644
--- a/bsp/imx/imx6ull-smart/.config
+++ b/bsp/nxp/imx/imx6ull-smart/.config
diff --git a/bsp/imx/imx6ull-smart/.gitignore b/bsp/nxp/imx/imx6ull-smart/.gitignore
index fc80f79281..fc80f79281 100644
--- a/bsp/imx/imx6ull-smart/.gitignore
+++ b/bsp/nxp/imx/imx6ull-smart/.gitignore
diff --git a/bsp/imx/imx6ull-smart/Kconfig b/bsp/nxp/imx/imx6ull-smart/Kconfig
index 616f447a1c..95f7f6f7c9 100644
--- a/bsp/imx/imx6ull-smart/Kconfig
+++ b/bsp/nxp/imx/imx6ull-smart/Kconfig
@@ -8,7 +8,7 @@ config BSP_DIR
 config RTT_DIR
     string
     option env="RTT_ROOT"
-    default "../../.."
+    default "../../../.."
 
 config PKGS_DIR
     string
diff --git a/bsp/imx/imx6ull-smart/README.md b/bsp/nxp/imx/imx6ull-smart/README.md
index 4ddd6e4adf..4ddd6e4adf 100644
--- a/bsp/imx/imx6ull-smart/README.md
+++ b/bsp/nxp/imx/imx6ull-smart/README.md
diff --git a/bsp/imx/imx6ull-smart/SConscript b/bsp/nxp/imx/imx6ull-smart/SConscript
index c7ef7659ec..c7ef7659ec 100644
--- a/bsp/imx/imx6ull-smart/SConscript
+++ b/bsp/nxp/imx/imx6ull-smart/SConscript
diff --git a/bsp/imx/imx6ull-smart/SConstruct b/bsp/nxp/imx/imx6ull-smart/SConstruct
index 38ae11a3a0..6e37f13bcc 100644
--- a/bsp/imx/imx6ull-smart/SConstruct
+++ b/bsp/nxp/imx/imx6ull-smart/SConstruct
@@ -2,7 +2,7 @@ import os
 import sys
 import rtconfig
 import re
-RTT_ROOT = os.getenv('RTT_ROOT') or os.path.join('..', '..', '..')
+RTT_ROOT = os.getenv('RTT_ROOT') or os.path.join('..', '..', '..', '..')
 
 sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')]
 from building import *
diff --git a/bsp/imx/imx6ull-smart/applications/SConscript b/bsp/nxp/imx/imx6ull-smart/applications/SConscript
index 89083a964a..89083a964a 100644
--- a/bsp/imx/imx6ull-smart/applications/SConscript
+++ b/bsp/nxp/imx/imx6ull-smart/applications/SConscript
diff --git a/bsp/imx/imx6ull-smart/applications/init_em.c b/bsp/nxp/imx/imx6ull-smart/applications/init_em.c
index 376503e026..376503e026 100644
--- a/bsp/imx/imx6ull-smart/applications/init_em.c
+++ b/bsp/nxp/imx/imx6ull-smart/applications/init_em.c
diff --git a/bsp/imx/imx6ull-smart/applications/init_sdtask.c b/bsp/nxp/imx/imx6ull-smart/applications/init_sdtask.c
index 2041dc17d4..2041dc17d4 100644
--- a/bsp/imx/imx6ull-smart/applications/init_sdtask.c
+++ b/bsp/nxp/imx/imx6ull-smart/applications/init_sdtask.c
diff --git a/bsp/imx/imx6ull-smart/applications/init_wifi.c b/bsp/nxp/imx/imx6ull-smart/applications/init_wifi.c
index 680f6b0cb5..680f6b0cb5 100644
--- a/bsp/imx/imx6ull-smart/applications/init_wifi.c
+++ b/bsp/nxp/imx/imx6ull-smart/applications/init_wifi.c
diff --git a/bsp/imx/imx6ull-smart/applications/main.c b/bsp/nxp/imx/imx6ull-smart/applications/main.c
index 71ed99a7e2..71ed99a7e2 100644
--- a/bsp/imx/imx6ull-smart/applications/main.c
+++ b/bsp/nxp/imx/imx6ull-smart/applications/main.c
diff --git a/bsp/imx/imx6ull-smart/applications/mnt.c b/bsp/nxp/imx/imx6ull-smart/applications/mnt.c
index 65879480c5..65879480c5 100644
--- a/bsp/imx/imx6ull-smart/applications/mnt.c
+++ b/bsp/nxp/imx/imx6ull-smart/applications/mnt.c
diff --git a/bsp/imx/imx6ull-smart/applications/romfs.c b/bsp/nxp/imx/imx6ull-smart/applications/romfs.c
index 278d28fc53..278d28fc53 100644
--- a/bsp/imx/imx6ull-smart/applications/romfs.c
+++ b/bsp/nxp/imx/imx6ull-smart/applications/romfs.c
diff --git a/bsp/imx/imx6ull-smart/drivers/Kconfig b/bsp/nxp/imx/imx6ull-smart/drivers/Kconfig
index ddb6124f0e..ddb6124f0e 100644
--- a/bsp/imx/imx6ull-smart/drivers/Kconfig
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/Kconfig
diff --git a/bsp/imx/imx6ull-smart/drivers/SConscript b/bsp/nxp/imx/imx6ull-smart/drivers/SConscript
index cbb68865ee..cbb68865ee 100644
--- a/bsp/imx/imx6ull-smart/drivers/SConscript
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/SConscript
diff --git a/bsp/imx/imx6ull-smart/drivers/board.c b/bsp/nxp/imx/imx6ull-smart/drivers/board.c
index 8a77d5be09..8a77d5be09 100644
--- a/bsp/imx/imx6ull-smart/drivers/board.c
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/board.c
diff --git a/bsp/imx/imx6ull-smart/drivers/board.h b/bsp/nxp/imx/imx6ull-smart/drivers/board.h
index a0fefb2b44..a0fefb2b44 100644
--- a/bsp/imx/imx6ull-smart/drivers/board.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/board.h
diff --git a/bsp/imx/imx6ull-smart/drivers/bsp_clock.c b/bsp/nxp/imx/imx6ull-smart/drivers/bsp_clock.c
index b6b88fe4e3..b6b88fe4e3 100644
--- a/bsp/imx/imx6ull-smart/drivers/bsp_clock.c
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/bsp_clock.c
diff --git a/bsp/imx/imx6ull-smart/drivers/bsp_clock.h b/bsp/nxp/imx/imx6ull-smart/drivers/bsp_clock.h
index e84208fb4d..e84208fb4d 100644
--- a/bsp/imx/imx6ull-smart/drivers/bsp_clock.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/bsp_clock.h
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_adc.c b/bsp/nxp/imx/imx6ull-smart/drivers/drv_adc.c
index 9b91b80988..9b91b80988 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_adc.c
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_adc.c
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_adc.h b/bsp/nxp/imx/imx6ull-smart/drivers/drv_adc.h
index 0113b54f3e..0113b54f3e 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_adc.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_adc.h
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_common.c b/bsp/nxp/imx/imx6ull-smart/drivers/drv_common.c
index cd01f42b94..cd01f42b94 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_common.c
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_common.c
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_common.h b/bsp/nxp/imx/imx6ull-smart/drivers/drv_common.h
index 961873c58c..961873c58c 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_common.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_common.h
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_eth.c b/bsp/nxp/imx/imx6ull-smart/drivers/drv_eth.c
index ccfc66c4ec..ccfc66c4ec 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_eth.c
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_eth.c
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_eth.h b/bsp/nxp/imx/imx6ull-smart/drivers/drv_eth.h
index ff5d7cf88a..ff5d7cf88a 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_eth.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_eth.h
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_i2c.c b/bsp/nxp/imx/imx6ull-smart/drivers/drv_i2c.c
index c9981d340b..c9981d340b 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_i2c.c
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_i2c.c
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_i2c.h b/bsp/nxp/imx/imx6ull-smart/drivers/drv_i2c.h
index 5431cf7c8f..5431cf7c8f 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_i2c.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_i2c.h
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_lcd.c b/bsp/nxp/imx/imx6ull-smart/drivers/drv_lcd.c
index c159e47bca..c159e47bca 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_lcd.c
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_lcd.c
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_lcd.h b/bsp/nxp/imx/imx6ull-smart/drivers/drv_lcd.h
index 01fdd85909..01fdd85909 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_lcd.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_lcd.h
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_log.h b/bsp/nxp/imx/imx6ull-smart/drivers/drv_log.h
index c69b7abbd1..c69b7abbd1 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_log.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_log.h
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_pin.c b/bsp/nxp/imx/imx6ull-smart/drivers/drv_pin.c
index 31499de14c..31499de14c 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_pin.c
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_pin.c
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_pin.h b/bsp/nxp/imx/imx6ull-smart/drivers/drv_pin.h
index 98c388fe40..98c388fe40 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_pin.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_pin.h
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_pwm.c b/bsp/nxp/imx/imx6ull-smart/drivers/drv_pwm.c
index 6e4e4e0e2c..6e4e4e0e2c 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_pwm.c
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_pwm.c
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_pwm.h b/bsp/nxp/imx/imx6ull-smart/drivers/drv_pwm.h
index ce69970306..ce69970306 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_pwm.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_pwm.h
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_rtc.c b/bsp/nxp/imx/imx6ull-smart/drivers/drv_rtc.c
index d21d4a3b72..d21d4a3b72 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_rtc.c
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_rtc.c
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_rw007_port.c b/bsp/nxp/imx/imx6ull-smart/drivers/drv_rw007_port.c
index 7323d21d77..7323d21d77 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_rw007_port.c
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_rw007_port.c
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_sdio.c b/bsp/nxp/imx/imx6ull-smart/drivers/drv_sdio.c
index d5c483759d..d5c483759d 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_sdio.c
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_sdio.c
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_sdio.h b/bsp/nxp/imx/imx6ull-smart/drivers/drv_sdio.h
index 64bab6e2da..64bab6e2da 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_sdio.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_sdio.h
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_spi.c b/bsp/nxp/imx/imx6ull-smart/drivers/drv_spi.c
index 89328b9cc2..89328b9cc2 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_spi.c
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_spi.c
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_spi.h b/bsp/nxp/imx/imx6ull-smart/drivers/drv_spi.h
index 62bdd087d2..62bdd087d2 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_spi.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_spi.h
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_timer.c b/bsp/nxp/imx/imx6ull-smart/drivers/drv_timer.c
index 9001ba65de..9001ba65de 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_timer.c
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_timer.c
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_timer.h b/bsp/nxp/imx/imx6ull-smart/drivers/drv_timer.h
index c50b073d36..c50b073d36 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_timer.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_timer.h
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_touch.c b/bsp/nxp/imx/imx6ull-smart/drivers/drv_touch.c
index cb23b12983..cb23b12983 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_touch.c
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_touch.c
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_touch.h b/bsp/nxp/imx/imx6ull-smart/drivers/drv_touch.h
index c6fffd21a6..c6fffd21a6 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_touch.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_touch.h
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_uart.c b/bsp/nxp/imx/imx6ull-smart/drivers/drv_uart.c
index 45f4a165b0..45f4a165b0 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_uart.c
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_uart.c
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_uart.h b/bsp/nxp/imx/imx6ull-smart/drivers/drv_uart.h
index a406ca0c6d..a406ca0c6d 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_uart.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_uart.h
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_usbd.c b/bsp/nxp/imx/imx6ull-smart/drivers/drv_usbd.c
index acf13fbbbd..acf13fbbbd 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_usbd.c
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_usbd.c
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_wdt.c b/bsp/nxp/imx/imx6ull-smart/drivers/drv_wdt.c
index 763b6526da..763b6526da 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_wdt.c
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_wdt.c
diff --git a/bsp/imx/imx6ull-smart/drivers/drv_wdt.h b/bsp/nxp/imx/imx6ull-smart/drivers/drv_wdt.h
index 54b49b7300..54b49b7300 100644
--- a/bsp/imx/imx6ull-smart/drivers/drv_wdt.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/drv_wdt.h
diff --git a/bsp/imx/imx6ull-smart/drivers/imx6ull.h b/bsp/nxp/imx/imx6ull-smart/drivers/imx6ull.h
index bdaad85b21..bdaad85b21 100644
--- a/bsp/imx/imx6ull-smart/drivers/imx6ull.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/imx6ull.h
diff --git a/bsp/imx/imx6ull-smart/drivers/rt_lcd.h b/bsp/nxp/imx/imx6ull-smart/drivers/rt_lcd.h
index c794008884..c794008884 100644
--- a/bsp/imx/imx6ull-smart/drivers/rt_lcd.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/rt_lcd.h
diff --git a/bsp/imx/imx6ull-smart/drivers/usb/device/usb_device.h b/bsp/nxp/imx/imx6ull-smart/drivers/usb/device/usb_device.h
index dc12f0249a..dc12f0249a 100644
--- a/bsp/imx/imx6ull-smart/drivers/usb/device/usb_device.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/usb/device/usb_device.h
diff --git a/bsp/imx/imx6ull-smart/drivers/usb/device/usb_device_dci.c b/bsp/nxp/imx/imx6ull-smart/drivers/usb/device/usb_device_dci.c
index 12cc432bec..12cc432bec 100644
--- a/bsp/imx/imx6ull-smart/drivers/usb/device/usb_device_dci.c
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/usb/device/usb_device_dci.c
diff --git a/bsp/imx/imx6ull-smart/drivers/usb/device/usb_device_dci.h b/bsp/nxp/imx/imx6ull-smart/drivers/usb/device/usb_device_dci.h
index fd4fdceb04..fd4fdceb04 100644
--- a/bsp/imx/imx6ull-smart/drivers/usb/device/usb_device_dci.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/usb/device/usb_device_dci.h
diff --git a/bsp/imx/imx6ull-smart/drivers/usb/device/usb_device_ehci.c b/bsp/nxp/imx/imx6ull-smart/drivers/usb/device/usb_device_ehci.c
index a57d7fe8f7..a57d7fe8f7 100644
--- a/bsp/imx/imx6ull-smart/drivers/usb/device/usb_device_ehci.c
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/usb/device/usb_device_ehci.c
diff --git a/bsp/imx/imx6ull-smart/drivers/usb/device/usb_device_ehci.h b/bsp/nxp/imx/imx6ull-smart/drivers/usb/device/usb_device_ehci.h
index 869e063263..869e063263 100644
--- a/bsp/imx/imx6ull-smart/drivers/usb/device/usb_device_ehci.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/usb/device/usb_device_ehci.h
diff --git a/bsp/imx/imx6ull-smart/drivers/usb/host/usb_host.h b/bsp/nxp/imx/imx6ull-smart/drivers/usb/host/usb_host.h
index 53be402cd3..53be402cd3 100644
--- a/bsp/imx/imx6ull-smart/drivers/usb/host/usb_host.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/usb/host/usb_host.h
diff --git a/bsp/imx/imx6ull-smart/drivers/usb/host/usb_host_devices.c b/bsp/nxp/imx/imx6ull-smart/drivers/usb/host/usb_host_devices.c
index 42b16e071e..42b16e071e 100644
--- a/bsp/imx/imx6ull-smart/drivers/usb/host/usb_host_devices.c
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/usb/host/usb_host_devices.c
diff --git a/bsp/imx/imx6ull-smart/drivers/usb/host/usb_host_devices.h b/bsp/nxp/imx/imx6ull-smart/drivers/usb/host/usb_host_devices.h
index 422e876a12..422e876a12 100644
--- a/bsp/imx/imx6ull-smart/drivers/usb/host/usb_host_devices.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/usb/host/usb_host_devices.h
diff --git a/bsp/imx/imx6ull-smart/drivers/usb/host/usb_host_ehci.c b/bsp/nxp/imx/imx6ull-smart/drivers/usb/host/usb_host_ehci.c
index 8a31514b3a..8a31514b3a 100644
--- a/bsp/imx/imx6ull-smart/drivers/usb/host/usb_host_ehci.c
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/usb/host/usb_host_ehci.c
diff --git a/bsp/imx/imx6ull-smart/drivers/usb/host/usb_host_ehci.h b/bsp/nxp/imx/imx6ull-smart/drivers/usb/host/usb_host_ehci.h
index 162d6576cd..162d6576cd 100644
--- a/bsp/imx/imx6ull-smart/drivers/usb/host/usb_host_ehci.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/usb/host/usb_host_ehci.h
diff --git a/bsp/imx/imx6ull-smart/drivers/usb/host/usb_host_hci.c b/bsp/nxp/imx/imx6ull-smart/drivers/usb/host/usb_host_hci.c
index 927bf8bd9c..927bf8bd9c 100644
--- a/bsp/imx/imx6ull-smart/drivers/usb/host/usb_host_hci.c
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/usb/host/usb_host_hci.c
diff --git a/bsp/imx/imx6ull-smart/drivers/usb/host/usb_host_hci.h b/bsp/nxp/imx/imx6ull-smart/drivers/usb/host/usb_host_hci.h
index 26b6d4a9c5..26b6d4a9c5 100644
--- a/bsp/imx/imx6ull-smart/drivers/usb/host/usb_host_hci.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/usb/host/usb_host_hci.h
diff --git a/bsp/imx/imx6ull-smart/drivers/usb/include/usb.h b/bsp/nxp/imx/imx6ull-smart/drivers/usb/include/usb.h
index 256896b472..256896b472 100644
--- a/bsp/imx/imx6ull-smart/drivers/usb/include/usb.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/usb/include/usb.h
diff --git a/bsp/imx/imx6ull-smart/drivers/usb/include/usb_device_config.h b/bsp/nxp/imx/imx6ull-smart/drivers/usb/include/usb_device_config.h
index 551d92edc7..551d92edc7 100644
--- a/bsp/imx/imx6ull-smart/drivers/usb/include/usb_device_config.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/usb/include/usb_device_config.h
diff --git a/bsp/imx/imx6ull-smart/drivers/usb/include/usb_ehci.h b/bsp/nxp/imx/imx6ull-smart/drivers/usb/include/usb_ehci.h
index edc3496643..edc3496643 100644
--- a/bsp/imx/imx6ull-smart/drivers/usb/include/usb_ehci.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/usb/include/usb_ehci.h
diff --git a/bsp/imx/imx6ull-smart/drivers/usb/include/usb_misc.h b/bsp/nxp/imx/imx6ull-smart/drivers/usb/include/usb_misc.h
index 4efff5372f..4efff5372f 100644
--- a/bsp/imx/imx6ull-smart/drivers/usb/include/usb_misc.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/usb/include/usb_misc.h
diff --git a/bsp/imx/imx6ull-smart/drivers/usb/include/usb_spec.h b/bsp/nxp/imx/imx6ull-smart/drivers/usb/include/usb_spec.h
index d77b7d3598..d77b7d3598 100644
--- a/bsp/imx/imx6ull-smart/drivers/usb/include/usb_spec.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/usb/include/usb_spec.h
diff --git a/bsp/imx/imx6ull-smart/drivers/usb/phy/usb_phy.c b/bsp/nxp/imx/imx6ull-smart/drivers/usb/phy/usb_phy.c
index 70537b97dc..70537b97dc 100644
--- a/bsp/imx/imx6ull-smart/drivers/usb/phy/usb_phy.c
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/usb/phy/usb_phy.c
diff --git a/bsp/imx/imx6ull-smart/drivers/usb/phy/usb_phy.h b/bsp/nxp/imx/imx6ull-smart/drivers/usb/phy/usb_phy.h
index 0409f9c8b9..0409f9c8b9 100644
--- a/bsp/imx/imx6ull-smart/drivers/usb/phy/usb_phy.h
+++ b/bsp/nxp/imx/imx6ull-smart/drivers/usb/phy/usb_phy.h
diff --git a/bsp/imx/imx6ull-smart/figures/hw_resources.png b/bsp/nxp/imx/imx6ull-smart/figures/hw_resources.png
index d835bb588e..d835bb588e 100644
--- a/bsp/imx/imx6ull-smart/figures/hw_resources.png
+++ b/bsp/nxp/imx/imx6ull-smart/figures/hw_resources.png
diff --git a/bsp/imx/imx6ull-smart/libraries/SConscript b/bsp/nxp/imx/imx6ull-smart/libraries/SConscript
index 4c815c49b8..4c815c49b8 100644
--- a/bsp/imx/imx6ull-smart/libraries/SConscript
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/SConscript
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/CMSIS/Include/cmsis_gcc.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/CMSIS/Include/cmsis_gcc.h
index bb89fbba9e..bb89fbba9e 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/CMSIS/Include/cmsis_gcc.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/CMSIS/Include/cmsis_gcc.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/CMSIS/SConscript b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/CMSIS/SConscript
index 8ca37048bf..8ca37048bf 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/CMSIS/SConscript
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/CMSIS/SConscript
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/CORTEXA/Include/core_ca.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/CORTEXA/Include/core_ca.h
index 47d1e7fbbe..47d1e7fbbe 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/CORTEXA/Include/core_ca.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/CORTEXA/Include/core_ca.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/CORTEXA/Include/core_ca7.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/CORTEXA/Include/core_ca7.h
index 518f4ade2e..518f4ade2e 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/CORTEXA/Include/core_ca7.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/CORTEXA/Include/core_ca7.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/CORTEXA/Include/cortexa_gcc.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/CORTEXA/Include/cortexa_gcc.h
index 408afbbf6e..408afbbf6e 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/CORTEXA/Include/cortexa_gcc.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/CORTEXA/Include/cortexa_gcc.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/CORTEXA/Include/cortexa_iar.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/CORTEXA/Include/cortexa_iar.h
index e9a70d8ea0..e9a70d8ea0 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/CORTEXA/Include/cortexa_iar.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/CORTEXA/Include/cortexa_iar.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/CORTEXA/SConscript b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/CORTEXA/SConscript
index 8ca37048bf..8ca37048bf 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/CORTEXA/SConscript
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/CORTEXA/SConscript
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/SConscript b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/SConscript
index 4c815c49b8..4c815c49b8 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/SConscript
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/SConscript
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/MCIMX6Y2.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/MCIMX6Y2.h
index ea6e0c6926..ea6e0c6926 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/MCIMX6Y2.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/MCIMX6Y2.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/MCIMX6Y2.xml b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/MCIMX6Y2.xml
index 6f0991e335..6f0991e335 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/MCIMX6Y2.xml
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/MCIMX6Y2.xml
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/MCIMX6Y2_features.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/MCIMX6Y2_features.h
index 15180c2bdd..15180c2bdd 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/MCIMX6Y2_features.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/MCIMX6Y2_features.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/SConscript b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/SConscript
index 97865d743a..97865d743a 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/SConscript
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/SConscript
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_adc.c b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_adc.c
index 265e196936..265e196936 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_adc.c
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_adc.c
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_adc.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_adc.h
index 99429e6098..99429e6098 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_adc.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_adc.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_cache.c b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_cache.c
index 8df9a16f9e..8df9a16f9e 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_cache.c
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_cache.c
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_cache.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_cache.h
index 7eedede9e3..7eedede9e3 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_cache.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_cache.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_clock.c b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_clock.c
index 5c4c6faccc..5c4c6faccc 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_clock.c
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_clock.c
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_clock.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_clock.h
index 0b009cbe3f..0b009cbe3f 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_clock.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_clock.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_common.c b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_common.c
index 90862b0ef7..90862b0ef7 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_common.c
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_common.c
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_common.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_common.h
index 8245d7750e..8245d7750e 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_common.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_common.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_ecspi.c b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_ecspi.c
index d16a40a06c..d16a40a06c 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_ecspi.c
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_ecspi.c
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_ecspi.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_ecspi.h
index b5885572da..b5885572da 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_ecspi.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_ecspi.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_elcdif.c b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_elcdif.c
index f0a6f0aaa8..f0a6f0aaa8 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_elcdif.c
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_elcdif.c
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_elcdif.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_elcdif.h
index 84d6b2aa9c..84d6b2aa9c 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_elcdif.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_elcdif.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_enet.c b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_enet.c
index 1877f61aab..1877f61aab 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_enet.c
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_enet.c
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_enet.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_enet.h
index 5a4f4e16d4..5a4f4e16d4 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_enet.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_enet.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_epit.c b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_epit.c
index 2213758248..2213758248 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_epit.c
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_epit.c
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_epit.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_epit.h
index 14dd31240b..14dd31240b 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_epit.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_epit.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_gpio.c b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_gpio.c
index be1665ffdd..be1665ffdd 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_gpio.c
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_gpio.c
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_gpio.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_gpio.h
index ec9ce8b188..ec9ce8b188 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_gpio.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_gpio.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_i2c.c b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_i2c.c
index 4abeffe754..4abeffe754 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_i2c.c
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_i2c.c
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_i2c.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_i2c.h
index 9656b65eae..9656b65eae 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_i2c.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_i2c.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_iomuxc.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_iomuxc.h
index 8f314567f7..8f314567f7 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_iomuxc.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_iomuxc.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_phy.c b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_phy.c
index c1bfd98186..c1bfd98186 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_phy.c
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_phy.c
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_phy.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_phy.h
index 417202ea44..417202ea44 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_phy.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_phy.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_pwm.c b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_pwm.c
index 947876c204..947876c204 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_pwm.c
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_pwm.c
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_pwm.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_pwm.h
index c89c5514cb..c89c5514cb 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_pwm.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_pwm.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_snvs_hp.c b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_snvs_hp.c
index 1f98dec45c..1f98dec45c 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_snvs_hp.c
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_snvs_hp.c
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_snvs_hp.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_snvs_hp.h
index d06b0233ec..d06b0233ec 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_snvs_hp.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_snvs_hp.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_uart.c b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_uart.c
index dc41551bb3..dc41551bb3 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_uart.c
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_uart.c
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_uart.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_uart.h
index 0dd8ed8200..0dd8ed8200 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_uart.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_uart.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_usdhc.c b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_usdhc.c
index ae7cbbec55..ae7cbbec55 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_usdhc.c
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_usdhc.c
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_usdhc.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_usdhc.h
index bde8df88ba..bde8df88ba 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_usdhc.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_usdhc.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_wdog.c b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_wdog.c
index 59a6630f7d..59a6630f7d 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_wdog.c
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_wdog.c
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_wdog.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_wdog.h
index d2bb5576d3..d2bb5576d3 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_wdog.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/fsl_wdog.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/event.c b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/event.c
index 8125c45499..8125c45499 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/event.c
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/event.c
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/event.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/event.h
index e173ddf52f..e173ddf52f 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/event.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/event.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_card.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_card.h
index 5136b98329..5136b98329 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_card.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_card.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_host.c b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_host.c
index aa2e2d3ceb..aa2e2d3ceb 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_host.c
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_host.c
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_host.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_host.h
index 7d5350ed9c..7d5350ed9c 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_host.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_host.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_sd.c b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_sd.c
index 8cac2ffc51..8cac2ffc51 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_sd.c
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_sd.c
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_sdio.c b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_sdio.c
index 4e88fb183e..4e88fb183e 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_sdio.c
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_sdio.c
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_sdmmc.c b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_sdmmc.c
index 8cc9712c0d..8cc9712c0d 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_sdmmc.c
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_sdmmc.c
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_sdmmc.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_sdmmc.h
index c616a95198..c616a95198 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_sdmmc.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_sdmmc.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_sdspi.c b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_sdspi.c
index 4055e16d8c..4055e16d8c 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_sdspi.c
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_sdspi.c
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_sdspi.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_sdspi.h
index ee5c8a71f7..ee5c8a71f7 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_sdspi.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_sdspi.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_specification.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_specification.h
index 1320b20229..1320b20229 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_specification.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/fsl_specification.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/usdhc_config.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/usdhc_config.h
index a7b43e8b69..a7b43e8b69 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/usdhc_config.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/drivers/usdhc/usdhc_config.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/fsl_device_registers.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/fsl_device_registers.h
index d89474b8a1..d89474b8a1 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/fsl_device_registers.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/fsl_device_registers.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/system_MCIMX6Y2.c b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/system_MCIMX6Y2.c
index d6717da2ac..d6717da2ac 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/system_MCIMX6Y2.c
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/system_MCIMX6Y2.c
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/system_MCIMX6Y2.h b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/system_MCIMX6Y2.h
index 42bb5309fc..42bb5309fc 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/system_MCIMX6Y2.h
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/MCIMX6Y2/system_MCIMX6Y2.h
diff --git a/bsp/imx/imx6ull-smart/libraries/sdk/devices/SConscript b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/SConscript
index 4c815c49b8..4c815c49b8 100644
--- a/bsp/imx/imx6ull-smart/libraries/sdk/devices/SConscript
+++ b/bsp/nxp/imx/imx6ull-smart/libraries/sdk/devices/SConscript
diff --git a/bsp/imx/imx6ull-smart/link.lds b/bsp/nxp/imx/imx6ull-smart/link.lds
index a08c26754c..a08c26754c 100644
--- a/bsp/imx/imx6ull-smart/link.lds
+++ b/bsp/nxp/imx/imx6ull-smart/link.lds
diff --git a/bsp/imx/imx6ull-smart/link_smart.lds b/bsp/nxp/imx/imx6ull-smart/link_smart.lds
index b85d015d5e..b85d015d5e 100644
--- a/bsp/imx/imx6ull-smart/link_smart.lds
+++ b/bsp/nxp/imx/imx6ull-smart/link_smart.lds
diff --git a/bsp/imx/imx6ull-smart/mkimage.py b/bsp/nxp/imx/imx6ull-smart/mkimage.py
index 592f7bb8c0..592f7bb8c0 100644
--- a/bsp/imx/imx6ull-smart/mkimage.py
+++ b/bsp/nxp/imx/imx6ull-smart/mkimage.py
diff --git a/bsp/imx/imx6ull-smart/rtconfig.h b/bsp/nxp/imx/imx6ull-smart/rtconfig.h
index ae79ec1289..ae79ec1289 100644
--- a/bsp/imx/imx6ull-smart/rtconfig.h
+++ b/bsp/nxp/imx/imx6ull-smart/rtconfig.h
diff --git a/bsp/imx/imx6ull-smart/rtconfig.py b/bsp/nxp/imx/imx6ull-smart/rtconfig.py
index ce6c3d61a0..ce6c3d61a0 100644
--- a/bsp/imx/imx6ull-smart/rtconfig.py
+++ b/bsp/nxp/imx/imx6ull-smart/rtconfig.py
diff --git a/bsp/imxrt/README.md b/bsp/nxp/imx/imxrt/README.md
index 7a563141b6..7a563141b6 100644
--- a/bsp/imxrt/README.md
+++ b/bsp/nxp/imx/imxrt/README.md
diff --git a/bsp/imxrt/docs/AN13232 - RT-Thread Board Port and Application Development.pdf b/bsp/nxp/imx/imxrt/docs/AN13232 - RT-Thread Board Port and Application Development.pdf
index 24ef3b70f8..24ef3b70f8 100644
--- a/bsp/imxrt/docs/AN13232 - RT-Thread Board Port and Application Development.pdf
+++ b/bsp/nxp/imx/imxrt/docs/AN13232 - RT-Thread Board Port and Application Development.pdf
diff --git a/bsp/imxrt/docs/IMXRT系列BSP制作教程.md b/bsp/nxp/imx/imxrt/docs/IMXRT系列BSP制作教程.md
index 775d922c1b..775d922c1b 100644
--- a/bsp/imxrt/docs/IMXRT系列BSP制作教程.md
+++ b/bsp/nxp/imx/imxrt/docs/IMXRT系列BSP制作教程.md
diff --git a/bsp/imxrt/docs/IMXRT系列BSP外设驱动使用教程.md b/bsp/nxp/imx/imxrt/docs/IMXRT系列BSP外设驱动使用教程.md
index 5ddaddfe6e..5ddaddfe6e 100644
--- a/bsp/imxrt/docs/IMXRT系列BSP外设驱动使用教程.md
+++ b/bsp/nxp/imx/imxrt/docs/IMXRT系列BSP外设驱动使用教程.md
diff --git a/bsp/imxrt/docs/IMXRT系列外设驱动添加指南.md b/bsp/nxp/imx/imxrt/docs/IMXRT系列外设驱动添加指南.md
index 88499167c9..88499167c9 100644
--- a/bsp/imxrt/docs/IMXRT系列外设驱动添加指南.md
+++ b/bsp/nxp/imx/imxrt/docs/IMXRT系列外设驱动添加指南.md
diff --git a/bsp/imxrt/docs/IMXRT系列驱动介绍.md b/bsp/nxp/imx/imxrt/docs/IMXRT系列驱动介绍.md
index dff7bdd8e6..dff7bdd8e6 100644
--- a/bsp/imxrt/docs/IMXRT系列驱动介绍.md
+++ b/bsp/nxp/imx/imxrt/docs/IMXRT系列驱动介绍.md
diff --git a/bsp/imxrt/docs/figures/Kconfig.png b/bsp/nxp/imx/imxrt/docs/figures/Kconfig.png
index bededbd385..bededbd385 100644
--- a/bsp/imxrt/docs/figures/Kconfig.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/Kconfig.png
diff --git a/bsp/imxrt/docs/figures/Kconfig2.png b/bsp/nxp/imx/imxrt/docs/figures/Kconfig2.png
index 80b31b0ee5..80b31b0ee5 100644
--- a/bsp/imxrt/docs/figures/Kconfig2.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/Kconfig2.png
diff --git a/bsp/imxrt/docs/figures/Peripheral.png b/bsp/nxp/imx/imxrt/docs/figures/Peripheral.png
index 759fe3e8a9..759fe3e8a9 100644
--- a/bsp/imxrt/docs/figures/Peripheral.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/Peripheral.png
diff --git a/bsp/imxrt/docs/figures/SConscript.png b/bsp/nxp/imx/imxrt/docs/figures/SConscript.png
index 8b57bfb148..8b57bfb148 100644
--- a/bsp/imxrt/docs/figures/SConscript.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/SConscript.png
diff --git a/bsp/imxrt/docs/figures/adc_config1.png b/bsp/nxp/imx/imxrt/docs/figures/adc_config1.png
index a39d09750d..a39d09750d 100644
--- a/bsp/imxrt/docs/figures/adc_config1.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/adc_config1.png
diff --git a/bsp/imxrt/docs/figures/adc_config2.png b/bsp/nxp/imx/imxrt/docs/figures/adc_config2.png
index 8c476d2584..8c476d2584 100644
--- a/bsp/imxrt/docs/figures/adc_config2.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/adc_config2.png
diff --git a/bsp/imxrt/docs/figures/adc_config3.png b/bsp/nxp/imx/imxrt/docs/figures/adc_config3.png
index 009055461b..009055461b 100644
--- a/bsp/imxrt/docs/figures/adc_config3.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/adc_config3.png
diff --git a/bsp/imxrt/docs/figures/adc_config4.png b/bsp/nxp/imx/imxrt/docs/figures/adc_config4.png
index 8ffe26cadd..8ffe26cadd 100644
--- a/bsp/imxrt/docs/figures/adc_config4.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/adc_config4.png
diff --git a/bsp/imxrt/docs/figures/board_kconfig2.png b/bsp/nxp/imx/imxrt/docs/figures/board_kconfig2.png
index 7386cdc31f..7386cdc31f 100644
--- a/bsp/imxrt/docs/figures/board_kconfig2.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/board_kconfig2.png
diff --git a/bsp/imxrt/docs/figures/bsp_template_dir.png b/bsp/nxp/imx/imxrt/docs/figures/bsp_template_dir.png
index acfd130d68..acfd130d68 100644
--- a/bsp/imxrt/docs/figures/bsp_template_dir.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/bsp_template_dir.png
diff --git a/bsp/imxrt/docs/figures/complise.png b/bsp/nxp/imx/imxrt/docs/figures/complise.png
index bc0c6bd3c3..bc0c6bd3c3 100644
--- a/bsp/imxrt/docs/figures/complise.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/complise.png
diff --git a/bsp/imxrt/docs/figures/config1.png b/bsp/nxp/imx/imxrt/docs/figures/config1.png
index e797253845..e797253845 100644
--- a/bsp/imxrt/docs/figures/config1.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/config1.png
diff --git a/bsp/imxrt/docs/figures/config2.png b/bsp/nxp/imx/imxrt/docs/figures/config2.png
index f10d684cda..f10d684cda 100644
--- a/bsp/imxrt/docs/figures/config2.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/config2.png
diff --git a/bsp/imxrt/docs/figures/config5.png b/bsp/nxp/imx/imxrt/docs/figures/config5.png
index 18a6541d57..18a6541d57 100644
--- a/bsp/imxrt/docs/figures/config5.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/config5.png
diff --git a/bsp/imxrt/docs/figures/copy.png b/bsp/nxp/imx/imxrt/docs/figures/copy.png
index a2201c22e8..a2201c22e8 100644
--- a/bsp/imxrt/docs/figures/copy.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/copy.png
diff --git a/bsp/imxrt/docs/figures/frame.png b/bsp/nxp/imx/imxrt/docs/figures/frame.png
index e6489399f8..e6489399f8 100644
--- a/bsp/imxrt/docs/figures/frame.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/frame.png
diff --git a/bsp/imxrt/docs/figures/gpt_config1.png b/bsp/nxp/imx/imxrt/docs/figures/gpt_config1.png
index 4c6e17cf7e..4c6e17cf7e 100644
--- a/bsp/imxrt/docs/figures/gpt_config1.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/gpt_config1.png
diff --git a/bsp/imxrt/docs/figures/gpt_config2.png b/bsp/nxp/imx/imxrt/docs/figures/gpt_config2.png
index 6b7ca7de7c..6b7ca7de7c 100644
--- a/bsp/imxrt/docs/figures/gpt_config2.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/gpt_config2.png
diff --git a/bsp/imxrt/docs/figures/gpt_config3.png b/bsp/nxp/imx/imxrt/docs/figures/gpt_config3.png
index eec93161ec..eec93161ec 100644
--- a/bsp/imxrt/docs/figures/gpt_config3.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/gpt_config3.png
diff --git a/bsp/imxrt/docs/figures/i2c2_code.png b/bsp/nxp/imx/imxrt/docs/figures/i2c2_code.png
index c864654f2b..c864654f2b 100644
--- a/bsp/imxrt/docs/figures/i2c2_code.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/i2c2_code.png
diff --git a/bsp/imxrt/docs/figures/i2c2_config.png b/bsp/nxp/imx/imxrt/docs/figures/i2c2_config.png
index bacb283598..bacb283598 100644
--- a/bsp/imxrt/docs/figures/i2c2_config.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/i2c2_config.png
diff --git a/bsp/imxrt/docs/figures/i2c_device1.png b/bsp/nxp/imx/imxrt/docs/figures/i2c_device1.png
index 164b29f517..164b29f517 100644
--- a/bsp/imxrt/docs/figures/i2c_device1.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/i2c_device1.png
diff --git a/bsp/imxrt/docs/figures/link-icf.png b/bsp/nxp/imx/imxrt/docs/figures/link-icf.png
index 720efea2ff..720efea2ff 100644
--- a/bsp/imxrt/docs/figures/link-icf.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/link-icf.png
diff --git a/bsp/imxrt/docs/figures/link-lds.png b/bsp/nxp/imx/imxrt/docs/figures/link-lds.png
index 6b17d0d71b..6b17d0d71b 100644
--- a/bsp/imxrt/docs/figures/link-lds.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/link-lds.png
diff --git a/bsp/imxrt/docs/figures/link-scf.png b/bsp/nxp/imx/imxrt/docs/figures/link-scf.png
index 883f970886..883f970886 100644
--- a/bsp/imxrt/docs/figures/link-scf.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/link-scf.png
diff --git a/bsp/imxrt/docs/figures/linker_scripts.png b/bsp/nxp/imx/imxrt/docs/figures/linker_scripts.png
index cce10f59ad..cce10f59ad 100644
--- a/bsp/imxrt/docs/figures/linker_scripts.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/linker_scripts.png
diff --git a/bsp/imxrt/docs/figures/mcupress_2.png b/bsp/nxp/imx/imxrt/docs/figures/mcupress_2.png
index d78d975e11..d78d975e11 100644
--- a/bsp/imxrt/docs/figures/mcupress_2.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/mcupress_2.png
diff --git a/bsp/imxrt/docs/figures/mcupress_3.png b/bsp/nxp/imx/imxrt/docs/figures/mcupress_3.png
index 06f8152968..06f8152968 100644
--- a/bsp/imxrt/docs/figures/mcupress_3.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/mcupress_3.png
diff --git a/bsp/imxrt/docs/figures/mcupress_clock2.png b/bsp/nxp/imx/imxrt/docs/figures/mcupress_clock2.png
index 13f6258d5f..13f6258d5f 100644
--- a/bsp/imxrt/docs/figures/mcupress_clock2.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/mcupress_clock2.png
diff --git a/bsp/imxrt/docs/figures/mcux_i2c2.png b/bsp/nxp/imx/imxrt/docs/figures/mcux_i2c2.png
index 0732d64b60..0732d64b60 100644
--- a/bsp/imxrt/docs/figures/mcux_i2c2.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/mcux_i2c2.png
diff --git a/bsp/imxrt/docs/figures/mcuxpress.png b/bsp/nxp/imx/imxrt/docs/figures/mcuxpress.png
index 370f544101..370f544101 100644
--- a/bsp/imxrt/docs/figures/mcuxpress.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/mcuxpress.png
diff --git a/bsp/imxrt/docs/figures/mcuxpress_1.png b/bsp/nxp/imx/imxrt/docs/figures/mcuxpress_1.png
index 48b37304a2..48b37304a2 100644
--- a/bsp/imxrt/docs/figures/mcuxpress_1.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/mcuxpress_1.png
diff --git a/bsp/imxrt/docs/figures/mcuxpress_clock1.png b/bsp/nxp/imx/imxrt/docs/figures/mcuxpress_clock1.png
index effa14dede..effa14dede 100644
--- a/bsp/imxrt/docs/figures/mcuxpress_clock1.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/mcuxpress_clock1.png
diff --git a/bsp/imxrt/docs/figures/menuconfig_1.png b/bsp/nxp/imx/imxrt/docs/figures/menuconfig_1.png
index fd1d3bb6c6..fd1d3bb6c6 100644
--- a/bsp/imxrt/docs/figures/menuconfig_1.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/menuconfig_1.png
diff --git a/bsp/imxrt/docs/figures/menuconfig_2.png b/bsp/nxp/imx/imxrt/docs/figures/menuconfig_2.png
index 272ff76a7e..272ff76a7e 100644
--- a/bsp/imxrt/docs/figures/menuconfig_2.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/menuconfig_2.png
diff --git a/bsp/imxrt/docs/figures/menuconfig_3.png b/bsp/nxp/imx/imxrt/docs/figures/menuconfig_3.png
index 6ab976b25e..6ab976b25e 100644
--- a/bsp/imxrt/docs/figures/menuconfig_3.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/menuconfig_3.png
diff --git a/bsp/imxrt/docs/figures/menuconfig_4.png b/bsp/nxp/imx/imxrt/docs/figures/menuconfig_4.png
index bdd4f295b0..bdd4f295b0 100644
--- a/bsp/imxrt/docs/figures/menuconfig_4.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/menuconfig_4.png
diff --git a/bsp/imxrt/docs/figures/menuconfig_apolo.png b/bsp/nxp/imx/imxrt/docs/figures/menuconfig_apolo.png
index 21c81a315c..21c81a315c 100644
--- a/bsp/imxrt/docs/figures/menuconfig_apolo.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/menuconfig_apolo.png
diff --git a/bsp/imxrt/docs/figures/mpu6050.png b/bsp/nxp/imx/imxrt/docs/figures/mpu6050.png
index 9a05dd78ed..9a05dd78ed 100644
--- a/bsp/imxrt/docs/figures/mpu6050.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/mpu6050.png
diff --git a/bsp/imxrt/docs/figures/on_chip_config.png b/bsp/nxp/imx/imxrt/docs/figures/on_chip_config.png
index 8c8d263588..8c8d263588 100644
--- a/bsp/imxrt/docs/figures/on_chip_config.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/on_chip_config.png
diff --git a/bsp/imxrt/docs/figures/open_mcuxpress.png b/bsp/nxp/imx/imxrt/docs/figures/open_mcuxpress.png
index a414af4b72..a414af4b72 100644
--- a/bsp/imxrt/docs/figures/open_mcuxpress.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/open_mcuxpress.png
diff --git a/bsp/imxrt/docs/figures/pwm_config1.png b/bsp/nxp/imx/imxrt/docs/figures/pwm_config1.png
index 52aa7cf1bb..52aa7cf1bb 100644
--- a/bsp/imxrt/docs/figures/pwm_config1.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/pwm_config1.png
diff --git a/bsp/imxrt/docs/figures/pwm_config2.png b/bsp/nxp/imx/imxrt/docs/figures/pwm_config2.png
index 13839b194c..13839b194c 100644
--- a/bsp/imxrt/docs/figures/pwm_config2.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/pwm_config2.png
diff --git a/bsp/imxrt/docs/figures/pwm_config3.png b/bsp/nxp/imx/imxrt/docs/figures/pwm_config3.png
index 3735948665..3735948665 100644
--- a/bsp/imxrt/docs/figures/pwm_config3.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/pwm_config3.png
diff --git a/bsp/imxrt/docs/figures/pwm_device.png b/bsp/nxp/imx/imxrt/docs/figures/pwm_device.png
index d5caffe961..d5caffe961 100644
--- a/bsp/imxrt/docs/figures/pwm_device.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/pwm_device.png
diff --git a/bsp/imxrt/docs/figures/rt_device.png b/bsp/nxp/imx/imxrt/docs/figures/rt_device.png
index fba8a6e0ba..fba8a6e0ba 100644
--- a/bsp/imxrt/docs/figures/rt_device.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/rt_device.png
diff --git a/bsp/imxrt/docs/figures/run_i2c2.png b/bsp/nxp/imx/imxrt/docs/figures/run_i2c2.png
index 1d091754b2..1d091754b2 100644
--- a/bsp/imxrt/docs/figures/run_i2c2.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/run_i2c2.png
diff --git a/bsp/imxrt/docs/figures/save.png b/bsp/nxp/imx/imxrt/docs/figures/save.png
index a02e3aa0e9..a02e3aa0e9 100644
--- a/bsp/imxrt/docs/figures/save.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/save.png
diff --git a/bsp/imxrt/docs/figures/scons_mdk5.png b/bsp/nxp/imx/imxrt/docs/figures/scons_mdk5.png
index 3e081245c8..3e081245c8 100644
--- a/bsp/imxrt/docs/figures/scons_mdk5.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/scons_mdk5.png
diff --git a/bsp/imxrt/docs/figures/template_1.png b/bsp/nxp/imx/imxrt/docs/figures/template_1.png
index 228f2b67c4..228f2b67c4 100644
--- a/bsp/imxrt/docs/figures/template_1.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/template_1.png
diff --git a/bsp/imxrt/docs/figures/template_2.png b/bsp/nxp/imx/imxrt/docs/figures/template_2.png
index a902803e2b..a902803e2b 100644
--- a/bsp/imxrt/docs/figures/template_2.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/template_2.png
diff --git a/bsp/imxrt/docs/figures/template_3.png b/bsp/nxp/imx/imxrt/docs/figures/template_3.png
index 8deac43dc4..8deac43dc4 100644
--- a/bsp/imxrt/docs/figures/template_3.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/template_3.png
diff --git a/bsp/imxrt/docs/figures/template_4.png b/bsp/nxp/imx/imxrt/docs/figures/template_4.png
index 49836669e2..49836669e2 100644
--- a/bsp/imxrt/docs/figures/template_4.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/template_4.png
diff --git a/bsp/imxrt/docs/figures/update.png b/bsp/nxp/imx/imxrt/docs/figures/update.png
index 7fbf1cfbbf..7fbf1cfbbf 100644
--- a/bsp/imxrt/docs/figures/update.png
+++ b/bsp/nxp/imx/imxrt/docs/figures/update.png
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/.config b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/.config
index ed1c9f352e..ed1c9f352e 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/.config
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/.config
diff --git a/bsp/imxrt/imxrt1052-atk-commander/Kconfig b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/Kconfig
index c9221717cb..db456f310b 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/Kconfig
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/Kconfig
@@ -3,7 +3,7 @@ mainmenu "RT-Thread Configuration"
 config RTT_DIR
     string
     option env="RTT_ROOT"
-    default "../../.."
+    default "../../../../.."
 
 config PKGS_DIR
     string
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/README.md b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/README.md
index c5a4ece6b0..c5a4ece6b0 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/README.md
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/README.md
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/README_zh.md b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/README_zh.md
index 4bc7e00ef9..4bc7e00ef9 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/README_zh.md
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/README_zh.md
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/SConscript b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/SConscript
index c7ef7659ec..c7ef7659ec 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/SConscript
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/SConstruct b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/SConstruct
index 99a27abaf3..3b836d1b08 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/SConstruct
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/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:
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/applications/SConscript b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/applications/SConscript
index 050054c59f..050054c59f 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/applications/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/applications/SConscript
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/applications/main.c b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/applications/main.c
index dfd64114e6..dfd64114e6 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/applications/main.c
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/applications/main.c
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/board/Kconfig b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/Kconfig
index 4e7ad9aad1..4e7ad9aad1 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/board/Kconfig
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/Kconfig
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/board/MCUX_Config/MCUX_Config.mex b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/MCUX_Config/MCUX_Config.mex
index e63eb0c204..e63eb0c204 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/board/MCUX_Config/MCUX_Config.mex
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/MCUX_Config/MCUX_Config.mex
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/board/MCUX_Config/clock_config.c b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/MCUX_Config/clock_config.c
index e6357dc338..e6357dc338 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/board/MCUX_Config/clock_config.c
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/MCUX_Config/clock_config.c
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/board/MCUX_Config/clock_config.h b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/MCUX_Config/clock_config.h
index 21d4e630ae..21d4e630ae 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/board/MCUX_Config/clock_config.h
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/MCUX_Config/clock_config.h
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/board/MCUX_Config/dcd.c b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/MCUX_Config/dcd.c
index 50ff1fe6c8..50ff1fe6c8 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/board/MCUX_Config/dcd.c
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/MCUX_Config/dcd.c
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/board/MCUX_Config/dcd.h b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/MCUX_Config/dcd.h
index 185b0ecd89..185b0ecd89 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/board/MCUX_Config/dcd.h
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/MCUX_Config/dcd.h
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/board/MCUX_Config/pin_mux.c b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/MCUX_Config/pin_mux.c
index 74de33431d..74de33431d 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/board/MCUX_Config/pin_mux.c
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/MCUX_Config/pin_mux.c
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/board/MCUX_Config/pin_mux.h b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/MCUX_Config/pin_mux.h
index 83124110e0..83124110e0 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/board/MCUX_Config/pin_mux.h
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/MCUX_Config/pin_mux.h
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/board/SConscript b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/SConscript
index b72c7f4015..b72c7f4015 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/board/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/SConscript
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/board/board.c b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/board.c
index 53767d5b27..53767d5b27 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/board/board.c
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/board.c
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/board/board.h b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/board.h
index 161d9fcb0e..161d9fcb0e 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/board/board.h
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/board.h
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/board/linker_scripts/link.icf b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/linker_scripts/link.icf
index 1563925f19..1563925f19 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/board/linker_scripts/link.icf
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/linker_scripts/link.icf
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/board/linker_scripts/link.lds b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/linker_scripts/link.lds
index a5ca41f9ee..a5ca41f9ee 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/board/linker_scripts/link.lds
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/linker_scripts/link.lds
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/board/linker_scripts/link.sct b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/linker_scripts/link.sct
index 58fbd7f2c3..58fbd7f2c3 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/board/linker_scripts/link.sct
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/linker_scripts/link.sct
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/board/rtconfig.h b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/rtconfig.h
index 471ed9255a..471ed9255a 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/board/rtconfig.h
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/board/rtconfig.h
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/figures/board.jpg b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/figures/board.jpg
index 539f048cb2..539f048cb2 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/figures/board.jpg
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/figures/board.jpg
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/project.ewd b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/project.ewd
index d5d49f021d..d5d49f021d 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/project.ewd
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/project.ewd
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/project.ewp b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/project.ewp
index 3c4c218ced..3c4c218ced 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/project.ewp
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/project.ewp
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/project.eww b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/project.eww
index c2cb02eb1e..c2cb02eb1e 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/project.eww
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/project.eww
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/project.uvoptx b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/project.uvoptx
index f5acc91609..f5acc91609 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/project.uvoptx
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/project.uvoptx
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/project.uvprojx b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/project.uvprojx
index 385f28ad76..385f28ad76 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/project.uvprojx
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/project.uvprojx
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/rtconfig.h b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/rtconfig.h
index 0539e018b8..0539e018b8 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/rtconfig.h
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/rtconfig.h
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/rtconfig.py b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/rtconfig.py
index 70a8122496..70a8122496 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/rtconfig.py
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/rtconfig.py
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/template.ewd b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/template.ewd
index 302552be21..302552be21 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/template.ewd
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/template.ewd
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/template.ewp b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/template.ewp
index f62c4bde93..f62c4bde93 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/template.ewp
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/template.ewp
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/template.ewt b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/template.ewt
index 1201d37c24..1201d37c24 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/template.ewt
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/template.ewt
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/template.eww b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/template.eww
index c62178f07a..c62178f07a 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/template.eww
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/template.eww
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/template.uvoptx b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/template.uvoptx
index f5acc91609..f5acc91609 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/template.uvoptx
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/template.uvoptx
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/template.uvprojx b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/template.uvprojx
index 6faaa7f419..6faaa7f419 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/template.uvprojx
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/template.uvprojx
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/xip/SConscript b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/xip/SConscript
index 9e02702f7d..9e02702f7d 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/xip/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/xip/SConscript
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/xip/fsl_flexspi_nor_boot.c b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/xip/fsl_flexspi_nor_boot.c
index f553b3d4bd..f553b3d4bd 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/xip/fsl_flexspi_nor_boot.c
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/xip/fsl_flexspi_nor_boot.c
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/xip/fsl_flexspi_nor_boot.h b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/xip/fsl_flexspi_nor_boot.h
index 40dd1c0fc1..40dd1c0fc1 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/xip/fsl_flexspi_nor_boot.h
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/xip/fsl_flexspi_nor_boot.h
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/xip/fsl_flexspi_nor_flash.c b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/xip/fsl_flexspi_nor_flash.c
index 9ea51c2c14..9ea51c2c14 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/xip/fsl_flexspi_nor_flash.c
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/xip/fsl_flexspi_nor_flash.c
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/xip/fsl_flexspi_nor_flash.h b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/xip/fsl_flexspi_nor_flash.h
index 6d3b5269cd..6d3b5269cd 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/xip/fsl_flexspi_nor_flash.h
+++ b/bsp/nxp/imx/imxrt/imxrt1021-nxp-evk/xip/fsl_flexspi_nor_flash.h
diff --git a/bsp/imxrt/imxrt1052-atk-commander/.config b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/.config
index 9d9dd9f24a..9d9dd9f24a 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/.config
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/.config
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/Kconfig b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/Kconfig
index c9221717cb..db456f310b 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/Kconfig
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/Kconfig
@@ -3,7 +3,7 @@ mainmenu "RT-Thread Configuration"
 config RTT_DIR
     string
     option env="RTT_ROOT"
-    default "../../.."
+    default "../../../../.."
 
 config PKGS_DIR
     string
diff --git a/bsp/imxrt/imxrt1052-atk-commander/README.md b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/README.md
index f76af4813f..f76af4813f 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/README.md
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/README.md
diff --git a/bsp/imxrt/imxrt1052-atk-commander/SConscript b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/SConscript
index c7ef7659ec..c7ef7659ec 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/SConscript
diff --git a/bsp/imxrt/imxrt1052-fire-pro/SConstruct b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/SConstruct
index f7eb3c0c5e..967a8fbb57 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/SConstruct
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/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:
diff --git a/bsp/imxrt/imxrt1052-atk-commander/applications/SConscript b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/applications/SConscript
index 050054c59f..050054c59f 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/applications/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/applications/SConscript
diff --git a/bsp/imxrt/imxrt1052-atk-commander/applications/main.c b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/applications/main.c
index 928528af45..928528af45 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/applications/main.c
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/applications/main.c
diff --git a/bsp/imxrt/imxrt1052-atk-commander/applications/mnt.c b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/applications/mnt.c
index dea0f459cb..dea0f459cb 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/applications/mnt.c
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/applications/mnt.c
diff --git a/bsp/imxrt/imxrt1052-atk-commander/board/Kconfig b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/Kconfig
index f79a664328..f79a664328 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/board/Kconfig
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/Kconfig
diff --git a/bsp/imxrt/imxrt1052-atk-commander/board/MCUX_Config/MCUX_Config.mex b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/MCUX_Config/MCUX_Config.mex
index bd254aa553..bd254aa553 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/board/MCUX_Config/MCUX_Config.mex
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/MCUX_Config/MCUX_Config.mex
diff --git a/bsp/imxrt/imxrt1052-atk-commander/board/MCUX_Config/clock_config.c b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/MCUX_Config/clock_config.c
index 87b20a1e25..87b20a1e25 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/board/MCUX_Config/clock_config.c
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/MCUX_Config/clock_config.c
diff --git a/bsp/imxrt/imxrt1052-atk-commander/board/MCUX_Config/clock_config.h b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/MCUX_Config/clock_config.h
index 43fbb9d805..43fbb9d805 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/board/MCUX_Config/clock_config.h
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/MCUX_Config/clock_config.h
diff --git a/bsp/imxrt/imxrt1052-atk-commander/board/MCUX_Config/pin_mux.c b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/MCUX_Config/pin_mux.c
index 8ed0a9d069..8ed0a9d069 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/board/MCUX_Config/pin_mux.c
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/MCUX_Config/pin_mux.c
diff --git a/bsp/imxrt/imxrt1052-atk-commander/board/MCUX_Config/pin_mux.h b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/MCUX_Config/pin_mux.h
index b1d61c2782..b1d61c2782 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/board/MCUX_Config/pin_mux.h
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/MCUX_Config/pin_mux.h
diff --git a/bsp/imxrt/imxrt1052-atk-commander/board/MIMXRT105x_QuadSPI_4KB_SEC.FLM b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/MIMXRT105x_QuadSPI_4KB_SEC.FLM
index ac4c378c6a..ac4c378c6a 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/board/MIMXRT105x_QuadSPI_4KB_SEC.FLM
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/MIMXRT105x_QuadSPI_4KB_SEC.FLM
diff --git a/bsp/imxrt/imxrt1052-atk-commander/board/SConscript b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/SConscript
index e6008ae576..e6008ae576 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/board/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/SConscript
diff --git a/bsp/imxrt/imxrt1052-atk-commander/board/board.c b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/board.c
index c93ea67ea4..c93ea67ea4 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/board/board.c
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/board.c
diff --git a/bsp/imxrt/imxrt1052-atk-commander/board/board.h b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/board.h
index 100b932ebd..100b932ebd 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/board/board.h
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/board.h
diff --git a/bsp/imxrt/imxrt1052-atk-commander/board/linker_scripts/link.icf b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/linker_scripts/link.icf
index e1dd5a7ea4..e1dd5a7ea4 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/board/linker_scripts/link.icf
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/linker_scripts/link.icf
diff --git a/bsp/imxrt/imxrt1052-atk-commander/board/linker_scripts/link.lds b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/linker_scripts/link.lds
index d21ddb6a79..d21ddb6a79 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/board/linker_scripts/link.lds
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/linker_scripts/link.lds
diff --git a/bsp/imxrt/imxrt1052-atk-commander/board/linker_scripts/link.sct b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/linker_scripts/link.sct
index ef0ddf80f3..ef0ddf80f3 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/board/linker_scripts/link.sct
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/linker_scripts/link.sct
diff --git a/bsp/imxrt/imxrt1052-atk-commander/board/ports/sdram_port.h b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/ports/sdram_port.h
index 477987b4e7..477987b4e7 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/board/ports/sdram_port.h
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/ports/sdram_port.h
diff --git a/bsp/imxrt/imxrt1052-atk-commander/board/ports/spi_flash_init.c b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/ports/spi_flash_init.c
index 8137c00f5e..8137c00f5e 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/board/ports/spi_flash_init.c
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/board/ports/spi_flash_init.c
diff --git a/bsp/imxrt/imxrt1052-atk-commander/figures/board.png b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/figures/board.png
index 808b1a2539..808b1a2539 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/figures/board.png
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/figures/board.png
diff --git a/bsp/imxrt/imxrt1052-atk-commander/figures/flash.png b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/figures/flash.png
index 56422acec6..56422acec6 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/figures/flash.png
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/figures/flash.png
diff --git a/bsp/imxrt/imxrt1052-atk-commander/project.uvoptx b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/project.uvoptx
index 526a00b913..526a00b913 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/project.uvoptx
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/project.uvoptx
diff --git a/bsp/imxrt/imxrt1052-atk-commander/project.uvprojx b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/project.uvprojx
index 350456060a..350456060a 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/project.uvprojx
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/project.uvprojx
diff --git a/bsp/imxrt/imxrt1052-atk-commander/rtconfig.h b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/rtconfig.h
index 58c248546e..58c248546e 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/rtconfig.h
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/rtconfig.h
diff --git a/bsp/imxrt/imxrt1052-atk-commander/rtconfig.py b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/rtconfig.py
index fe92208216..fe92208216 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/rtconfig.py
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/rtconfig.py
diff --git a/bsp/imxrt/imxrt1052-atk-commander/template.uvoptx b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/template.uvoptx
index 526a00b913..526a00b913 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/template.uvoptx
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/template.uvoptx
diff --git a/bsp/imxrt/imxrt1052-atk-commander/template.uvprojx b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/template.uvprojx
index 826684fa7a..826684fa7a 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/template.uvprojx
+++ b/bsp/nxp/imx/imxrt/imxrt1052-atk-commander/template.uvprojx
diff --git a/bsp/imxrt/imxrt1052-fire-pro/.config b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/.config
index 7b390574e2..7b390574e2 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/.config
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/.config
diff --git a/bsp/imxrt/imxrt1052-fire-pro/.cproject b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/.cproject
index 9c3ebf8baa..9c3ebf8baa 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/.cproject
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/.cproject
diff --git a/bsp/imxrt/imxrt1052-fire-pro/.project b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/.project
index 3fb729f636..3fb729f636 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/.project
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/.project
diff --git a/bsp/imxrt/imxrt1052-fire-pro/.settings/.rtmenus b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/.settings/.rtmenus
index 36523c73cb..36523c73cb 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/.settings/.rtmenus
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/.settings/.rtmenus
diff --git a/bsp/imxrt/imxrt1052-fire-pro/.settings/ilg.gnumcueclipse.debug.gdbjtag.jlink.prefs b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/.settings/ilg.gnumcueclipse.debug.gdbjtag.jlink.prefs
index d7f531fa07..d7f531fa07 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/.settings/ilg.gnumcueclipse.debug.gdbjtag.jlink.prefs
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/.settings/ilg.gnumcueclipse.debug.gdbjtag.jlink.prefs
diff --git a/bsp/imxrt/imxrt1052-fire-pro/.settings/imxrt1052-fire-pro.JLink.Debug.rttlaunch b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/.settings/imxrt1052-fire-pro.JLink.Debug.rttlaunch
index 295d8081ff..295d8081ff 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/.settings/imxrt1052-fire-pro.JLink.Debug.rttlaunch
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/.settings/imxrt1052-fire-pro.JLink.Debug.rttlaunch
diff --git a/bsp/imxrt/imxrt1052-fire-pro/.settings/language.settings.xml b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/.settings/language.settings.xml
index ee1c9a123f..ee1c9a123f 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/.settings/language.settings.xml
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/.settings/language.settings.xml
diff --git a/bsp/imxrt/imxrt1052-fire-pro/.settings/org.eclipse.core.runtime.prefs b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/.settings/org.eclipse.core.runtime.prefs
index 9f1acfcfba..9f1acfcfba 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/.settings/org.eclipse.core.runtime.prefs
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/.settings/org.eclipse.core.runtime.prefs
diff --git a/bsp/imxrt/imxrt1052-fire-pro/.settings/projcfg.ini b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/.settings/projcfg.ini
index b68f23a381..b68f23a381 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/.settings/projcfg.ini
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/.settings/projcfg.ini
diff --git a/bsp/imxrt/imxrt1052-fire-pro/.settings/rt1052-fire.DAPLink.Debug.rttlaunch b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/.settings/rt1052-fire.DAPLink.Debug.rttlaunch
index 54b0dcff20..54b0dcff20 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/.settings/rt1052-fire.DAPLink.Debug.rttlaunch
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/.settings/rt1052-fire.DAPLink.Debug.rttlaunch
diff --git a/bsp/imxrt/imxrt1052-fire-pro/.settings/rt1052-fire.JLink.Debug.rttlaunch b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/.settings/rt1052-fire.JLink.Debug.rttlaunch
index 9da2727e81..9da2727e81 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/.settings/rt1052-fire.JLink.Debug.rttlaunch
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/.settings/rt1052-fire.JLink.Debug.rttlaunch
diff --git a/bsp/imxrt/imxrt1052-fire-pro/.settings/rt1052-yh.JLink.Debug.rttlaunch b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/.settings/rt1052-yh.JLink.Debug.rttlaunch
index 6d0232e000..6d0232e000 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/.settings/rt1052-yh.JLink.Debug.rttlaunch
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/.settings/rt1052-yh.JLink.Debug.rttlaunch
diff --git a/bsp/imxrt/imxrt1052-fire-pro/.settings/test-1052.JLink.Debug.rttlaunch b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/.settings/test-1052.JLink.Debug.rttlaunch
index 611c86d46d..611c86d46d 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/.settings/test-1052.JLink.Debug.rttlaunch
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/.settings/test-1052.JLink.Debug.rttlaunch
diff --git a/bsp/imxrt/imxrt1052-fire-pro/JLinkSettings.ini b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/JLinkSettings.ini
index 416f404dbf..416f404dbf 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/JLinkSettings.ini
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/JLinkSettings.ini
diff --git a/bsp/imxrt/imxrt1052-fire-pro/Kconfig b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/Kconfig
index c9221717cb..db456f310b 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/Kconfig
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/Kconfig
@@ -3,7 +3,7 @@ mainmenu "RT-Thread Configuration"
 config RTT_DIR
     string
     option env="RTT_ROOT"
-    default "../../.."
+    default "../../../../.."
 
 config PKGS_DIR
     string
diff --git a/bsp/imxrt/imxrt1052-fire-pro/README.md b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/README.md
index 2bb61826dd..2bb61826dd 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/README.md
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/README.md
diff --git a/bsp/imxrt/imxrt1052-fire-pro/SConscript b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/SConscript
index c7ef7659ec..c7ef7659ec 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/SConscript
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/SConstruct b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/SConstruct
index f7eb3c0c5e..967a8fbb57 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/SConstruct
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/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:
diff --git a/bsp/imxrt/imxrt1052-fire-pro/applications/SConscript b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/applications/SConscript
index 050054c59f..050054c59f 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/applications/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/applications/SConscript
diff --git a/bsp/imxrt/imxrt1052-fire-pro/applications/main.c b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/applications/main.c
index 9240eb5265..9240eb5265 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/applications/main.c
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/applications/main.c
diff --git a/bsp/imxrt/imxrt1052-fire-pro/board/FlashIMXRT1052_YH_FlexSPI.board b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/FlashIMXRT1052_YH_FlexSPI.board
index 40c4b5dd28..40c4b5dd28 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/board/FlashIMXRT1052_YH_FlexSPI.board
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/FlashIMXRT1052_YH_FlexSPI.board
diff --git a/bsp/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/Devices/NXP/iMXRT_UFL/MIMXRT_FLEXSPI_UFL_256B_4KB.FLM b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/Devices/NXP/iMXRT_UFL/MIMXRT_FLEXSPI_UFL_256B_4KB.FLM
index e56ad5dd6c..e56ad5dd6c 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/Devices/NXP/iMXRT_UFL/MIMXRT_FLEXSPI_UFL_256B_4KB.FLM
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/Devices/NXP/iMXRT_UFL/MIMXRT_FLEXSPI_UFL_256B_4KB.FLM
diff --git a/bsp/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/Devices/NXP/iMXRT_UFL/MIMXRT_FLEXSPI_UFL_512B_4KB.FLM b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/Devices/NXP/iMXRT_UFL/MIMXRT_FLEXSPI_UFL_512B_4KB.FLM
index 89ae65f1cb..89ae65f1cb 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/Devices/NXP/iMXRT_UFL/MIMXRT_FLEXSPI_UFL_512B_4KB.FLM
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/Devices/NXP/iMXRT_UFL/MIMXRT_FLEXSPI_UFL_512B_4KB.FLM
diff --git a/bsp/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/Devices/NXP/iMXRT_UFL/MIMXRT_FLEXSPI_UFL_512B_64KB.FLM b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/Devices/NXP/iMXRT_UFL/MIMXRT_FLEXSPI_UFL_512B_64KB.FLM
index 80bb836530..80bb836530 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/Devices/NXP/iMXRT_UFL/MIMXRT_FLEXSPI_UFL_512B_64KB.FLM
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/Devices/NXP/iMXRT_UFL/MIMXRT_FLEXSPI_UFL_512B_64KB.FLM
diff --git a/bsp/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/Devices/NXP/iMXRT_UFL/iMXRT1011_CortexM7.JLinkScript b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/Devices/NXP/iMXRT_UFL/iMXRT1011_CortexM7.JLinkScript
index e2ddd3e508..e2ddd3e508 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/Devices/NXP/iMXRT_UFL/iMXRT1011_CortexM7.JLinkScript
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/Devices/NXP/iMXRT_UFL/iMXRT1011_CortexM7.JLinkScript
diff --git a/bsp/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/Devices/NXP/iMXRT_UFL/iMXRT117x_CortexM7.JLinkScript b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/Devices/NXP/iMXRT_UFL/iMXRT117x_CortexM7.JLinkScript
index 0fc93008f0..0fc93008f0 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/Devices/NXP/iMXRT_UFL/iMXRT117x_CortexM7.JLinkScript
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/Devices/NXP/iMXRT_UFL/iMXRT117x_CortexM7.JLinkScript
diff --git a/bsp/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/Devices/NXP/iMXRT_UFL/iMXRT5xx_CortexM33.JLinkScript b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/Devices/NXP/iMXRT_UFL/iMXRT5xx_CortexM33.JLinkScript
index 53e5934d60..53e5934d60 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/Devices/NXP/iMXRT_UFL/iMXRT5xx_CortexM33.JLinkScript
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/Devices/NXP/iMXRT_UFL/iMXRT5xx_CortexM33.JLinkScript
diff --git a/bsp/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/Devices/NXP/iMXRT_UFL/iMXRT6xx_CortexM33.JLinkScript b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/Devices/NXP/iMXRT_UFL/iMXRT6xx_CortexM33.JLinkScript
index 3cc1e46452..3cc1e46452 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/Devices/NXP/iMXRT_UFL/iMXRT6xx_CortexM33.JLinkScript
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/Devices/NXP/iMXRT_UFL/iMXRT6xx_CortexM33.JLinkScript
diff --git a/bsp/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/JLinkDevices.xml b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/JLinkDevices.xml
index ea49be2257..ea49be2257 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/JLinkDevices.xml
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/JLink_Vxxx/JLinkDevices.xml
diff --git a/bsp/imxrt/imxrt1052-fire-pro/board/Kconfig b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/Kconfig
index 2e071dbb34..2e071dbb34 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/board/Kconfig
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/Kconfig
diff --git a/bsp/imxrt/imxrt1052-fire-pro/board/MCUX_Config/MCUX_Config.mex b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/MCUX_Config/MCUX_Config.mex
index 5b8653181e..5b8653181e 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/board/MCUX_Config/MCUX_Config.mex
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/MCUX_Config/MCUX_Config.mex
diff --git a/bsp/imxrt/imxrt1052-fire-pro/board/MCUX_Config/clock_config.c b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/MCUX_Config/clock_config.c
index 2df780010a..2df780010a 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/board/MCUX_Config/clock_config.c
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/MCUX_Config/clock_config.c
diff --git a/bsp/imxrt/imxrt1052-fire-pro/board/MCUX_Config/clock_config.h b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/MCUX_Config/clock_config.h
index 43fbb9d805..43fbb9d805 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/board/MCUX_Config/clock_config.h
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/MCUX_Config/clock_config.h
diff --git a/bsp/imxrt/imxrt1052-fire-pro/board/MCUX_Config/pin_mux.c b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/MCUX_Config/pin_mux.c
index a837d6f11e..a837d6f11e 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/board/MCUX_Config/pin_mux.c
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/MCUX_Config/pin_mux.c
diff --git a/bsp/imxrt/imxrt1052-fire-pro/board/MCUX_Config/pin_mux.h b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/MCUX_Config/pin_mux.h
index 64dc93b63a..64dc93b63a 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/board/MCUX_Config/pin_mux.h
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/MCUX_Config/pin_mux.h
diff --git a/bsp/imxrt/imxrt1052-fire-pro/board/SConscript b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/SConscript
index 82349a3dba..82349a3dba 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/board/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/SConscript
diff --git a/bsp/imxrt/imxrt1052-fire-pro/board/board.c b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/board.c
index 529571c42d..529571c42d 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/board/board.c
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/board.c
diff --git a/bsp/imxrt/imxrt1052-fire-pro/board/board.h b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/board.h
index 100b932ebd..100b932ebd 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/board/board.h
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/board.h
diff --git a/bsp/imxrt/imxrt1052-fire-pro/board/iMXRT1052_W25Q256JV_CFG_By_Fire.FLM b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/iMXRT1052_W25Q256JV_CFG_By_Fire.FLM
index 54459aea4e..54459aea4e 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/board/iMXRT1052_W25Q256JV_CFG_By_Fire.FLM
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/iMXRT1052_W25Q256JV_CFG_By_Fire.FLM
diff --git a/bsp/imxrt/imxrt1052-fire-pro/board/linker_scripts/link.icf b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/linker_scripts/link.icf
index 1f8a959d32..1f8a959d32 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/board/linker_scripts/link.icf
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/linker_scripts/link.icf
diff --git a/bsp/imxrt/imxrt1052-fire-pro/board/linker_scripts/link.lds b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/linker_scripts/link.lds
index 1e11ddc014..1e11ddc014 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/board/linker_scripts/link.lds
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/linker_scripts/link.lds
diff --git a/bsp/imxrt/imxrt1052-fire-pro/board/linker_scripts/link.sct b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/linker_scripts/link.sct
index 7a551bc6d5..7a551bc6d5 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/board/linker_scripts/link.sct
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/board/linker_scripts/link.sct
diff --git a/bsp/imxrt/imxrt1052-fire-pro/figures/1.png b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/figures/1.png
index 96a782bc16..96a782bc16 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/figures/1.png
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/figures/1.png
diff --git a/bsp/imxrt/imxrt1052-fire-pro/figures/2.png b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/figures/2.png
index d8128d750f..d8128d750f 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/figures/2.png
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/figures/2.png
diff --git a/bsp/imxrt/imxrt1052-fire-pro/figures/3.png b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/figures/3.png
index f0e8a25d59..f0e8a25d59 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/figures/3.png
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/figures/3.png
diff --git a/bsp/imxrt/imxrt1052-fire-pro/figures/4.png b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/figures/4.png
index 7ac3404845..7ac3404845 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/figures/4.png
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/figures/4.png
diff --git a/bsp/imxrt/imxrt1052-fire-pro/figures/5.png b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/figures/5.png
index 975f4618ee..975f4618ee 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/figures/5.png
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/figures/5.png
diff --git a/bsp/imxrt/imxrt1052-fire-pro/figures/6.png b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/figures/6.png
index 86ecad2115..86ecad2115 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/figures/6.png
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/figures/6.png
diff --git a/bsp/imxrt/imxrt1052-fire-pro/figures/7.png b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/figures/7.png
index 5c99ca7a2c..5c99ca7a2c 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/figures/7.png
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/figures/7.png
diff --git a/bsp/imxrt/imxrt1052-fire-pro/figures/8.png b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/figures/8.png
index 0a07c50c0b..0a07c50c0b 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/figures/8.png
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/figures/8.png
diff --git a/bsp/imxrt/imxrt1052-fire-pro/figures/9.png b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/figures/9.png
index c6c61580b5..c6c61580b5 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/figures/9.png
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/figures/9.png
diff --git a/bsp/imxrt/imxrt1052-fire-pro/figures/board.png b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/figures/board.png
index 91918bfd37..91918bfd37 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/figures/board.png
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/figures/board.png
diff --git a/bsp/imxrt/imxrt1052-fire-pro/figures/flash.png b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/figures/flash.png
index 02fc56be40..02fc56be40 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/figures/flash.png
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/figures/flash.png
diff --git a/bsp/imxrt/imxrt1052-fire-pro/makefile.targets b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/makefile.targets
index 949e22c875..949e22c875 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/makefile.targets
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/makefile.targets
diff --git a/bsp/imxrt/imxrt1052-fire-pro/project.ewd b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/project.ewd
index fde148cb89..fde148cb89 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/project.ewd
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/project.ewd
diff --git a/bsp/imxrt/imxrt1052-fire-pro/project.ewp b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/project.ewp
index 2f554a16f1..2f554a16f1 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/project.ewp
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/project.ewp
diff --git a/bsp/imxrt/imxrt1052-fire-pro/project.ewt b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/project.ewt
index f2e841061a..f2e841061a 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/project.ewt
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/project.ewt
diff --git a/bsp/imxrt/imxrt1052-fire-pro/project.eww b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/project.eww
index c2cb02eb1e..c2cb02eb1e 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/project.eww
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/project.eww
diff --git a/bsp/imxrt/imxrt1052-fire-pro/project.uvoptx b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/project.uvoptx
index 75f90396bc..75f90396bc 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/project.uvoptx
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/project.uvoptx
diff --git a/bsp/imxrt/imxrt1052-fire-pro/project.uvprojx b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/project.uvprojx
index 25f35789be..25f35789be 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/project.uvprojx
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/project.uvprojx
diff --git a/bsp/imxrt/imxrt1052-fire-pro/rtconfig.h b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/rtconfig.h
index 85518cac41..85518cac41 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/rtconfig.h
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/rtconfig.h
diff --git a/bsp/imxrt/imxrt1052-fire-pro/rtconfig.py b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/rtconfig.py
index 60d2a9fc13..60d2a9fc13 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/rtconfig.py
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/rtconfig.py
diff --git a/bsp/imxrt/imxrt1052-fire-pro/template.ewd b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/template.ewd
index 13f7ef8122..13f7ef8122 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/template.ewd
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/template.ewd
diff --git a/bsp/imxrt/imxrt1052-fire-pro/template.ewp b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/template.ewp
index fb890850d1..fb890850d1 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/template.ewp
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/template.ewp
diff --git a/bsp/imxrt/imxrt1052-fire-pro/template.ewt b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/template.ewt
index 1201d37c24..1201d37c24 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/template.ewt
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/template.ewt
diff --git a/bsp/imxrt/imxrt1052-fire-pro/template.eww b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/template.eww
index bd036bb4c9..bd036bb4c9 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/template.eww
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/template.eww
diff --git a/bsp/imxrt/imxrt1052-fire-pro/template.uvoptx b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/template.uvoptx
index 75f90396bc..75f90396bc 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/template.uvoptx
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/template.uvoptx
diff --git a/bsp/imxrt/imxrt1052-fire-pro/template.uvprojx b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/template.uvprojx
index f0e00b64d8..f0e00b64d8 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/template.uvprojx
+++ b/bsp/nxp/imx/imxrt/imxrt1052-fire-pro/template.uvprojx
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/.config b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/.config
index 2dd60fd820..2dd60fd820 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/.config
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/.config
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/Kconfig b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/Kconfig
index c9221717cb..db456f310b 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/Kconfig
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/Kconfig
@@ -3,7 +3,7 @@ mainmenu "RT-Thread Configuration"
 config RTT_DIR
     string
     option env="RTT_ROOT"
-    default "../../.."
+    default "../../../../.."
 
 config PKGS_DIR
     string
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/README.md b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/README.md
index dda9abfed5..dda9abfed5 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/README.md
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/README.md
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/README_zh.md b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/README_zh.md
index 35106a132a..35106a132a 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/README_zh.md
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/README_zh.md
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/SConscript b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/SConscript
index c7ef7659ec..c7ef7659ec 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/SConscript
diff --git a/bsp/imxrt/imxrt1052-atk-commander/SConstruct b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/SConstruct
index f7eb3c0c5e..967a8fbb57 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/SConstruct
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/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:
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/applications/SConscript b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/applications/SConscript
index 050054c59f..050054c59f 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/applications/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/applications/SConscript
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/applications/main.c b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/applications/main.c
index 09ba861d27..09ba861d27 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/applications/main.c
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/applications/main.c
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/applications/mnt.c b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/applications/mnt.c
index e690a296f7..e690a296f7 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/applications/mnt.c
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/applications/mnt.c
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/board/Kconfig b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/board/Kconfig
index b559da08f2..b559da08f2 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/board/Kconfig
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/board/Kconfig
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/board/MCUX_Config/MCUX_Config.mex b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/board/MCUX_Config/MCUX_Config.mex
index 3948e028f5..3948e028f5 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/board/MCUX_Config/MCUX_Config.mex
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/board/MCUX_Config/MCUX_Config.mex
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/board/MCUX_Config/clock_config.c b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/board/MCUX_Config/clock_config.c
index 87b20a1e25..87b20a1e25 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/board/MCUX_Config/clock_config.c
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/board/MCUX_Config/clock_config.c
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/board/MCUX_Config/clock_config.h b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/board/MCUX_Config/clock_config.h
index 43fbb9d805..43fbb9d805 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/board/MCUX_Config/clock_config.h
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/board/MCUX_Config/clock_config.h
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/board/MCUX_Config/pin_mux.c b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/board/MCUX_Config/pin_mux.c
index e3cc5521a4..e3cc5521a4 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/board/MCUX_Config/pin_mux.c
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/board/MCUX_Config/pin_mux.c
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/board/MCUX_Config/pin_mux.h b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/board/MCUX_Config/pin_mux.h
index d76728870b..d76728870b 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/board/MCUX_Config/pin_mux.h
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/board/MCUX_Config/pin_mux.h
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/board/SConscript b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/board/SConscript
index a338eca9fa..a338eca9fa 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/board/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/board/SConscript
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/board/board.c b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/board/board.c
index 7369cef723..7369cef723 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/board/board.c
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/board/board.c
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/board/board.h b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/board/board.h
index 1a14ad8737..1a14ad8737 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/board/board.h
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/board/board.h
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/board/linker_scripts/link.icf b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/board/linker_scripts/link.icf
index a022ded1d6..a022ded1d6 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/board/linker_scripts/link.icf
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/board/linker_scripts/link.icf
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/board/linker_scripts/link.lds b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/board/linker_scripts/link.lds
index d21ddb6a79..d21ddb6a79 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/board/linker_scripts/link.lds
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/board/linker_scripts/link.lds
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/board/linker_scripts/link.sct b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/board/linker_scripts/link.sct
index 9e7f6546d2..9e7f6546d2 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/board/linker_scripts/link.sct
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/board/linker_scripts/link.sct
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/board/ports/sdram_port.h b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/board/ports/sdram_port.h
index 477987b4e7..477987b4e7 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/board/ports/sdram_port.h
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/board/ports/sdram_port.h
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/figures/board.jpg b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/figures/board.jpg
index d65556bae2..d65556bae2 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/figures/board.jpg
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/figures/board.jpg
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/project.ewd b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/project.ewd
index 7d05672c5a..7d05672c5a 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/project.ewd
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/project.ewd
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/project.ewp b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/project.ewp
index 5c675ea2a7..5c675ea2a7 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/project.ewp
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/project.ewp
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/project.eww b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/project.eww
index c2cb02eb1e..c2cb02eb1e 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/project.eww
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/project.eww
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/project.uvoptx b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/project.uvoptx
index 48f8775efc..48f8775efc 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/project.uvoptx
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/project.uvoptx
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/project.uvprojx b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/project.uvprojx
index 0bee46d64d..0bee46d64d 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/project.uvprojx
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/project.uvprojx
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/rtconfig.h b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/rtconfig.h
index 60946939bb..60946939bb 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/rtconfig.h
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/rtconfig.h
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/rtconfig.py b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/rtconfig.py
index 456c1f9267..456c1f9267 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/rtconfig.py
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/rtconfig.py
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/template.ewd b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/template.ewd
index 8e75189b2d..8e75189b2d 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/template.ewd
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/template.ewd
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/template.ewp b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/template.ewp
index 7e3b282e2c..7e3b282e2c 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/template.ewp
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/template.ewp
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/template.ewt b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/template.ewt
index 1201d37c24..1201d37c24 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/template.ewt
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/template.ewt
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/template.eww b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/template.eww
index bd036bb4c9..bd036bb4c9 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/template.eww
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/template.eww
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/template.uvoptx b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/template.uvoptx
index 48f8775efc..48f8775efc 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/template.uvoptx
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/template.uvoptx
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/template.uvprojx b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/template.uvprojx
index ec0fa90584..ec0fa90584 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/template.uvprojx
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/template.uvprojx
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/xip/SConscript b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/xip/SConscript
index 3e53fa00b1..3e53fa00b1 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/xip/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/xip/SConscript
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/xip/fsl_flexspi_nor_boot.c b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/xip/fsl_flexspi_nor_boot.c
index 5addfdbfaf..5addfdbfaf 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/xip/fsl_flexspi_nor_boot.c
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/xip/fsl_flexspi_nor_boot.c
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/xip/fsl_flexspi_nor_boot.h b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/xip/fsl_flexspi_nor_boot.h
index 073bf5229b..073bf5229b 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/xip/fsl_flexspi_nor_boot.h
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/xip/fsl_flexspi_nor_boot.h
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/xip/fsl_flexspi_nor_flash.c b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/xip/fsl_flexspi_nor_flash.c
index 67076dd62f..67076dd62f 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/xip/fsl_flexspi_nor_flash.c
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/xip/fsl_flexspi_nor_flash.c
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/xip/fsl_flexspi_nor_flash.h b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/xip/fsl_flexspi_nor_flash.h
index 6d3b5269cd..6d3b5269cd 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/xip/fsl_flexspi_nor_flash.h
+++ b/bsp/nxp/imx/imxrt/imxrt1052-nxp-evk/xip/fsl_flexspi_nor_flash.h
diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/.config b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/.config
index 3d9265f68b..3d9265f68b 100644
--- a/bsp/imxrt/imxrt1052-seeed-ArchMix/.config
+++ b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/.config
diff --git a/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/Kconfig b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/Kconfig
new file mode 100644
index 0000000000..db456f310b
--- /dev/null
+++ b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/Kconfig
@@ -0,0 +1,16 @@
+mainmenu "RT-Thread Configuration"
+
+config RTT_DIR
+    string
+    option env="RTT_ROOT"
+    default "../../../../.."
+
+config PKGS_DIR
+    string
+    option env="PKGS_ROOT"
+    default "packages"
+
+source "$RTT_DIR/Kconfig"
+source "$PKGS_DIR/Kconfig"
+source "../libraries/Kconfig"
+source "board/Kconfig"
diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/README.md b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/README.md
index 7d3d1195ac..7d3d1195ac 100644
--- a/bsp/imxrt/imxrt1052-seeed-ArchMix/README.md
+++ b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/README.md
diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/SConscript b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/SConscript
index c7ef7659ec..c7ef7659ec 100644
--- a/bsp/imxrt/imxrt1052-seeed-ArchMix/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/SConscript
diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/SConstruct b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/SConstruct
index f7eb3c0c5e..967a8fbb57 100644
--- a/bsp/imxrt/imxrt1052-seeed-ArchMix/SConstruct
+++ b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/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:
diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/applications/SConscript b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/applications/SConscript
index 050054c59f..050054c59f 100644
--- a/bsp/imxrt/imxrt1052-seeed-ArchMix/applications/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/applications/SConscript
diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/applications/main.c b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/applications/main.c
index 86c7dfb31a..86c7dfb31a 100644
--- a/bsp/imxrt/imxrt1052-seeed-ArchMix/applications/main.c
+++ b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/applications/main.c
diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/board/Kconfig b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/board/Kconfig
index 72f74d4677..72f74d4677 100644
--- a/bsp/imxrt/imxrt1052-seeed-ArchMix/board/Kconfig
+++ b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/board/Kconfig
diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/board/MCUX_Config/MCUX_Config.mex b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/board/MCUX_Config/MCUX_Config.mex
index bd254aa553..bd254aa553 100644
--- a/bsp/imxrt/imxrt1052-seeed-ArchMix/board/MCUX_Config/MCUX_Config.mex
+++ b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/board/MCUX_Config/MCUX_Config.mex
diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/board/MCUX_Config/clock_config.c b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/board/MCUX_Config/clock_config.c
index 87b20a1e25..87b20a1e25 100644
--- a/bsp/imxrt/imxrt1052-seeed-ArchMix/board/MCUX_Config/clock_config.c
+++ b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/board/MCUX_Config/clock_config.c
diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/board/MCUX_Config/clock_config.h b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/board/MCUX_Config/clock_config.h
index 43fbb9d805..43fbb9d805 100644
--- a/bsp/imxrt/imxrt1052-seeed-ArchMix/board/MCUX_Config/clock_config.h
+++ b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/board/MCUX_Config/clock_config.h
diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/board/MCUX_Config/pin_mux.c b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/board/MCUX_Config/pin_mux.c
index 8ed0a9d069..8ed0a9d069 100644
--- a/bsp/imxrt/imxrt1052-seeed-ArchMix/board/MCUX_Config/pin_mux.c
+++ b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/board/MCUX_Config/pin_mux.c
diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/board/MCUX_Config/pin_mux.h b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/board/MCUX_Config/pin_mux.h
index b1d61c2782..b1d61c2782 100644
--- a/bsp/imxrt/imxrt1052-seeed-ArchMix/board/MCUX_Config/pin_mux.h
+++ b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/board/MCUX_Config/pin_mux.h
diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/board/MIMXRT105x_QuadSPI_4KB_SEC.FLM b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/board/MIMXRT105x_QuadSPI_4KB_SEC.FLM
index ac4c378c6a..ac4c378c6a 100644
--- a/bsp/imxrt/imxrt1052-seeed-ArchMix/board/MIMXRT105x_QuadSPI_4KB_SEC.FLM
+++ b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/board/MIMXRT105x_QuadSPI_4KB_SEC.FLM
diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/board/SConscript b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/board/SConscript
index e6008ae576..e6008ae576 100644
--- a/bsp/imxrt/imxrt1052-seeed-ArchMix/board/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/board/SConscript
diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/board/board.c b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/board/board.c
index c93ea67ea4..c93ea67ea4 100644
--- a/bsp/imxrt/imxrt1052-seeed-ArchMix/board/board.c
+++ b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/board/board.c
diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/board/board.h b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/board/board.h
index 100b932ebd..100b932ebd 100644
--- a/bsp/imxrt/imxrt1052-seeed-ArchMix/board/board.h
+++ b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/board/board.h
diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/board/linker_scripts/link.icf b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/board/linker_scripts/link.icf
index e1dd5a7ea4..e1dd5a7ea4 100644
--- a/bsp/imxrt/imxrt1052-seeed-ArchMix/board/linker_scripts/link.icf
+++ b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/board/linker_scripts/link.icf
diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/board/linker_scripts/link.lds b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/board/linker_scripts/link.lds
index d21ddb6a79..d21ddb6a79 100644
--- a/bsp/imxrt/imxrt1052-seeed-ArchMix/board/linker_scripts/link.lds
+++ b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/board/linker_scripts/link.lds
diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/board/linker_scripts/link.sct b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/board/linker_scripts/link.sct
index ef0ddf80f3..ef0ddf80f3 100644
--- a/bsp/imxrt/imxrt1052-seeed-ArchMix/board/linker_scripts/link.sct
+++ b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/board/linker_scripts/link.sct
diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/board/ports/sdram_port.h b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/board/ports/sdram_port.h
index 477987b4e7..477987b4e7 100644
--- a/bsp/imxrt/imxrt1052-seeed-ArchMix/board/ports/sdram_port.h
+++ b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/board/ports/sdram_port.h
diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/figures/Arch_Mix.jpg b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/figures/Arch_Mix.jpg
index d430d0e19a..d430d0e19a 100644
--- a/bsp/imxrt/imxrt1052-seeed-ArchMix/figures/Arch_Mix.jpg
+++ b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/figures/Arch_Mix.jpg
diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/project.uvoptx b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/project.uvoptx
index 283fcc0e30..283fcc0e30 100644
--- a/bsp/imxrt/imxrt1052-seeed-ArchMix/project.uvoptx
+++ b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/project.uvoptx
diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/project.uvprojx b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/project.uvprojx
index 612583f5c3..612583f5c3 100644
--- a/bsp/imxrt/imxrt1052-seeed-ArchMix/project.uvprojx
+++ b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/project.uvprojx
diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/rtconfig.h b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/rtconfig.h
index 2382a12132..2382a12132 100644
--- a/bsp/imxrt/imxrt1052-seeed-ArchMix/rtconfig.h
+++ b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/rtconfig.h
diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/rtconfig.py b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/rtconfig.py
index fe92208216..fe92208216 100644
--- a/bsp/imxrt/imxrt1052-seeed-ArchMix/rtconfig.py
+++ b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/rtconfig.py
diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/template.uvoptx b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/template.uvoptx
index 283fcc0e30..283fcc0e30 100644
--- a/bsp/imxrt/imxrt1052-seeed-ArchMix/template.uvoptx
+++ b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/template.uvoptx
diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/template.uvprojx b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/template.uvprojx
index 794ecf4f95..794ecf4f95 100644
--- a/bsp/imxrt/imxrt1052-seeed-ArchMix/template.uvprojx
+++ b/bsp/nxp/imx/imxrt/imxrt1052-seeed-ArchMix/template.uvprojx
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/.config b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/.config
index 7f5dd607e3..7f5dd607e3 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/.config
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/.config
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/.ignore_format.yml b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/.ignore_format.yml
index ea728a5a48..ea728a5a48 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/.ignore_format.yml
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/.ignore_format.yml
diff --git a/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/Kconfig b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/Kconfig
new file mode 100644
index 0000000000..db456f310b
--- /dev/null
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/Kconfig
@@ -0,0 +1,16 @@
+mainmenu "RT-Thread Configuration"
+
+config RTT_DIR
+    string
+    option env="RTT_ROOT"
+    default "../../../../.."
+
+config PKGS_DIR
+    string
+    option env="PKGS_ROOT"
+    default "packages"
+
+source "$RTT_DIR/Kconfig"
+source "$PKGS_DIR/Kconfig"
+source "../libraries/Kconfig"
+source "board/Kconfig"
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/README.md b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/README.md
index 73bf2887db..73bf2887db 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/README.md
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/README.md
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/README_zh.md b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/README_zh.md
index c866d205e5..c866d205e5 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/README_zh.md
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/README_zh.md
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/SConscript b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/SConscript
index c7ef7659ec..c7ef7659ec 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/SConscript
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/SConstruct b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/SConstruct
index 7bf53a47b0..948211bdde 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/SConstruct
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/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:
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/applications/SConscript b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/SConscript
index 050054c59f..050054c59f 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/applications/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/SConscript
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/SConscript b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/lvgl/SConscript
index 3cb9a1dde7..3cb9a1dde7 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/lvgl/SConscript
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/demo/SConscript b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/lvgl/demo/SConscript
index 00aa5f9426..00aa5f9426 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/demo/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/lvgl/demo/SConscript
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/demo/lv_demo.c b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/lvgl/demo/lv_demo.c
index fd30e46f96..fd30e46f96 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/demo/lv_demo.c
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/lvgl/demo/lv_demo.c
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/guiguider/README.md b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/lvgl/guiguider/README.md
index 6f6e125c82..6f6e125c82 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/guiguider/README.md
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/lvgl/guiguider/README.md
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/guiguider/SConscript b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/lvgl/guiguider/SConscript
index 5e66e2096f..5e66e2096f 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/guiguider/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/lvgl/guiguider/SConscript
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/guiguider/legacy/README.md b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/lvgl/guiguider/legacy/README.md
index ce90952e6b..ce90952e6b 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/guiguider/legacy/README.md
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/lvgl/guiguider/legacy/README.md
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/guiguider/legacy/lv_init_thread.c b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/lvgl/guiguider/legacy/lv_init_thread.c
index 75e5f0c9c0..75e5f0c9c0 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/guiguider/legacy/lv_init_thread.c
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/lvgl/guiguider/legacy/lv_init_thread.c
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/guiguider/legacy/lv_port_disp.h b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/lvgl/guiguider/legacy/lv_port_disp.h
index 2183bfe7a4..2183bfe7a4 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/guiguider/legacy/lv_port_disp.h
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/lvgl/guiguider/legacy/lv_port_disp.h
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/guiguider/legacy/lv_port_indev.h b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/lvgl/guiguider/legacy/lv_port_indev.h
index 86bdf483e1..86bdf483e1 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/guiguider/legacy/lv_port_indev.h
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/lvgl/guiguider/legacy/lv_port_indev.h
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/guiguider/ui/lv_ui_entry.c b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/lvgl/guiguider/ui/lv_ui_entry.c
index bec1656815..bec1656815 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/guiguider/ui/lv_ui_entry.c
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/lvgl/guiguider/ui/lv_ui_entry.c
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/lv_conf.h b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/lvgl/lv_conf.h
index 0fde004307..0fde004307 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/lv_conf.h
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/lvgl/lv_conf.h
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/lv_port_disp.c b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/lvgl/lv_port_disp.c
index 0e6f90166e..0e6f90166e 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/lv_port_disp.c
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/lvgl/lv_port_disp.c
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/lv_port_indev.c b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/lvgl/lv_port_indev.c
index afc1405b5c..afc1405b5c 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/applications/lvgl/lv_port_indev.c
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/lvgl/lv_port_indev.c
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/applications/main.c b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/main.c
index bccdbf80e1..bccdbf80e1 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/applications/main.c
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/main.c
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/applications/mnt.c b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/mnt.c
index 44c9a5d588..44c9a5d588 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/applications/mnt.c
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/applications/mnt.c
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/board/Kconfig b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/Kconfig
index 637d4ce744..637d4ce744 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/board/Kconfig
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/Kconfig
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/board/MCUX_Config/MCUX_Config.mex b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/MCUX_Config/MCUX_Config.mex
index 4dbb7ee462..4dbb7ee462 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/board/MCUX_Config/MCUX_Config.mex
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/MCUX_Config/MCUX_Config.mex
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/board/MCUX_Config/clock_config.c b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/MCUX_Config/clock_config.c
index 2972305a58..2972305a58 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/board/MCUX_Config/clock_config.c
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/MCUX_Config/clock_config.c
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/board/MCUX_Config/clock_config.h b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/MCUX_Config/clock_config.h
index bbaae5db72..bbaae5db72 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/board/MCUX_Config/clock_config.h
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/MCUX_Config/clock_config.h
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/board/MCUX_Config/dcd.c b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/MCUX_Config/dcd.c
index c3dc1f74d3..c3dc1f74d3 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/board/MCUX_Config/dcd.c
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/MCUX_Config/dcd.c
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/board/MCUX_Config/dcd.h b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/MCUX_Config/dcd.h
index 185b0ecd89..185b0ecd89 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/board/MCUX_Config/dcd.h
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/MCUX_Config/dcd.h
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/board/MCUX_Config/pin_mux.c b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/MCUX_Config/pin_mux.c
index 33529d58fa..33529d58fa 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/board/MCUX_Config/pin_mux.c
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/MCUX_Config/pin_mux.c
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/board/MCUX_Config/pin_mux.h b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/MCUX_Config/pin_mux.h
index aca163ed5a..aca163ed5a 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/board/MCUX_Config/pin_mux.h
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/MCUX_Config/pin_mux.h
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/board/SConscript b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/SConscript
index 87e9c4861a..87e9c4861a 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/board/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/SConscript
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/board/board.c b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/board.c
index d837d6965f..d837d6965f 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/board/board.c
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/board.c
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/board/board.h b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/board.h
index 3451e733c8..3451e733c8 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/board/board.h
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/board.h
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link.icf b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link.icf
index dfd94b9945..dfd94b9945 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link.icf
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link.icf
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link.lds b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link.lds
index f56a63fed0..f56a63fed0 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link.lds
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link.lds
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link.sct b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link.sct
index a45fda42af..a45fda42af 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link.sct
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link.sct
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link_ram.icf b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link_ram.icf
index 3fe44d1868..3fe44d1868 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link_ram.icf
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link_ram.icf
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link_ram.sct b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link_ram.sct
index f1393bfb83..f1393bfb83 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link_ram.sct
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link_ram.sct
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link_sdram.icf b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link_sdram.icf
index 4a5478e35d..4a5478e35d 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link_sdram.icf
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link_sdram.icf
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link_sdram.sct b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link_sdram.sct
index c27b355db3..c27b355db3 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link_sdram.sct
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link_sdram.sct
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link_sdram_txt.icf b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link_sdram_txt.icf
index f330c14ac1..f330c14ac1 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link_sdram_txt.icf
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/linker_scripts/link_sdram_txt.icf
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/board/ports/rw007_port.c b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/ports/rw007_port.c
index f0407cd38b..f0407cd38b 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/board/ports/rw007_port.c
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/ports/rw007_port.c
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/board/ports/sdram_port.h b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/ports/sdram_port.h
index 35f4ac2d7b..35f4ac2d7b 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/board/ports/sdram_port.h
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/ports/sdram_port.h
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/board/ports/touchpad.c b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/ports/touchpad.c
index ab95df1ec2..ab95df1ec2 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/board/ports/touchpad.c
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/ports/touchpad.c
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/board/ports/touchpad.h b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/ports/touchpad.h
index 54681dbc4b..54681dbc4b 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/board/ports/touchpad.h
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/board/ports/touchpad.h
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/evkmimxrt1060_sdram_init.mac b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/evkmimxrt1060_sdram_init.mac
index 4888bca4d6..4888bca4d6 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/evkmimxrt1060_sdram_init.mac
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/evkmimxrt1060_sdram_init.mac
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/figures/1.png b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/1.png
index fad540d3e8..fad540d3e8 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/figures/1.png
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/1.png
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/figures/10.png b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/10.png
index 0ce9befb83..0ce9befb83 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/figures/10.png
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/10.png
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/figures/10_en.png b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/10_en.png
index e03a0eec85..e03a0eec85 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/figures/10_en.png
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/10_en.png
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/figures/11.png b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/11.png
index 28bfddb9e0..28bfddb9e0 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/figures/11.png
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/11.png
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/figures/12.jpg b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/12.jpg
index b7d9c4d817..b7d9c4d817 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/figures/12.jpg
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/12.jpg
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/figures/12.png b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/12.png
index caf070e8f4..caf070e8f4 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/figures/12.png
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/12.png
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/figures/13.png b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/13.png
index 40e195eb43..40e195eb43 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/figures/13.png
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/13.png
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/figures/14.png b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/14.png
index eba8468154..eba8468154 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/figures/14.png
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/14.png
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/figures/15.png b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/15.png
index b45289c0f7..b45289c0f7 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/figures/15.png
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/15.png
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/figures/16.png b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/16.png
index 8b34bdae0e..8b34bdae0e 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/figures/16.png
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/16.png
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/figures/17.png b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/17.png
index 75311855e5..75311855e5 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/figures/17.png
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/17.png
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/figures/17_en.png b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/17_en.png
index bb56a47d5f..bb56a47d5f 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/figures/17_en.png
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/17_en.png
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/figures/18.jpg b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/18.jpg
index b0f4396bd0..b0f4396bd0 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/figures/18.jpg
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/18.jpg
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/figures/1_en.png b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/1_en.png
index bcca955a21..bcca955a21 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/figures/1_en.png
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/1_en.png
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/figures/2.png b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/2.png
index 54c983d9c8..54c983d9c8 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/figures/2.png
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/2.png
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/figures/2_en.png b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/2_en.png
index 2559e40ac5..2559e40ac5 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/figures/2_en.png
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/2_en.png
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/figures/3.png b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/3.png
index 3689864315..3689864315 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/figures/3.png
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/3.png
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/figures/3_en.png b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/3_en.png
index 2529aa0414..2529aa0414 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/figures/3_en.png
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/3_en.png
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/figures/4.png b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/4.png
index 00077ad0a6..00077ad0a6 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/figures/4.png
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/4.png
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/figures/5.png b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/5.png
index 0be8b4870b..0be8b4870b 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/figures/5.png
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/5.png
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/figures/6.png b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/6.png
index d79993fb79..d79993fb79 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/figures/6.png
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/6.png
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/figures/7.png b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/7.png
index d7f3cb8932..d7f3cb8932 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/figures/7.png
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/7.png
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/figures/8.png b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/8.png
index bad77a0e66..bad77a0e66 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/figures/8.png
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/8.png
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/figures/9.png b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/9.png
index 13e5eea450..13e5eea450 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/figures/9.png
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/9.png
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/figures/9_en.png b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/9_en.png
index 899849ae82..899849ae82 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/figures/9_en.png
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/9_en.png
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/figures/MIMXRT1060EVKB.jpg b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/MIMXRT1060EVKB.jpg
index 4a0b300c8d..4a0b300c8d 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/figures/MIMXRT1060EVKB.jpg
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/figures/MIMXRT1060EVKB.jpg
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/project.ewd b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/project.ewd
index 8eafc09c34..8eafc09c34 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/project.ewd
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/project.ewd
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/project.ewp b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/project.ewp
index f35825f015..f35825f015 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/project.ewp
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/project.ewp
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/project.eww b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/project.eww
index c2cb02eb1e..c2cb02eb1e 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/project.eww
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/project.eww
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/project.uvoptx b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/project.uvoptx
index 805a9220d6..805a9220d6 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/project.uvoptx
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/project.uvoptx
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/project.uvprojx b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/project.uvprojx
index 09e606f8bd..09e606f8bd 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/project.uvprojx
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/project.uvprojx
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/rtconfig.h b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/rtconfig.h
index 0014f6a8ef..0014f6a8ef 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/rtconfig.h
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/rtconfig.h
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/rtconfig.py b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/rtconfig.py
index 57e61851aa..57e61851aa 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/rtconfig.py
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/rtconfig.py
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/template.ewd b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/template.ewd
index b56cd99889..b56cd99889 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/template.ewd
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/template.ewd
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/template.ewp b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/template.ewp
index 6dd50d10eb..6dd50d10eb 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/template.ewp
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/template.ewp
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/template.ewt b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/template.ewt
index 2909739da7..2909739da7 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/template.ewt
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/template.ewt
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/template.eww b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/template.eww
index bd036bb4c9..bd036bb4c9 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/template.eww
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/template.eww
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/template.uvoptx b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/template.uvoptx
index 805a9220d6..805a9220d6 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/template.uvoptx
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/template.uvoptx
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/template.uvprojx b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/template.uvprojx
index bf2b97f6f6..bf2b97f6f6 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/template.uvprojx
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/template.uvprojx
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/xip/SConscript b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/xip/SConscript
index e68b8522ad..e68b8522ad 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/xip/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/xip/SConscript
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/xip/evkmimxrt1060_flexspi_nor_config.c b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/xip/evkmimxrt1060_flexspi_nor_config.c
index 8b3023a0e8..8b3023a0e8 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/xip/evkmimxrt1060_flexspi_nor_config.c
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/xip/evkmimxrt1060_flexspi_nor_config.c
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/xip/evkmimxrt1060_flexspi_nor_config.h b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/xip/evkmimxrt1060_flexspi_nor_config.h
index f416a822f9..f416a822f9 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/xip/evkmimxrt1060_flexspi_nor_config.h
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/xip/evkmimxrt1060_flexspi_nor_config.h
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/xip/fsl_flexspi_nor_boot.c b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/xip/fsl_flexspi_nor_boot.c
index f71bdab69e..f71bdab69e 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/xip/fsl_flexspi_nor_boot.c
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/xip/fsl_flexspi_nor_boot.c
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/xip/fsl_flexspi_nor_boot.h b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/xip/fsl_flexspi_nor_boot.h
index 38d5d1833e..38d5d1833e 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/xip/fsl_flexspi_nor_boot.h
+++ b/bsp/nxp/imx/imxrt/imxrt1060-nxp-evk/xip/fsl_flexspi_nor_boot.h
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/.config b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/.config
index 9f396a0909..9f396a0909 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/.config
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/.config
diff --git a/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/Kconfig b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/Kconfig
new file mode 100644
index 0000000000..db456f310b
--- /dev/null
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/Kconfig
@@ -0,0 +1,16 @@
+mainmenu "RT-Thread Configuration"
+
+config RTT_DIR
+    string
+    option env="RTT_ROOT"
+    default "../../../../.."
+
+config PKGS_DIR
+    string
+    option env="PKGS_ROOT"
+    default "packages"
+
+source "$RTT_DIR/Kconfig"
+source "$PKGS_DIR/Kconfig"
+source "../libraries/Kconfig"
+source "board/Kconfig"
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/README.md b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/README.md
index b4483d593b..b4483d593b 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/README.md
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/README.md
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/SConscript b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/SConscript
index c7ef7659ec..c7ef7659ec 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/SConscript
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/SConstruct b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/SConstruct
index 7f4f6a70b1..63a877e63c 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/SConstruct
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/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:
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/applications/SConscript b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/applications/SConscript
index 050054c59f..050054c59f 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/applications/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/applications/SConscript
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/applications/main.c b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/applications/main.c
index a56af5624f..a56af5624f 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/applications/main.c
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/applications/main.c
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/board/Kconfig b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/board/Kconfig
index a6f58ea8fa..a6f58ea8fa 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/board/Kconfig
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/board/Kconfig
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/board/MCUX_Config/MCUX_Config.mex b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/board/MCUX_Config/MCUX_Config.mex
index 371b35d144..371b35d144 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/board/MCUX_Config/MCUX_Config.mex
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/board/MCUX_Config/MCUX_Config.mex
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/board/MCUX_Config/clock_config.c b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/board/MCUX_Config/clock_config.c
index ea155af64d..ea155af64d 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/board/MCUX_Config/clock_config.c
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/board/MCUX_Config/clock_config.c
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/board/MCUX_Config/clock_config.h b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/board/MCUX_Config/clock_config.h
index 17ad8f5e50..17ad8f5e50 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/board/MCUX_Config/clock_config.h
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/board/MCUX_Config/clock_config.h
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/board/MCUX_Config/pin_mux.c b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/board/MCUX_Config/pin_mux.c
index cb59c47123..cb59c47123 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/board/MCUX_Config/pin_mux.c
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/board/MCUX_Config/pin_mux.c
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/board/MCUX_Config/pin_mux.h b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/board/MCUX_Config/pin_mux.h
index 646bd5c065..646bd5c065 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/board/MCUX_Config/pin_mux.h
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/board/MCUX_Config/pin_mux.h
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/board/MIMXRT_QSPIFLASH.FLM b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/board/MIMXRT_QSPIFLASH.FLM
index 097d6c449b..097d6c449b 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/board/MIMXRT_QSPIFLASH.FLM
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/board/MIMXRT_QSPIFLASH.FLM
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/board/SConscript b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/board/SConscript
index 94d11b768d..94d11b768d 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/board/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/board/SConscript
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/board/board.c b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/board/board.c
index 53d798e571..53d798e571 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/board/board.c
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/board/board.c
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/board/board.h b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/board/board.h
index 52da9ab37b..52da9ab37b 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/board/board.h
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/board/board.h
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/board/evkmimxrt1060.mac b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/board/evkmimxrt1060.mac
index b932afa896..b932afa896 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/board/evkmimxrt1060.mac
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/board/evkmimxrt1060.mac
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/board/linker_scripts/link.icf b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/board/linker_scripts/link.icf
index 973266af05..973266af05 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/board/linker_scripts/link.icf
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/board/linker_scripts/link.icf
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/board/linker_scripts/link.lds b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/board/linker_scripts/link.lds
index 1e11ddc014..1e11ddc014 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/board/linker_scripts/link.lds
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/board/linker_scripts/link.lds
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/board/linker_scripts/link.sct b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/board/linker_scripts/link.sct
index ca86cca30b..ca86cca30b 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/board/linker_scripts/link.sct
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/board/linker_scripts/link.sct
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/figures/board.png b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/figures/board.png
index b28a14b2c3..b28a14b2c3 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/figures/board.png
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/figures/board.png
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/figures/flash.png b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/figures/flash.png
index d4d9f351e7..d4d9f351e7 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/figures/flash.png
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/figures/flash.png
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/project.ewd b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/project.ewd
index 0f3e167f33..0f3e167f33 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/project.ewd
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/project.ewd
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/project.ewp b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/project.ewp
index 2c320c147a..2c320c147a 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/project.ewp
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/project.ewp
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/project.ewt b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/project.ewt
index f32805f603..f32805f603 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/project.ewt
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/project.ewt
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/project.eww b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/project.eww
index c2cb02eb1e..c2cb02eb1e 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/project.eww
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/project.eww
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/project.uvoptx b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/project.uvoptx
index f01acb7062..f01acb7062 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/project.uvoptx
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/project.uvoptx
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/project.uvprojx b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/project.uvprojx
index c3294a98b1..c3294a98b1 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/project.uvprojx
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/project.uvprojx
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/rtconfig.h b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/rtconfig.h
index 8d2fb9be6c..8d2fb9be6c 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/rtconfig.h
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/rtconfig.h
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/rtconfig.py b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/rtconfig.py
index 60d2a9fc13..60d2a9fc13 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/rtconfig.py
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/rtconfig.py
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/template.ewd b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/template.ewd
index 5a43f3b38f..5a43f3b38f 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/template.ewd
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/template.ewd
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/template.ewp b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/template.ewp
index 114ff40205..114ff40205 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/template.ewp
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/template.ewp
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/template.ewt b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/template.ewt
index 2909739da7..2909739da7 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/template.ewt
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/template.ewt
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/template.eww b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/template.eww
index bd036bb4c9..bd036bb4c9 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/template.eww
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/template.eww
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/template.uvoptx b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/template.uvoptx
index f01acb7062..f01acb7062 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/template.uvoptx
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/template.uvoptx
diff --git a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/template.uvprojx b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/template.uvprojx
index 18acfcc224..18acfcc224 100644
--- a/bsp/imxrt/imxrt1061-forlinx-OK1061-S/template.uvprojx
+++ b/bsp/nxp/imx/imxrt/imxrt1061-forlinx-OK1061-S/template.uvprojx
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/.config b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/.config
index a2c75e87c2..a2c75e87c2 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/.config
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/.config
diff --git a/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/Kconfig b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/Kconfig
new file mode 100644
index 0000000000..db456f310b
--- /dev/null
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/Kconfig
@@ -0,0 +1,16 @@
+mainmenu "RT-Thread Configuration"
+
+config RTT_DIR
+    string
+    option env="RTT_ROOT"
+    default "../../../../.."
+
+config PKGS_DIR
+    string
+    option env="PKGS_ROOT"
+    default "packages"
+
+source "$RTT_DIR/Kconfig"
+source "$PKGS_DIR/Kconfig"
+source "../libraries/Kconfig"
+source "board/Kconfig"
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/README.md b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/README.md
index 47a724fdc7..47a724fdc7 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/README.md
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/README.md
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/SConscript b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/SConscript
index c7ef7659ec..c7ef7659ec 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/SConscript
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/SConstruct b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/SConstruct
index 6b5bd18f22..8fafd88cfe 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/SConstruct
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/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:
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/applications/SConscript b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/applications/SConscript
index 050054c59f..050054c59f 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/applications/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/applications/SConscript
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/applications/main.c b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/applications/main.c
index 1b373138f2..1b373138f2 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/applications/main.c
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/applications/main.c
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/board/Kconfig b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/board/Kconfig
index d26374a59b..d26374a59b 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/board/Kconfig
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/board/Kconfig
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/board/MCUX_Config/MCUX_Config.mex b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/board/MCUX_Config/MCUX_Config.mex
index e6194441dc..e6194441dc 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/board/MCUX_Config/MCUX_Config.mex
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/board/MCUX_Config/MCUX_Config.mex
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/board/MCUX_Config/clock_config.c b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/board/MCUX_Config/clock_config.c
index c26370df1c..c26370df1c 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/board/MCUX_Config/clock_config.c
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/board/MCUX_Config/clock_config.c
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/board/MCUX_Config/clock_config.h b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/board/MCUX_Config/clock_config.h
index 96129972d3..96129972d3 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/board/MCUX_Config/clock_config.h
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/board/MCUX_Config/clock_config.h
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/board/MCUX_Config/pin_mux.c b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/board/MCUX_Config/pin_mux.c
index e72885535a..e72885535a 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/board/MCUX_Config/pin_mux.c
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/board/MCUX_Config/pin_mux.c
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/board/MCUX_Config/pin_mux.h b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/board/MCUX_Config/pin_mux.h
index 736e3bed18..736e3bed18 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/board/MCUX_Config/pin_mux.h
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/board/MCUX_Config/pin_mux.h
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/board/SConscript b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/board/SConscript
index 64766406e9..64766406e9 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/board/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/board/SConscript
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/board/board.c b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/board/board.c
index cf46d98473..cf46d98473 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/board/board.c
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/board/board.c
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/board/board.h b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/board/board.h
index dd7b7d3e56..dd7b7d3e56 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/board/board.h
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/board/board.h
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/board/linker_scripts/link.icf b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/board/linker_scripts/link.icf
index 5555cd099a..5555cd099a 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/board/linker_scripts/link.icf
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/board/linker_scripts/link.icf
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/board/linker_scripts/link.lds b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/board/linker_scripts/link.lds
index 169a2d310a..169a2d310a 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/board/linker_scripts/link.lds
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/board/linker_scripts/link.lds
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/board/linker_scripts/link.sct b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/board/linker_scripts/link.sct
index d2a77d7319..d2a77d7319 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/board/linker_scripts/link.sct
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/board/linker_scripts/link.sct
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/board/ports/sdram_port.h b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/board/ports/sdram_port.h
index 477987b4e7..477987b4e7 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/board/ports/sdram_port.h
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/board/ports/sdram_port.h
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/figures/MIMXRT1064EVK-TOP.jpg b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/figures/MIMXRT1064EVK-TOP.jpg
index 772df7df2d..772df7df2d 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/figures/MIMXRT1064EVK-TOP.jpg
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/figures/MIMXRT1064EVK-TOP.jpg
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/project.ewd b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/project.ewd
index 9eeda70599..9eeda70599 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/project.ewd
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/project.ewd
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/project.ewp b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/project.ewp
index 3bce815e0e..3bce815e0e 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/project.ewp
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/project.ewp
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/project.eww b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/project.eww
index c2cb02eb1e..c2cb02eb1e 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/project.eww
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/project.eww
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/project.uvoptx b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/project.uvoptx
index 4ee900f061..4ee900f061 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/project.uvoptx
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/project.uvoptx
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/project.uvprojx b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/project.uvprojx
index 586a21adc8..586a21adc8 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/project.uvprojx
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/project.uvprojx
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/rtconfig.h b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/rtconfig.h
index 4adf84206e..4adf84206e 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/rtconfig.h
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/rtconfig.h
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/rtconfig.py b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/rtconfig.py
index b2256edd04..b2256edd04 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/rtconfig.py
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/rtconfig.py
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/template.ewd b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/template.ewd
index 1bccb036b3..1bccb036b3 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/template.ewd
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/template.ewd
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/template.ewp b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/template.ewp
index fb890850d1..fb890850d1 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/template.ewp
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/template.ewp
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/template.ewt b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/template.ewt
index 1201d37c24..1201d37c24 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/template.ewt
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/template.ewt
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/template.eww b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/template.eww
index bd036bb4c9..bd036bb4c9 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/template.eww
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/template.eww
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/template.uvoptx b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/template.uvoptx
index 4ee900f061..4ee900f061 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/template.uvoptx
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/template.uvoptx
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/template.uvprojx b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/template.uvprojx
index 3a58534550..3a58534550 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/template.uvprojx
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/template.uvprojx
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/xip/SConscript b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/xip/SConscript
index 804f330855..804f330855 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/xip/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/xip/SConscript
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/xip/evkmimxrt1064_flexspi_nor_config.c b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/xip/evkmimxrt1064_flexspi_nor_config.c
index b58414eba9..b58414eba9 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/xip/evkmimxrt1064_flexspi_nor_config.c
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/xip/evkmimxrt1064_flexspi_nor_config.c
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/xip/evkmimxrt1064_flexspi_nor_config.h b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/xip/evkmimxrt1064_flexspi_nor_config.h
index 81f22550ad..81f22550ad 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/xip/evkmimxrt1064_flexspi_nor_config.h
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/xip/evkmimxrt1064_flexspi_nor_config.h
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/xip/evkmimxrt1064_sdram_ini_dcd.c b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/xip/evkmimxrt1064_sdram_ini_dcd.c
index 475e2efcbe..475e2efcbe 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/xip/evkmimxrt1064_sdram_ini_dcd.c
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/xip/evkmimxrt1064_sdram_ini_dcd.c
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/xip/evkmimxrt1064_sdram_ini_dcd.h b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/xip/evkmimxrt1064_sdram_ini_dcd.h
index 154f8c14ec..154f8c14ec 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/xip/evkmimxrt1064_sdram_ini_dcd.h
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/xip/evkmimxrt1064_sdram_ini_dcd.h
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/xip/fsl_flexspi_nor_boot.c b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/xip/fsl_flexspi_nor_boot.c
index eb175fac24..eb175fac24 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/xip/fsl_flexspi_nor_boot.c
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/xip/fsl_flexspi_nor_boot.c
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/xip/fsl_flexspi_nor_boot.h b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/xip/fsl_flexspi_nor_boot.h
index 4ace76c8a1..4ace76c8a1 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/xip/fsl_flexspi_nor_boot.h
+++ b/bsp/nxp/imx/imxrt/imxrt1064-nxp-evk/xip/fsl_flexspi_nor_boot.h
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/README.md b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/README.md
index e85f233df7..e85f233df7 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/README.md
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/README.md
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/README_zh.md b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/README_zh.md
index a00b1c6a4a..a00b1c6a4a 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/README_zh.md
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/README_zh.md
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/figures/board.jpg b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/figures/board.jpg
index e6517698d2..e6517698d2 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/figures/board.jpg
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/figures/board.jpg
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/.config b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/.config
index 8adb5c8858..8adb5c8858 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/.config
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/.config
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/Kconfig b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/Kconfig
index 356193256c..a9dc8516b4 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/Kconfig
+++ b/bsp/nxp/imx/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
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/SConscript b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/SConscript
index c7ef7659ec..c7ef7659ec 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/SConscript
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/SConstruct b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/SConstruct
index 9bd49dff8d..4a1799cfaa 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/SConstruct
+++ b/bsp/nxp/imx/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:
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/applications/SConscript b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/applications/SConscript
index 050054c59f..050054c59f 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/applications/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/applications/SConscript
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/applications/main.c b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/applications/main.c
index e28f0df99a..e28f0df99a 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/applications/main.c
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/applications/main.c
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/applications/mnt.c b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/applications/mnt.c
index bb7a940650..bb7a940650 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/applications/mnt.c
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/applications/mnt.c
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/Kconfig b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/Kconfig
index 584368c06a..584368c06a 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/Kconfig
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/Kconfig
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/MCUX_Config.mex b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/MCUX_Config.mex
index 85d03f1993..85d03f1993 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/MCUX_Config.mex
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/MCUX_Config.mex
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/clock_config.c b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/clock_config.c
index 2ce144f774..2ce144f774 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/clock_config.c
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/clock_config.c
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/clock_config.h b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/clock_config.h
index 26d3652314..26d3652314 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/clock_config.h
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/clock_config.h
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/pin_mux.c b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/pin_mux.c
index 7008424305..7008424305 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/pin_mux.c
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/pin_mux.c
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/pin_mux.h b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/pin_mux.h
index 5341111961..5341111961 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/pin_mux.h
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/MCUX_Config/pin_mux.h
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/SConscript b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/SConscript
index 14181c8a6a..14181c8a6a 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/SConscript
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/board.c b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/board.c
index ccd3f11ce7..ccd3f11ce7 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/board.c
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/board.c
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/board.h b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/board.h
index e49af960a1..e49af960a1 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/board.h
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/board.h
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/dcd.c b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/dcd.c
index b7e60a294b..b7e60a294b 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/dcd.c
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/dcd.c
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/dcd.h b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/dcd.h
index 77de9fa8b6..77de9fa8b6 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/dcd.h
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/dcd.h
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/display_support.c b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/display_support.c
index 5b574148e2..5b574148e2 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/display_support.c
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/display_support.c
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/display_support.h b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/display_support.h
index 29c6f07a9e..29c6f07a9e 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/display_support.h
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/display_support.h
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/linker_scripts/evkmimxrt1170_flexspi_nor_sdram.ini b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/linker_scripts/evkmimxrt1170_flexspi_nor_sdram.ini
index c39b5460c8..c39b5460c8 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/linker_scripts/evkmimxrt1170_flexspi_nor_sdram.ini
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/linker_scripts/evkmimxrt1170_flexspi_nor_sdram.ini
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/linker_scripts/link.lds b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/linker_scripts/link.lds
index d21ddb6a79..d21ddb6a79 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/linker_scripts/link.lds
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/linker_scripts/link.lds
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/linker_scripts/link.sct b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/linker_scripts/link.sct
index 938f2a4a05..938f2a4a05 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/linker_scripts/link.sct
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/linker_scripts/link.sct
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/linker_scripts/link_ram.icf b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/linker_scripts/link_ram.icf
index 54dc0cd5d2..54dc0cd5d2 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/linker_scripts/link_ram.icf
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/linker_scripts/link_ram.icf
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/ports/flexspi_port.h b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/ports/flexspi_port.h
index 60514484c9..60514484c9 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/ports/flexspi_port.h
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/ports/flexspi_port.h
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/ports/sdram_port.h b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/ports/sdram_port.h
index 9bdb3b617e..9bdb3b617e 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/ports/sdram_port.h
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/ports/sdram_port.h
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/vglite_support.c b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/vglite_support.c
index 77ef33e168..77ef33e168 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/vglite_support.c
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/vglite_support.c
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/vglite_support.h b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/vglite_support.h
index a2cfa43be6..a2cfa43be6 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/vglite_support.h
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/vglite_support.h
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/vglite_window.c b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/vglite_window.c
index 70c16fd63c..70c16fd63c 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/vglite_window.c
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/vglite_window.c
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/vglite_window.h b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/vglite_window.h
index c617b61e22..c617b61e22 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/board/vglite_window.h
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/board/vglite_window.h
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/project.ewd b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/project.ewd
index ba36411f77..ba36411f77 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/project.ewd
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/project.ewd
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/project.ewp b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/project.ewp
index 04715ec2c5..04715ec2c5 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/project.ewp
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/project.ewp
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/project.eww b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/project.eww
index c2cb02eb1e..c2cb02eb1e 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/project.eww
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/project.eww
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/project.uvoptx b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/project.uvoptx
index 0eb6e7b221..0eb6e7b221 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/project.uvoptx
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/project.uvoptx
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/project.uvprojx b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/project.uvprojx
index 6ac155c134..6ac155c134 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/project.uvprojx
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/project.uvprojx
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/rtconfig.h b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/rtconfig.h
index 8261f39ae8..8261f39ae8 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/rtconfig.h
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/rtconfig.h
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/rtconfig.py b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/rtconfig.py
index 61528410ea..61528410ea 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/rtconfig.py
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/rtconfig.py
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/template.ewd b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/template.ewd
index 00bb429d70..00bb429d70 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/template.ewd
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/template.ewd
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/template.ewp b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/template.ewp
index 500df888bc..500df888bc 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/template.ewp
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/template.ewp
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/template.ewt b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/template.ewt
index 2909739da7..2909739da7 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/template.ewt
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/template.ewt
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/template.eww b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/template.eww
index bd036bb4c9..bd036bb4c9 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/template.eww
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/template.eww
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/template.uvoptx b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/template.uvoptx
index 0eb6e7b221..0eb6e7b221 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/template.uvoptx
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/template.uvoptx
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/template.uvprojx b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/template.uvprojx
index 95a9d570eb..95a9d570eb 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/template.uvprojx
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/template.uvprojx
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/SConscript b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/SConscript
index 77f19bf75d..77f19bf75d 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/SConscript
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/dc/elcdif/fsl_dc_fb_elcdif.c b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/dc/elcdif/fsl_dc_fb_elcdif.c
index f0720c1684..f0720c1684 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/dc/elcdif/fsl_dc_fb_elcdif.c
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/dc/elcdif/fsl_dc_fb_elcdif.c
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/dc/elcdif/fsl_dc_fb_elcdif.h b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/dc/elcdif/fsl_dc_fb_elcdif.h
index 09be214052..09be214052 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/dc/elcdif/fsl_dc_fb_elcdif.h
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/dc/elcdif/fsl_dc_fb_elcdif.h
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/dc/fsl_dc_fb.h b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/dc/fsl_dc_fb.h
index 87265a5f3b..87265a5f3b 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/dc/fsl_dc_fb.h
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/dc/fsl_dc_fb.h
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/dc/lcdifv2/fsl_dc_fb_lcdifv2.c b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/dc/lcdifv2/fsl_dc_fb_lcdifv2.c
index 26efccc6ad..26efccc6ad 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/dc/lcdifv2/fsl_dc_fb_lcdifv2.c
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/dc/lcdifv2/fsl_dc_fb_lcdifv2.c
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/dc/lcdifv2/fsl_dc_fb_lcdifv2.h b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/dc/lcdifv2/fsl_dc_fb_lcdifv2.h
index 190437e54d..190437e54d 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/dc/lcdifv2/fsl_dc_fb_lcdifv2.h
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/dc/lcdifv2/fsl_dc_fb_lcdifv2.h
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/fbdev/fsl_fbdev.c b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/fbdev/fsl_fbdev.c
index a2a182d9fa..a2a182d9fa 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/fbdev/fsl_fbdev.c
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/fbdev/fsl_fbdev.c
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/fbdev/fsl_fbdev.h b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/fbdev/fsl_fbdev.h
index 556efa7486..556efa7486 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/fbdev/fsl_fbdev.h
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/fbdev/fsl_fbdev.h
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/fsl_display.h b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/fsl_display.h
index c285cf7ab6..c285cf7ab6 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/fsl_display.h
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/fsl_display.h
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/hx8394/fsl_hx8394.c b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/hx8394/fsl_hx8394.c
index 91303ce47c..91303ce47c 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/hx8394/fsl_hx8394.c
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/hx8394/fsl_hx8394.c
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/hx8394/fsl_hx8394.h b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/hx8394/fsl_hx8394.h
index b33aea98ac..b33aea98ac 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/hx8394/fsl_hx8394.h
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/hx8394/fsl_hx8394.h
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/mipi_dsi_cmd/fsl_mipi_dsi_cmd.c b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/mipi_dsi_cmd/fsl_mipi_dsi_cmd.c
index e9ff8f6561..e9ff8f6561 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/mipi_dsi_cmd/fsl_mipi_dsi_cmd.c
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/mipi_dsi_cmd/fsl_mipi_dsi_cmd.c
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/mipi_dsi_cmd/fsl_mipi_dsi_cmd.h b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/mipi_dsi_cmd/fsl_mipi_dsi_cmd.h
index 2843d8c55d..2843d8c55d 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/mipi_dsi_cmd/fsl_mipi_dsi_cmd.h
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/mipi_dsi_cmd/fsl_mipi_dsi_cmd.h
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/rm68191/fsl_rm68191.c b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/rm68191/fsl_rm68191.c
index 3ca01fb28e..3ca01fb28e 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/rm68191/fsl_rm68191.c
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/rm68191/fsl_rm68191.c
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/rm68191/fsl_rm68191.h b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/rm68191/fsl_rm68191.h
index 2f372da002..2f372da002 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/rm68191/fsl_rm68191.h
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/rm68191/fsl_rm68191.h
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/rm68200/fsl_rm68200.c b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/rm68200/fsl_rm68200.c
index 1d8c2831f5..1d8c2831f5 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/rm68200/fsl_rm68200.c
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/rm68200/fsl_rm68200.c
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/rm68200/fsl_rm68200.h b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/rm68200/fsl_rm68200.h
index f039e89e99..f039e89e99 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/display/rm68200/fsl_rm68200.h
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/display/rm68200/fsl_rm68200.h
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/fsl_video_common.c b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/fsl_video_common.c
index 326187d73a..326187d73a 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/fsl_video_common.c
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/fsl_video_common.c
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/fsl_video_common.h b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/fsl_video_common.h
index e4097607f7..e4097607f7 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/video/fsl_video_common.h
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/video/fsl_video_common.h
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/xip/SConscript b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/xip/SConscript
index 84d2e8e4f8..84d2e8e4f8 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/xip/SConscript
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/xip/SConscript
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/xip/evkmimxrt1170_flexspi_nor_config.c b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/xip/evkmimxrt1170_flexspi_nor_config.c
index ff2b4cce42..ff2b4cce42 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/xip/evkmimxrt1170_flexspi_nor_config.c
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/xip/evkmimxrt1170_flexspi_nor_config.c
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/xip/evkmimxrt1170_flexspi_nor_config.h b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/xip/evkmimxrt1170_flexspi_nor_config.h
index aa3383d5ee..aa3383d5ee 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/xip/evkmimxrt1170_flexspi_nor_config.h
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/xip/evkmimxrt1170_flexspi_nor_config.h
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/xip/fsl_flexspi_nor_boot.c b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/xip/fsl_flexspi_nor_boot.c
index 1a8307928d..1a8307928d 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/xip/fsl_flexspi_nor_boot.c
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/xip/fsl_flexspi_nor_boot.c
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/m7/xip/fsl_flexspi_nor_boot.h b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/xip/fsl_flexspi_nor_boot.h
index e586d750e0..e586d750e0 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/m7/xip/fsl_flexspi_nor_boot.h
+++ b/bsp/nxp/imx/imxrt/imxrt1170-nxp-evk/m7/xip/fsl_flexspi_nor_boot.h
diff --git a/bsp/imxrt/libraries/.ignore_format.yml b/bsp/nxp/imx/imxrt/libraries/.ignore_format.yml
index b5c6019360..b5c6019360 100644
--- a/bsp/imxrt/libraries/.ignore_format.yml
+++ b/bsp/nxp/imx/imxrt/libraries/.ignore_format.yml
diff --git a/bsp/imxrt/libraries/Kconfig b/bsp/nxp/imx/imxrt/libraries/Kconfig
index de07c0a64b..de07c0a64b 100644
--- a/bsp/imxrt/libraries/Kconfig
+++ b/bsp/nxp/imx/imxrt/libraries/Kconfig
diff --git a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/arm_common_tables.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/arm_common_tables.h
index dfea7460e9..dfea7460e9 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/arm_common_tables.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/arm_common_tables.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/arm_const_structs.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/arm_const_structs.h
index 80a3e8bbe7..80a3e8bbe7 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/arm_const_structs.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/arm_const_structs.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/arm_math.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/arm_math.h
index 27c29911e3..27c29911e3 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/arm_math.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/arm_math.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/cmsis_armcc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/cmsis_armcc.h
index 97d14ddcd9..97d14ddcd9 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/cmsis_armcc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/cmsis_armcc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/cmsis_armclang.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/cmsis_armclang.h
index 027ede25fe..027ede25fe 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/cmsis_armclang.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/cmsis_armclang.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/cmsis_compiler.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/cmsis_compiler.h
index 94212eb87a..94212eb87a 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/cmsis_compiler.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/cmsis_compiler.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/cmsis_gcc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/cmsis_gcc.h
index 092d001f30..092d001f30 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/cmsis_gcc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/cmsis_gcc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/cmsis_iccarm.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/cmsis_iccarm.h
index edcaee3d4a..edcaee3d4a 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/cmsis_iccarm.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/cmsis_iccarm.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/cmsis_version.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/cmsis_version.h
index 660f612aa3..660f612aa3 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/cmsis_version.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/cmsis_version.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_armv8mbl.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_armv8mbl.h
index 09501ad997..09501ad997 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_armv8mbl.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_armv8mbl.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_armv8mml.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_armv8mml.h
index b1c1595a41..b1c1595a41 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_armv8mml.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_armv8mml.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_cm0.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_cm0.h
index cd4451220a..cd4451220a 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_cm0.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_cm0.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_cm0plus.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_cm0plus.h
index 98cfc2af64..98cfc2af64 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_cm0plus.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_cm0plus.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_cm23.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_cm23.h
index 7d1d478af2..7d1d478af2 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_cm23.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_cm23.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_cm3.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_cm3.h
index 8f87f4726c..8f87f4726c 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_cm3.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_cm3.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_cm33.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_cm33.h
index 5072590c0d..5072590c0d 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_cm33.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_cm33.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_cm4.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_cm4.h
index 3b6faf7eec..3b6faf7eec 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_cm4.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_cm4.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_cm7.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_cm7.h
index 1fe53bf012..1fe53bf012 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_cm7.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_cm7.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_dsp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_dsp.h
index 6c21a47d80..6c21a47d80 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_dsp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_dsp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_sc000.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_sc000.h
index 9aab5e5b3e..9aab5e5b3e 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_sc000.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_sc000.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_sc300.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_sc300.h
index a569ef2ace..a569ef2ace 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_sc300.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/core_sc300.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/mpu_armv7.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/mpu_armv7.h
index c704e9258d..c704e9258d 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/mpu_armv7.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/mpu_armv7.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/mpu_armv8.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/mpu_armv8.h
index 43d6fec7a2..43d6fec7a2 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/mpu_armv8.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/mpu_armv8.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/tz_context.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/tz_context.h
index facc2c9a47..facc2c9a47 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/Include/tz_context.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/Include/tz_context.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/LICENSE.txt b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/LICENSE.txt
index 8dada3edaf..8dada3edaf 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/CMSIS/LICENSE.txt
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/CMSIS/LICENSE.txt
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/MIMXRT1021.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/MIMXRT1021.h
index 66702da9a2..66702da9a2 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/MIMXRT1021.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/MIMXRT1021.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/MIMXRT1021.xml b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/MIMXRT1021.xml
index e809fa8021..e809fa8021 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/MIMXRT1021.xml
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/MIMXRT1021.xml
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/MIMXRT1021_features.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/MIMXRT1021_features.h
index 72b4c45f74..72b4c45f74 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/MIMXRT1021_features.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/MIMXRT1021_features.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/arm/MIMXRT1021_QuadSPI_4KB_SEC.FLM b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/arm/MIMXRT1021_QuadSPI_4KB_SEC.FLM
index d284628ceb..d284628ceb 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/arm/MIMXRT1021_QuadSPI_4KB_SEC.FLM
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/arm/MIMXRT1021_QuadSPI_4KB_SEC.FLM
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/arm/MIMXRT1021xxxxx_flexspi_nor.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/arm/MIMXRT1021xxxxx_flexspi_nor.scf
index de9fd4c9e3..de9fd4c9e3 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/arm/MIMXRT1021xxxxx_flexspi_nor.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/arm/MIMXRT1021xxxxx_flexspi_nor.scf
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/arm/MIMXRT1021xxxxx_flexspi_nor_sdram.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/arm/MIMXRT1021xxxxx_flexspi_nor_sdram.scf
index 9c4d7211f5..9c4d7211f5 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/arm/MIMXRT1021xxxxx_flexspi_nor_sdram.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/arm/MIMXRT1021xxxxx_flexspi_nor_sdram.scf
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/arm/MIMXRT1021xxxxx_ram.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/arm/MIMXRT1021xxxxx_ram.scf
index 70380e20a3..70380e20a3 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/arm/MIMXRT1021xxxxx_ram.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/arm/MIMXRT1021xxxxx_ram.scf
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/arm/MIMXRT1021xxxxx_sdram.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/arm/MIMXRT1021xxxxx_sdram.scf
index 2e8bf452f5..2e8bf452f5 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/arm/MIMXRT1021xxxxx_sdram.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/arm/MIMXRT1021xxxxx_sdram.scf
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/arm/MIMXRT1021xxxxx_sdram_txt.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/arm/MIMXRT1021xxxxx_sdram_txt.scf
index d501c2f7d9..d501c2f7d9 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/arm/MIMXRT1021xxxxx_sdram_txt.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/arm/MIMXRT1021xxxxx_sdram_txt.scf
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/arm/startup_MIMXRT1021.s b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/arm/startup_MIMXRT1021.s
index adaed32668..adaed32668 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/arm/startup_MIMXRT1021.s
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/arm/startup_MIMXRT1021.s
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_enet_cmsis.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_enet_cmsis.c
index e2ce2505bf..e2ce2505bf 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_enet_cmsis.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_enet_cmsis.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_enet_cmsis.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_enet_cmsis.h
index 7ef6f64add..7ef6f64add 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_enet_cmsis.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_enet_cmsis.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_enet_phy_cmsis.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_enet_phy_cmsis.c
index 9c5e49681c..9c5e49681c 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_enet_phy_cmsis.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_enet_phy_cmsis.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_enet_phy_cmsis.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_enet_phy_cmsis.h
index 6b33bf9ecd..6b33bf9ecd 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_enet_phy_cmsis.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_enet_phy_cmsis.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_lpi2c_cmsis.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_lpi2c_cmsis.c
index 832db8e0b8..832db8e0b8 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_lpi2c_cmsis.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_lpi2c_cmsis.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_lpi2c_cmsis.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_lpi2c_cmsis.h
index 385daa89a4..385daa89a4 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_lpi2c_cmsis.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_lpi2c_cmsis.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_lpspi_cmsis.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_lpspi_cmsis.c
index ed512afb86..ed512afb86 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_lpspi_cmsis.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_lpspi_cmsis.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_lpspi_cmsis.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_lpspi_cmsis.h
index 534d399973..534d399973 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_lpspi_cmsis.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_lpspi_cmsis.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_lpuart_cmsis.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_lpuart_cmsis.c
index 70c622bb28..70c622bb28 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_lpuart_cmsis.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_lpuart_cmsis.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_lpuart_cmsis.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_lpuart_cmsis.h
index 53a8d654fc..53a8d654fc 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_lpuart_cmsis.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/cmsis_drivers/fsl_lpuart_cmsis.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_adc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_adc.c
index 909a6f3b50..909a6f3b50 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_adc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_adc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_adc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_adc.h
index c033ba6349..c033ba6349 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_adc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_adc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_adc_etc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_adc_etc.c
index e98ed23e28..e98ed23e28 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_adc_etc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_adc_etc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_adc_etc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_adc_etc.h
index e34e19b00a..e34e19b00a 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_adc_etc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_adc_etc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_aipstz.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_aipstz.c
index 077b4e01e2..077b4e01e2 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_aipstz.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_aipstz.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_aipstz.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_aipstz.h
index a1639f95f1..a1639f95f1 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_aipstz.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_aipstz.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_aoi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_aoi.c
index a8f1f29ddb..a8f1f29ddb 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_aoi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_aoi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_aoi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_aoi.h
index 6d905b9d64..6d905b9d64 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_aoi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_aoi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_bee.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_bee.c
index d4ffdacfb9..d4ffdacfb9 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_bee.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_bee.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_bee.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_bee.h
index 0ea8f80963..0ea8f80963 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_bee.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_bee.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_cache.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_cache.c
index 721a3fb04e..721a3fb04e 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_cache.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_cache.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_cache.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_cache.h
index 9708edd999..9708edd999 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_cache.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_cache.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_clock.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_clock.c
index 76246f0fd2..76246f0fd2 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_clock.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_clock.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_clock.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_clock.h
index 1a694d8a60..1a694d8a60 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_clock.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_clock.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_cmp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_cmp.c
index 8f6bed69b4..8f6bed69b4 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_cmp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_cmp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_cmp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_cmp.h
index 4b5b7bfcb7..4b5b7bfcb7 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_cmp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_cmp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_common.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_common.c
index d922e343e7..d922e343e7 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_common.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_common.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_common.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_common.h
index ed9a34d3ce..ed9a34d3ce 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_common.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_common.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_common_arm.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_common_arm.c
index e77a265ce4..e77a265ce4 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_common_arm.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_common_arm.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_common_arm.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_common_arm.h
index 2678ff625c..2678ff625c 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_common_arm.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_common_arm.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_dcdc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_dcdc.c
index a4785dd48f..a4785dd48f 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_dcdc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_dcdc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_dcdc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_dcdc.h
index 0335fcc83b..0335fcc83b 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_dcdc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_dcdc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_dcp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_dcp.c
index a0b82bae1c..a0b82bae1c 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_dcp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_dcp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_dcp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_dcp.h
index b31944ddc5..b31944ddc5 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_dcp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_dcp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_dmamux.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_dmamux.c
index 8bfbe6c367..8bfbe6c367 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_dmamux.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_dmamux.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_dmamux.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_dmamux.h
index 2f627c2451..2f627c2451 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_dmamux.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_dmamux.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_edma.c
index efcfb9a81b..efcfb9a81b 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_edma.h
index 3ebb55d8e7..3ebb55d8e7 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_enc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_enc.c
index aab9a505d8..aab9a505d8 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_enc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_enc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_enc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_enc.h
index 28ce466ce3..28ce466ce3 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_enc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_enc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_enet.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_enet.c
index 59fbc6be49..59fbc6be49 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_enet.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_enet.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_enet.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_enet.h
index 02570feaf2..02570feaf2 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_enet.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_enet.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_ewm.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_ewm.c
index 593cf87a50..593cf87a50 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_ewm.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_ewm.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_ewm.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_ewm.h
index dbef1b3d07..dbef1b3d07 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_ewm.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_ewm.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexcan.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexcan.c
index b92658a38d..b92658a38d 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexcan.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexcan.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexcan.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexcan.h
index 57e6f4c598..57e6f4c598 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexcan.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexcan.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio.c
index 18531f7743..18531f7743 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio.h
index 9382738696..9382738696 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_camera.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_camera.c
index 812605626f..812605626f 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_camera.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_camera.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_camera.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_camera.h
index 93612a7188..93612a7188 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_camera.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_camera.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_camera_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_camera_edma.c
index 12bb77b020..12bb77b020 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_camera_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_camera_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_camera_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_camera_edma.h
index ff71a44cfe..ff71a44cfe 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_camera_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_camera_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_i2c_master.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_i2c_master.c
index 9158236bb2..9158236bb2 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_i2c_master.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_i2c_master.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_i2c_master.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_i2c_master.h
index 7855f954c5..7855f954c5 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_i2c_master.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_i2c_master.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_i2s.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_i2s.c
index 087e0d691d..087e0d691d 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_i2s.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_i2s.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_i2s.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_i2s.h
index 3497d7c7ac..3497d7c7ac 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_i2s.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_i2s.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_i2s_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_i2s_edma.c
index faa1541530..faa1541530 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_i2s_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_i2s_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_i2s_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_i2s_edma.h
index a3a0ef1264..a3a0ef1264 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_i2s_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_i2s_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_mculcd.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_mculcd.c
index 5db3141200..5db3141200 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_mculcd.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_mculcd.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_mculcd.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_mculcd.h
index 046b98c37a..046b98c37a 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_mculcd.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_mculcd.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_mculcd_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_mculcd_edma.c
index 458ad8e72b..458ad8e72b 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_mculcd_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_mculcd_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_mculcd_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_mculcd_edma.h
index 200440baae..200440baae 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_mculcd_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_mculcd_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_spi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_spi.c
index ef6053c725..ef6053c725 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_spi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_spi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_spi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_spi.h
index 38af76b583..38af76b583 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_spi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_spi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_spi_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_spi_edma.c
index 934eb045ed..934eb045ed 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_spi_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_spi_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_spi_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_spi_edma.h
index 699bcd6ee7..699bcd6ee7 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_spi_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_spi_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_uart.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_uart.c
index 0d308b16a7..0d308b16a7 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_uart.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_uart.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_uart.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_uart.h
index 783c31885e..783c31885e 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_uart.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_uart.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_uart_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_uart_edma.c
index f2502c9df2..f2502c9df2 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_uart_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_uart_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_uart_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_uart_edma.h
index 3f145ea6a4..3f145ea6a4 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_uart_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexio_uart_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexram.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexram.c
index 7f2db85d74..7f2db85d74 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexram.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexram.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexram.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexram.h
index 73f4ecc438..73f4ecc438 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexram.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexram.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexram_allocate.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexram_allocate.c
index 2c7db7856e..2c7db7856e 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexram_allocate.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexram_allocate.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexram_allocate.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexram_allocate.h
index 7c146c08a7..7c146c08a7 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexram_allocate.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexram_allocate.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexspi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexspi.c
index ef72d3709c..ef72d3709c 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexspi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexspi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexspi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexspi.h
index e009fec11c..e009fec11c 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexspi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexspi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexspi_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexspi_edma.c
index 6947e21c77..6947e21c77 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexspi_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexspi_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexspi_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexspi_edma.h
index 6a57d27332..6a57d27332 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexspi_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_flexspi_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_gpc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_gpc.c
index e5cef48d1b..e5cef48d1b 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_gpc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_gpc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_gpc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_gpc.h
index 31375224bc..31375224bc 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_gpc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_gpc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_gpio.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_gpio.c
index 341757d91b..341757d91b 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_gpio.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_gpio.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_gpio.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_gpio.h
index bfbda25220..bfbda25220 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_gpio.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_gpio.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_gpt.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_gpt.c
index 691cdf590e..691cdf590e 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_gpt.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_gpt.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_gpt.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_gpt.h
index 0cf070a6c8..0cf070a6c8 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_gpt.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_gpt.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_iomuxc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_iomuxc.h
index b7b110b047..b7b110b047 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_iomuxc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_iomuxc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_kpp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_kpp.c
index 8c0b1958be..8c0b1958be 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_kpp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_kpp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_kpp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_kpp.h
index dc65aaf8d7..dc65aaf8d7 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_kpp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_kpp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpi2c.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpi2c.c
index d4b8f9a82a..d4b8f9a82a 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpi2c.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpi2c.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpi2c.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpi2c.h
index 825a11f217..825a11f217 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpi2c.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpi2c.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpi2c_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpi2c_edma.c
index 82c77b8c2d..82c77b8c2d 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpi2c_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpi2c_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpi2c_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpi2c_edma.h
index 1d48fdf296..1d48fdf296 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpi2c_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpi2c_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpi2c_freertos.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpi2c_freertos.c
index efb2d40333..efb2d40333 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpi2c_freertos.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpi2c_freertos.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpi2c_freertos.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpi2c_freertos.h
index 90bc78e934..90bc78e934 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpi2c_freertos.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpi2c_freertos.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpspi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpspi.c
index e9436d2a36..e9436d2a36 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpspi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpspi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpspi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpspi.h
index dffcad8ddc..dffcad8ddc 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpspi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpspi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpspi_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpspi_edma.c
index cd46d73e8d..cd46d73e8d 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpspi_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpspi_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpspi_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpspi_edma.h
index 85da8edc21..85da8edc21 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpspi_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpspi_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpspi_freertos.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpspi_freertos.c
index 58305df266..58305df266 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpspi_freertos.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpspi_freertos.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpspi_freertos.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpspi_freertos.h
index 2c6bc1e1d5..2c6bc1e1d5 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpspi_freertos.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpspi_freertos.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpuart.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpuart.c
index 44ce32358b..44ce32358b 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpuart.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpuart.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpuart.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpuart.h
index 24110d51dd..24110d51dd 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpuart.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpuart.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpuart_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpuart_edma.c
index f18d40cba5..f18d40cba5 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpuart_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpuart_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpuart_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpuart_edma.h
index f237efcc61..f237efcc61 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpuart_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpuart_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpuart_freertos.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpuart_freertos.c
index 8b137b55f6..8b137b55f6 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpuart_freertos.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpuart_freertos.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpuart_freertos.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpuart_freertos.h
index 624dc6f3b1..624dc6f3b1 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpuart_freertos.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_lpuart_freertos.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_nic301.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_nic301.h
index e9a799a2d3..e9a799a2d3 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_nic301.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_nic301.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_ocotp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_ocotp.c
index 4c15d6974d..4c15d6974d 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_ocotp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_ocotp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_ocotp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_ocotp.h
index 73a405a12a..73a405a12a 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_ocotp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_ocotp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_pit.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_pit.c
index 659de24999..659de24999 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_pit.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_pit.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_pit.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_pit.h
index 2b035d41ad..2b035d41ad 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_pit.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_pit.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_pmu.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_pmu.c
index 8e8b0473bf..8e8b0473bf 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_pmu.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_pmu.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_pmu.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_pmu.h
index 5e66473a41..5e66473a41 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_pmu.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_pmu.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_pwm.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_pwm.c
index d16fe3a139..d16fe3a139 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_pwm.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_pwm.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_pwm.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_pwm.h
index 081abf1521..081abf1521 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_pwm.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_pwm.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_qtmr.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_qtmr.c
index 44b7867441..44b7867441 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_qtmr.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_qtmr.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_qtmr.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_qtmr.h
index 2f517cbbf7..2f517cbbf7 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_qtmr.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_qtmr.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_romapi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_romapi.c
index 61d79b1dcb..61d79b1dcb 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_romapi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_romapi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_romapi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_romapi.h
index d87bfea325..d87bfea325 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_romapi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_romapi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_rtwdog.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_rtwdog.c
index 4b49280bf8..4b49280bf8 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_rtwdog.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_rtwdog.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_rtwdog.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_rtwdog.h
index 5eecb5a23b..5eecb5a23b 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_rtwdog.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_rtwdog.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_sai.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_sai.c
index 4301935dd5..4301935dd5 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_sai.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_sai.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_sai.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_sai.h
index 37cf0d00f9..37cf0d00f9 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_sai.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_sai.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_sai_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_sai_edma.c
index 8384f4a95f..8384f4a95f 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_sai_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_sai_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_sai_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_sai_edma.h
index 22c3f67e1e..22c3f67e1e 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_sai_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_sai_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_semc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_semc.c
index 68baf38421..68baf38421 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_semc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_semc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_semc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_semc.h
index b769a26fc2..b769a26fc2 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_semc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_semc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_snvs_hp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_snvs_hp.c
index 1fcec43e9f..1fcec43e9f 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_snvs_hp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_snvs_hp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_snvs_hp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_snvs_hp.h
index e5f7b52bc7..e5f7b52bc7 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_snvs_hp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_snvs_hp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_snvs_lp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_snvs_lp.c
index f0e49e951f..f0e49e951f 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_snvs_lp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_snvs_lp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_snvs_lp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_snvs_lp.h
index f487567d59..f487567d59 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_snvs_lp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_snvs_lp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_spdif.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_spdif.c
index 72f1c60563..72f1c60563 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_spdif.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_spdif.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_spdif.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_spdif.h
index c1656c10a8..c1656c10a8 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_spdif.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_spdif.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_spdif_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_spdif_edma.c
index 88b95bd195..88b95bd195 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_spdif_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_spdif_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_spdif_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_spdif_edma.h
index 964bf1e7ab..964bf1e7ab 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_spdif_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_spdif_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_src.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_src.c
index 10af22893a..10af22893a 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_src.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_src.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_src.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_src.h
index 33ebf14f14..33ebf14f14 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_src.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_src.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_tempmon.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_tempmon.c
index c0486bd6d7..c0486bd6d7 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_tempmon.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_tempmon.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_tempmon.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_tempmon.h
index bb453de2a3..bb453de2a3 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_tempmon.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_tempmon.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_trng.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_trng.c
index d676a2413b..d676a2413b 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_trng.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_trng.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_trng.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_trng.h
index cf154e4430..cf154e4430 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_trng.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_trng.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_usdhc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_usdhc.c
index f2c82d8cde..f2c82d8cde 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_usdhc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_usdhc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_usdhc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_usdhc.h
index bf4d35cfe6..bf4d35cfe6 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_usdhc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_usdhc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_wdog.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_wdog.c
index ea6c970b33..ea6c970b33 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_wdog.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_wdog.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_wdog.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_wdog.h
index c49b39abe9..c49b39abe9 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_wdog.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_wdog.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_xbara.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_xbara.c
index cc6307bbb6..cc6307bbb6 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_xbara.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_xbara.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_xbara.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_xbara.h
index 1aeb4fc86d..1aeb4fc86d 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_xbara.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_xbara.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_xbarb.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_xbarb.c
index c1878a2ae4..c1878a2ae4 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_xbarb.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_xbarb.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_xbarb.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_xbarb.h
index def13c31ad..def13c31ad 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_xbarb.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/drivers/fsl_xbarb.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/fsl_device_registers.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/fsl_device_registers.h
index bef92ae2fd..bef92ae2fd 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/fsl_device_registers.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/fsl_device_registers.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/gcc/MIMXRT1021xxxxx_flexspi_nor.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/gcc/MIMXRT1021xxxxx_flexspi_nor.ld
index d5c0467780..d5c0467780 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/gcc/MIMXRT1021xxxxx_flexspi_nor.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/gcc/MIMXRT1021xxxxx_flexspi_nor.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/gcc/MIMXRT1021xxxxx_flexspi_nor_sdram.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/gcc/MIMXRT1021xxxxx_flexspi_nor_sdram.ld
index ca15365254..ca15365254 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/gcc/MIMXRT1021xxxxx_flexspi_nor_sdram.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/gcc/MIMXRT1021xxxxx_flexspi_nor_sdram.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/gcc/MIMXRT1021xxxxx_ram.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/gcc/MIMXRT1021xxxxx_ram.ld
index ad1e21978f..ad1e21978f 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/gcc/MIMXRT1021xxxxx_ram.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/gcc/MIMXRT1021xxxxx_ram.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/gcc/MIMXRT1021xxxxx_sdram.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/gcc/MIMXRT1021xxxxx_sdram.ld
index 32d8a1e6d9..32d8a1e6d9 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/gcc/MIMXRT1021xxxxx_sdram.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/gcc/MIMXRT1021xxxxx_sdram.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/gcc/MIMXRT1021xxxxx_sdram_txt.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/gcc/MIMXRT1021xxxxx_sdram_txt.ld
index 5b36d51a90..5b36d51a90 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/gcc/MIMXRT1021xxxxx_sdram_txt.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/gcc/MIMXRT1021xxxxx_sdram_txt.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/gcc/startup_MIMXRT1021.S b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/gcc/startup_MIMXRT1021.S
index 463bd28e97..463bd28e97 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/gcc/startup_MIMXRT1021.S
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/gcc/startup_MIMXRT1021.S
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/MIMXRT1021xxxxx_flexspi_nor.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/MIMXRT1021xxxxx_flexspi_nor.icf
index 497e6285c5..497e6285c5 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/MIMXRT1021xxxxx_flexspi_nor.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/MIMXRT1021xxxxx_flexspi_nor.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/MIMXRT1021xxxxx_flexspi_nor_sdram.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/MIMXRT1021xxxxx_flexspi_nor_sdram.icf
index 54b091e58f..54b091e58f 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/MIMXRT1021xxxxx_flexspi_nor_sdram.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/MIMXRT1021xxxxx_flexspi_nor_sdram.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/MIMXRT1021xxxxx_ram.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/MIMXRT1021xxxxx_ram.icf
index 73a34d0385..73a34d0385 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/MIMXRT1021xxxxx_ram.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/MIMXRT1021xxxxx_ram.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/MIMXRT1021xxxxx_sdram.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/MIMXRT1021xxxxx_sdram.icf
index 6788c317e2..6788c317e2 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/MIMXRT1021xxxxx_sdram.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/MIMXRT1021xxxxx_sdram.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/MIMXRT1021xxxxx_sdram_txt.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/MIMXRT1021xxxxx_sdram_txt.icf
index 827d248639..827d248639 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/MIMXRT1021xxxxx_sdram_txt.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/MIMXRT1021xxxxx_sdram_txt.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/startup_MIMXRT1021.s b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/startup_MIMXRT1021.s
index 8e389a554a..8e389a554a 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/startup_MIMXRT1021.s
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/startup_MIMXRT1021.s
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/startup_iar.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/startup_iar.c
index b23b5eab02..b23b5eab02 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/startup_iar.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/startup_iar.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/vectors_iar.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/vectors_iar.c
index 2be51dbd01..2be51dbd01 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/vectors_iar.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/vectors_iar.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/vectors_iar.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/vectors_iar.h
index 38c2392f11..38c2392f11 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/vectors_iar.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/iar/vectors_iar.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/mcuxpresso/startup_mimxrt1021.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/mcuxpresso/startup_mimxrt1021.c
index bf69fc8b46..bf69fc8b46 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/mcuxpresso/startup_mimxrt1021.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/mcuxpresso/startup_mimxrt1021.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/mcuxpresso/startup_mimxrt1021.cpp b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/mcuxpresso/startup_mimxrt1021.cpp
index bf69fc8b46..bf69fc8b46 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/mcuxpresso/startup_mimxrt1021.cpp
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/mcuxpresso/startup_mimxrt1021.cpp
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/board.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/board.c
index a3b1ebcd4c..a3b1ebcd4c 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/board.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/board.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/board.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/board.h
index 1a366b3dbf..1a366b3dbf 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/board.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/board.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/clock_config.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/clock_config.c
index 8d921a85df..8d921a85df 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/clock_config.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/clock_config.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/clock_config.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/clock_config.h
index f406c59238..f406c59238 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/clock_config.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/clock_config.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/peripherals.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/peripherals.c
index f27502d0e1..f27502d0e1 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/peripherals.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/peripherals.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/peripherals.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/peripherals.h
index 1503606377..1503606377 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/peripherals.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/peripherals.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/pin_mux.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/pin_mux.c
index 32e05065e7..32e05065e7 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/pin_mux.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/pin_mux.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/pin_mux.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/pin_mux.h
index 3ce8fab853..3ce8fab853 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/pin_mux.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/project_template/pin_mux.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/system_MIMXRT1021.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/system_MIMXRT1021.c
index cc5d3bfcc8..cc5d3bfcc8 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/system_MIMXRT1021.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/system_MIMXRT1021.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/system_MIMXRT1021.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/system_MIMXRT1021.h
index 106a52b177..106a52b177 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/system_MIMXRT1021.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/system_MIMXRT1021.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/template/RTE_Device.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/template/RTE_Device.h
index efcb2c44f0..efcb2c44f0 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/template/RTE_Device.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/template/RTE_Device.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/debug_console/fsl_debug_console.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/debug_console/fsl_debug_console.c
index b73be3f75b..b73be3f75b 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/debug_console/fsl_debug_console.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/debug_console/fsl_debug_console.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/debug_console/fsl_debug_console.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/debug_console/fsl_debug_console.h
index 1aa16568bc..1aa16568bc 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/debug_console/fsl_debug_console.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/debug_console/fsl_debug_console.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/debug_console/fsl_debug_console_conf.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/debug_console/fsl_debug_console_conf.h
index a997ab5bcc..a997ab5bcc 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/debug_console/fsl_debug_console_conf.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/debug_console/fsl_debug_console_conf.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/debug_console_lite/fsl_assert.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/debug_console_lite/fsl_assert.c
index bb9127acdf..bb9127acdf 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/debug_console_lite/fsl_assert.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/debug_console_lite/fsl_assert.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/debug_console_lite/fsl_debug_console.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/debug_console_lite/fsl_debug_console.c
index df5a935830..df5a935830 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/debug_console_lite/fsl_debug_console.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/debug_console_lite/fsl_debug_console.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/debug_console_lite/fsl_debug_console.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/debug_console_lite/fsl_debug_console.h
index 707e4249a0..707e4249a0 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/debug_console_lite/fsl_debug_console.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/debug_console_lite/fsl_debug_console.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/fsl_assert.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/fsl_assert.c
index bb9127acdf..bb9127acdf 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/fsl_assert.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/fsl_assert.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/fsl_notifier.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/fsl_notifier.c
index 7b7c02dc3d..7b7c02dc3d 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/fsl_notifier.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/fsl_notifier.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/fsl_notifier.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/fsl_notifier.h
index d93578c13f..d93578c13f 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/fsl_notifier.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/fsl_notifier.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/fsl_sbrk.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/fsl_sbrk.c
index 5727b2f869..5727b2f869 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/fsl_sbrk.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/fsl_sbrk.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/fsl_shell.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/fsl_shell.c
index 6d092f1286..6d092f1286 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/fsl_shell.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/fsl_shell.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/fsl_shell.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/fsl_shell.h
index 313df41311..313df41311 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/fsl_shell.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/fsl_shell.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/str/fsl_str.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/str/fsl_str.c
index fcd9ae8159..fcd9ae8159 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/str/fsl_str.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/str/fsl_str.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/str/fsl_str.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/str/fsl_str.h
index bf7adcc52a..bf7adcc52a 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/str/fsl_str.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/utilities/str/fsl_str.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/xip/fsl_flexspi_nor_boot.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/xip/fsl_flexspi_nor_boot.c
index f71bdab69e..f71bdab69e 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/xip/fsl_flexspi_nor_boot.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/xip/fsl_flexspi_nor_boot.c
diff --git a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/xip/fsl_flexspi_nor_boot.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/xip/fsl_flexspi_nor_boot.h
index c76afeceb7..c76afeceb7 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/MIMXRT1021/xip/fsl_flexspi_nor_boot.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/MIMXRT1021/xip/fsl_flexspi_nor_boot.h
diff --git a/bsp/imxrt/libraries/MIMXRT1020/SConscript b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/SConscript
index 85c992a4aa..85c992a4aa 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/SConscript
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1020/SConscript
diff --git a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/arm_common_tables.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/arm_common_tables.h
index dfea7460e9..dfea7460e9 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/arm_common_tables.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/arm_common_tables.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/arm_const_structs.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/arm_const_structs.h
index 80a3e8bbe7..80a3e8bbe7 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/arm_const_structs.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/arm_const_structs.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/arm_math.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/arm_math.h
index 27c29911e3..27c29911e3 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/arm_math.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/arm_math.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/cmsis_armcc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/cmsis_armcc.h
index 97d14ddcd9..97d14ddcd9 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/cmsis_armcc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/cmsis_armcc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/cmsis_armclang.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/cmsis_armclang.h
index 027ede25fe..027ede25fe 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/cmsis_armclang.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/cmsis_armclang.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/cmsis_compiler.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/cmsis_compiler.h
index 94212eb87a..94212eb87a 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/cmsis_compiler.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/cmsis_compiler.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/cmsis_gcc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/cmsis_gcc.h
index 092d001f30..092d001f30 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/cmsis_gcc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/cmsis_gcc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/cmsis_iccarm.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/cmsis_iccarm.h
index edcaee3d4a..edcaee3d4a 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/cmsis_iccarm.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/cmsis_iccarm.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/cmsis_version.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/cmsis_version.h
index 660f612aa3..660f612aa3 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/cmsis_version.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/cmsis_version.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_armv8mbl.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_armv8mbl.h
index 09501ad997..09501ad997 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_armv8mbl.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_armv8mbl.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_armv8mml.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_armv8mml.h
index b1c1595a41..b1c1595a41 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_armv8mml.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_armv8mml.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_cm0.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_cm0.h
index cd4451220a..cd4451220a 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_cm0.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_cm0.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_cm0plus.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_cm0plus.h
index 98cfc2af64..98cfc2af64 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_cm0plus.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_cm0plus.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_cm23.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_cm23.h
index 7d1d478af2..7d1d478af2 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_cm23.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_cm23.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_cm3.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_cm3.h
index 8f87f4726c..8f87f4726c 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_cm3.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_cm3.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_cm33.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_cm33.h
index 5072590c0d..5072590c0d 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_cm33.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_cm33.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_cm4.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_cm4.h
index 3b6faf7eec..3b6faf7eec 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_cm4.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_cm4.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_cm7.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_cm7.h
index 1fe53bf012..1fe53bf012 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_cm7.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_cm7.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_sc000.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_sc000.h
index 9aab5e5b3e..9aab5e5b3e 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_sc000.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_sc000.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_sc300.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_sc300.h
index a569ef2ace..a569ef2ace 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_sc300.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/core_sc300.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/mpu_armv7.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/mpu_armv7.h
index c704e9258d..c704e9258d 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/mpu_armv7.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/mpu_armv7.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/mpu_armv8.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/mpu_armv8.h
index 43d6fec7a2..43d6fec7a2 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/mpu_armv8.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/mpu_armv8.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/tz_context.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/tz_context.h
index facc2c9a47..facc2c9a47 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/Include/tz_context.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/Include/tz_context.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/LICENSE.txt b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/LICENSE.txt
index 8dada3edaf..8dada3edaf 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/CMSIS/LICENSE.txt
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/CMSIS/LICENSE.txt
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/MIMXRT1052.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/MIMXRT1052.h
index 552c36a163..552c36a163 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/MIMXRT1052.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/MIMXRT1052.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/MIMXRT1052.xml b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/MIMXRT1052.xml
index 882738e379..882738e379 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/MIMXRT1052.xml
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/MIMXRT1052.xml
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/MIMXRT1052_features.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/MIMXRT1052_features.h
index 7ccb740157..7ccb740157 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/MIMXRT1052_features.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/MIMXRT1052_features.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/MIMXRT1052xxxxx_flexspi_nor.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/MIMXRT1052xxxxx_flexspi_nor.scf
index fd6cbf3a25..fd6cbf3a25 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/MIMXRT1052xxxxx_flexspi_nor.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/MIMXRT1052xxxxx_flexspi_nor.scf
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/MIMXRT1052xxxxx_flexspi_nor_sdram.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/MIMXRT1052xxxxx_flexspi_nor_sdram.scf
index 3a191ebc8b..3a191ebc8b 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/MIMXRT1052xxxxx_flexspi_nor_sdram.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/MIMXRT1052xxxxx_flexspi_nor_sdram.scf
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/MIMXRT1052xxxxx_ram.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/MIMXRT1052xxxxx_ram.scf
index a1498f920a..a1498f920a 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/MIMXRT1052xxxxx_ram.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/MIMXRT1052xxxxx_ram.scf
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/MIMXRT1052xxxxx_sdram.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/MIMXRT1052xxxxx_sdram.scf
index 3e20401cb6..3e20401cb6 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/MIMXRT1052xxxxx_sdram.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/MIMXRT1052xxxxx_sdram.scf
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/MIMXRT1052xxxxx_sdram_txt.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/MIMXRT1052xxxxx_sdram_txt.scf
index 767b7ab451..767b7ab451 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/MIMXRT1052xxxxx_sdram_txt.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/MIMXRT1052xxxxx_sdram_txt.scf
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/MIMXRT105x_HYPER_256KB_SEC.FLM b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/MIMXRT105x_HYPER_256KB_SEC.FLM
index 98ead03110..98ead03110 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/MIMXRT105x_HYPER_256KB_SEC.FLM
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/MIMXRT105x_HYPER_256KB_SEC.FLM
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/MIMXRT105x_QuadSPI_4KB_SEC.FLM b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/MIMXRT105x_QuadSPI_4KB_SEC.FLM
index 9524edf632..9524edf632 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/MIMXRT105x_QuadSPI_4KB_SEC.FLM
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/MIMXRT105x_QuadSPI_4KB_SEC.FLM
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/startup_MIMXRT1052.s b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/startup_MIMXRT1052.s
index 18ca1c154c..18ca1c154c 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/startup_MIMXRT1052.s
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/arm/startup_MIMXRT1052.s
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/cmsis_drivers/fsl_lpi2c_cmsis.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/cmsis_drivers/fsl_lpi2c_cmsis.c
index 290a06aa93..290a06aa93 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/cmsis_drivers/fsl_lpi2c_cmsis.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/cmsis_drivers/fsl_lpi2c_cmsis.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/cmsis_drivers/fsl_lpi2c_cmsis.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/cmsis_drivers/fsl_lpi2c_cmsis.h
index 9db2c51777..9db2c51777 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/cmsis_drivers/fsl_lpi2c_cmsis.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/cmsis_drivers/fsl_lpi2c_cmsis.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/cmsis_drivers/fsl_lpspi_cmsis.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/cmsis_drivers/fsl_lpspi_cmsis.c
index f7670ee764..f7670ee764 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/cmsis_drivers/fsl_lpspi_cmsis.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/cmsis_drivers/fsl_lpspi_cmsis.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/cmsis_drivers/fsl_lpspi_cmsis.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/cmsis_drivers/fsl_lpspi_cmsis.h
index 3ca6703d5d..3ca6703d5d 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/cmsis_drivers/fsl_lpspi_cmsis.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/cmsis_drivers/fsl_lpspi_cmsis.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/cmsis_drivers/fsl_lpuart_cmsis.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/cmsis_drivers/fsl_lpuart_cmsis.c
index 99a0f84707..99a0f84707 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/cmsis_drivers/fsl_lpuart_cmsis.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/cmsis_drivers/fsl_lpuart_cmsis.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/cmsis_drivers/fsl_lpuart_cmsis.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/cmsis_drivers/fsl_lpuart_cmsis.h
index 5d3a8530ed..5d3a8530ed 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/cmsis_drivers/fsl_lpuart_cmsis.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/cmsis_drivers/fsl_lpuart_cmsis.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_adc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_adc.c
index f8eb336c49..f8eb336c49 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_adc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_adc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_adc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_adc.h
index 99429e6098..99429e6098 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_adc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_adc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_adc_etc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_adc_etc.c
index 4a81c9fd9f..4a81c9fd9f 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_adc_etc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_adc_etc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_adc_etc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_adc_etc.h
index cdcd7b7d4f..cdcd7b7d4f 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_adc_etc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_adc_etc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_aipstz.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_aipstz.c
index d124af4728..d124af4728 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_aipstz.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_aipstz.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_aipstz.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_aipstz.h
index 3926e11bca..3926e11bca 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_aipstz.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_aipstz.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_aoi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_aoi.c
index 85d8b1fe97..85d8b1fe97 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_aoi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_aoi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_aoi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_aoi.h
index 476da05a9a..476da05a9a 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_aoi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_aoi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_bee.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_bee.c
index 8342476a19..8342476a19 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_bee.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_bee.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_bee.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_bee.h
index 31f5cb491f..31f5cb491f 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_bee.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_bee.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_cache.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_cache.c
index d4ce59e103..d4ce59e103 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_cache.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_cache.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_cache.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_cache.h
index e34d038efb..e34d038efb 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_cache.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_cache.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_clock.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_clock.c
index e12179b96f..e12179b96f 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_clock.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_clock.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_clock.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_clock.h
index a562eda0a2..a562eda0a2 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_clock.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_clock.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_cmp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_cmp.c
index c4eef9b8af..c4eef9b8af 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_cmp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_cmp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_cmp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_cmp.h
index e14a94b2e5..e14a94b2e5 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_cmp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_cmp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_common.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_common.c
index 39e78bcd9f..39e78bcd9f 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_common.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_common.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_common.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_common.h
index cfd18dbfb4..cfd18dbfb4 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_common.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_common.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_csi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_csi.c
index 7b8c980870..7b8c980870 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_csi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_csi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_csi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_csi.h
index eb3eb964bc..eb3eb964bc 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_csi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_csi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_dcdc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_dcdc.c
index 272cd482f3..272cd482f3 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_dcdc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_dcdc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_dcdc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_dcdc.h
index e0c52bdc50..e0c52bdc50 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_dcdc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_dcdc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_dcp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_dcp.c
index 67fba7fbd2..67fba7fbd2 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_dcp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_dcp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_dcp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_dcp.h
index c69b4ad3e7..c69b4ad3e7 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_dcp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_dcp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_dmamux.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_dmamux.c
index 8bfbe6c367..8bfbe6c367 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_dmamux.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_dmamux.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_dmamux.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_dmamux.h
index dd6b871cee..dd6b871cee 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_dmamux.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_dmamux.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_edma.c
index cd4b56b5e9..cd4b56b5e9 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_edma.h
index 802f130359..802f130359 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_elcdif.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_elcdif.c
index 583286c8a2..583286c8a2 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_elcdif.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_elcdif.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_elcdif.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_elcdif.h
index 6a9593441c..6a9593441c 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_elcdif.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_elcdif.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_enc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_enc.c
index e9d7e04888..e9d7e04888 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_enc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_enc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_enc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_enc.h
index 6f9f8b52ee..6f9f8b52ee 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_enc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_enc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_enet.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_enet.c
index b8bb27ea1a..b8bb27ea1a 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_enet.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_enet.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_enet.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_enet.h
index 38e75d5a90..38e75d5a90 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_enet.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_enet.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_ewm.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_ewm.c
index 28dda26746..28dda26746 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_ewm.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_ewm.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_ewm.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_ewm.h
index 4295e0a9c8..4295e0a9c8 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_ewm.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_ewm.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexcan.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexcan.c
index 5ce709ddbe..5ce709ddbe 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexcan.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexcan.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexcan.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexcan.h
index 6b2d820113..6b2d820113 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexcan.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexcan.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio.c
index f3c45f624c..f3c45f624c 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio.h
index 3b0098d815..3b0098d815 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_i2c_master.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_i2c_master.c
index fc060d9e9a..fc060d9e9a 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_i2c_master.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_i2c_master.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_i2c_master.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_i2c_master.h
index 394d715722..394d715722 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_i2c_master.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_i2c_master.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_i2s.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_i2s.c
index 41457284a4..41457284a4 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_i2s.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_i2s.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_i2s.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_i2s.h
index 6d9a713cb5..6d9a713cb5 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_i2s.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_i2s.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_i2s_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_i2s_edma.c
index 253f278f9e..253f278f9e 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_i2s_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_i2s_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_i2s_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_i2s_edma.h
index 47221dac85..47221dac85 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_i2s_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_i2s_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_spi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_spi.c
index af8d08e42e..af8d08e42e 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_spi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_spi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_spi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_spi.h
index 44d8a7274f..44d8a7274f 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_spi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_spi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_spi_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_spi_edma.c
index 916b8c0cfc..916b8c0cfc 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_spi_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_spi_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_spi_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_spi_edma.h
index 79c6e23523..79c6e23523 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_spi_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_spi_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_uart.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_uart.c
index 101087fa06..101087fa06 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_uart.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_uart.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_uart.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_uart.h
index b9c5622cef..b9c5622cef 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_uart.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_uart.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_uart_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_uart_edma.c
index 4bec051160..4bec051160 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_uart_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_uart_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_uart_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_uart_edma.h
index 467293aa2c..467293aa2c 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_uart_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexio_uart_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexram.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexram.c
index 2e870d982c..2e870d982c 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexram.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexram.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexram.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexram.h
index 74c920dd80..74c920dd80 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexram.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexram.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexspi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexspi.c
index a1fc50fb69..a1fc50fb69 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexspi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexspi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexspi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexspi.h
index d355462a91..d355462a91 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexspi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_flexspi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_gpc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_gpc.c
index 9569ce26bc..9569ce26bc 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_gpc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_gpc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_gpc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_gpc.h
index 09dbaa15de..09dbaa15de 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_gpc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_gpc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_gpio.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_gpio.c
index 959f926c70..959f926c70 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_gpio.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_gpio.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_gpio.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_gpio.h
index 2d84f379a2..2d84f379a2 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_gpio.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_gpio.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_gpt.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_gpt.c
index 57b13c42ee..57b13c42ee 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_gpt.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_gpt.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_gpt.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_gpt.h
index 8f5a2ef5c5..8f5a2ef5c5 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_gpt.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_gpt.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_iomuxc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_iomuxc.h
index d6f335592b..d6f335592b 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_iomuxc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_iomuxc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_kpp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_kpp.c
index 7c6470e9e9..7c6470e9e9 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_kpp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_kpp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_kpp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_kpp.h
index ddec92d2c2..ddec92d2c2 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_kpp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_kpp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpi2c.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpi2c.c
index 27c80eb498..27c80eb498 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpi2c.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpi2c.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpi2c.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpi2c.h
index 8ed0e658ac..8ed0e658ac 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpi2c.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpi2c.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpi2c_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpi2c_edma.c
index da100d66f2..da100d66f2 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpi2c_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpi2c_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpi2c_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpi2c_edma.h
index 30d528e555..30d528e555 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpi2c_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpi2c_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpspi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpspi.c
index fcf1847301..fcf1847301 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpspi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpspi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpspi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpspi.h
index c31d3de285..c31d3de285 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpspi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpspi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpspi_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpspi_edma.c
index effca2527c..effca2527c 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpspi_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpspi_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpspi_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpspi_edma.h
index 8ef2cde1ed..8ef2cde1ed 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpspi_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpspi_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpuart.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpuart.c
index 76c71ea4c0..76c71ea4c0 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpuart.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpuart.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpuart.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpuart.h
index 419951fcbf..419951fcbf 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpuart.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpuart.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpuart_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpuart_edma.c
index 4313f147c6..4313f147c6 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpuart_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpuart_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpuart_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpuart_edma.h
index 70e456fbd8..70e456fbd8 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpuart_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_lpuart_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction.h
index 379bde9c2c..379bde9c2c 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction_config.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction_config.h
index 234cf972bc..234cf972bc 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction_config.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction_config.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction_rtthread.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction_rtthread.c
index 6b8fc6ca16..6b8fc6ca16 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction_rtthread.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction_rtthread.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction_rtthread.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction_rtthread.h
index 40bd24271a..40bd24271a 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction_rtthread.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_os_abstraction_rtthread.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pit.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pit.c
index 5de5918852..5de5918852 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pit.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pit.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pit.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pit.h
index 667ce8df26..667ce8df26 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pit.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pit.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pmu.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pmu.c
index f3e0571f0d..f3e0571f0d 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pmu.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pmu.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pmu.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pmu.h
index e80ec379bf..e80ec379bf 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pmu.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pmu.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pwm.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pwm.c
index fb6ad2237f..fb6ad2237f 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pwm.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pwm.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pwm.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pwm.h
index ae93c8cb63..ae93c8cb63 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pwm.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pwm.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pxp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pxp.c
index 602d578c25..602d578c25 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pxp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pxp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pxp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pxp.h
index 3fdad8de9f..3fdad8de9f 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pxp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_pxp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_qtmr.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_qtmr.c
index 5d4c556aee..5d4c556aee 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_qtmr.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_qtmr.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_qtmr.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_qtmr.h
index 650449e5bf..650449e5bf 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_qtmr.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_qtmr.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_rtwdog.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_rtwdog.c
index da3587a55a..da3587a55a 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_rtwdog.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_rtwdog.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_rtwdog.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_rtwdog.h
index 42c5eb7878..42c5eb7878 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_rtwdog.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_rtwdog.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_sai.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_sai.c
index 19cd7e4989..19cd7e4989 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_sai.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_sai.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_sai.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_sai.h
index c6d33c746e..c6d33c746e 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_sai.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_sai.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_sai_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_sai_edma.c
index 116d088d9f..116d088d9f 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_sai_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_sai_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_sai_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_sai_edma.h
index b3d913948b..b3d913948b 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_sai_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_sai_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_semc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_semc.c
index 842ebe3a80..842ebe3a80 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_semc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_semc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_semc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_semc.h
index 8f24d4e95c..8f24d4e95c 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_semc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_semc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_snvs_hp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_snvs_hp.c
index 77796e75ce..77796e75ce 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_snvs_hp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_snvs_hp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_snvs_hp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_snvs_hp.h
index 2f1cf36d47..2f1cf36d47 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_snvs_hp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_snvs_hp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_snvs_lp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_snvs_lp.c
index 2fb8b71c88..2fb8b71c88 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_snvs_lp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_snvs_lp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_snvs_lp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_snvs_lp.h
index ca4db3eb3f..ca4db3eb3f 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_snvs_lp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_snvs_lp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_spdif.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_spdif.c
index 6b73432e74..6b73432e74 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_spdif.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_spdif.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_spdif.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_spdif.h
index 65369a0607..65369a0607 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_spdif.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_spdif.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_spdif_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_spdif_edma.c
index 363c46ff3c..363c46ff3c 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_spdif_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_spdif_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_spdif_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_spdif_edma.h
index b39c202671..b39c202671 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_spdif_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_spdif_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_src.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_src.c
index 10af22893a..10af22893a 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_src.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_src.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_src.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_src.h
index f397c0fc48..f397c0fc48 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_src.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_src.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_tempmon.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_tempmon.c
index 2f2b08dde3..2f2b08dde3 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_tempmon.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_tempmon.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_tempmon.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_tempmon.h
index 729beb9df0..729beb9df0 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_tempmon.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_tempmon.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_trng.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_trng.c
index 5590a883c5..5590a883c5 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_trng.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_trng.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_trng.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_trng.h
index ec58261747..ec58261747 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_trng.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_trng.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_tsc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_tsc.c
index 33037f1c32..33037f1c32 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_tsc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_tsc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_tsc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_tsc.h
index 89884e9e94..89884e9e94 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_tsc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_tsc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_usdhc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_usdhc.c
index 60f4cc6ab4..60f4cc6ab4 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_usdhc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_usdhc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_usdhc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_usdhc.h
index 658a42739b..658a42739b 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_usdhc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_usdhc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_wdog.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_wdog.c
index 275b98377a..275b98377a 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_wdog.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_wdog.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_wdog.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_wdog.h
index d3b533f2dc..d3b533f2dc 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_wdog.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_wdog.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_xbara.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_xbara.c
index 9b081c0d70..9b081c0d70 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_xbara.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_xbara.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_xbara.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_xbara.h
index c60cc82b32..c60cc82b32 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_xbara.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_xbara.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_xbarb.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_xbarb.c
index ec8c05f1a5..ec8c05f1a5 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_xbarb.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_xbarb.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_xbarb.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_xbarb.h
index b459880605..b459880605 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_xbarb.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/fsl_xbarb.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/generic_list.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/generic_list.c
index 80dd21425d..80dd21425d 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/generic_list.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/generic_list.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/generic_list.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/generic_list.h
index def00efe8e..def00efe8e 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/generic_list.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/drivers/generic_list.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/fsl_device_registers.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/fsl_device_registers.h
index 54caf43ca6..54caf43ca6 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/fsl_device_registers.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/fsl_device_registers.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/gcc/MIMXRT1052xxxxx_flexspi_nor.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/gcc/MIMXRT1052xxxxx_flexspi_nor.ld
index f5079cae92..f5079cae92 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/gcc/MIMXRT1052xxxxx_flexspi_nor.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/gcc/MIMXRT1052xxxxx_flexspi_nor.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/gcc/MIMXRT1052xxxxx_flexspi_nor_sdram.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/gcc/MIMXRT1052xxxxx_flexspi_nor_sdram.ld
index 8de2bfb469..8de2bfb469 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/gcc/MIMXRT1052xxxxx_flexspi_nor_sdram.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/gcc/MIMXRT1052xxxxx_flexspi_nor_sdram.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/gcc/MIMXRT1052xxxxx_ram.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/gcc/MIMXRT1052xxxxx_ram.ld
index f540a6d38e..f540a6d38e 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/gcc/MIMXRT1052xxxxx_ram.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/gcc/MIMXRT1052xxxxx_ram.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/gcc/MIMXRT1052xxxxx_sdram.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/gcc/MIMXRT1052xxxxx_sdram.ld
index c093328a82..c093328a82 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/gcc/MIMXRT1052xxxxx_sdram.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/gcc/MIMXRT1052xxxxx_sdram.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/gcc/MIMXRT1052xxxxx_sdram_txt.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/gcc/MIMXRT1052xxxxx_sdram_txt.ld
index d4629199b0..d4629199b0 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/gcc/MIMXRT1052xxxxx_sdram_txt.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/gcc/MIMXRT1052xxxxx_sdram_txt.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/gcc/startup_MIMXRT1052.S b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/gcc/startup_MIMXRT1052.S
index 73003ff20c..73003ff20c 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/gcc/startup_MIMXRT1052.S
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/gcc/startup_MIMXRT1052.S
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/iar/MIMXRT1052xxxxx_flexspi_nor.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/iar/MIMXRT1052xxxxx_flexspi_nor.icf
index a2d7bdfa2e..a2d7bdfa2e 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/iar/MIMXRT1052xxxxx_flexspi_nor.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/iar/MIMXRT1052xxxxx_flexspi_nor.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/iar/MIMXRT1052xxxxx_flexspi_nor_sdram.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/iar/MIMXRT1052xxxxx_flexspi_nor_sdram.icf
index d29a0eff2a..d29a0eff2a 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/iar/MIMXRT1052xxxxx_flexspi_nor_sdram.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/iar/MIMXRT1052xxxxx_flexspi_nor_sdram.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/iar/MIMXRT1052xxxxx_ram.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/iar/MIMXRT1052xxxxx_ram.icf
index a01b31cc34..a01b31cc34 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/iar/MIMXRT1052xxxxx_ram.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/iar/MIMXRT1052xxxxx_ram.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/iar/MIMXRT1052xxxxx_sdram.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/iar/MIMXRT1052xxxxx_sdram.icf
index 199e53285c..199e53285c 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/iar/MIMXRT1052xxxxx_sdram.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/iar/MIMXRT1052xxxxx_sdram.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/iar/MIMXRT1052xxxxx_sdram_txt.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/iar/MIMXRT1052xxxxx_sdram_txt.icf
index cf29e5d48d..cf29e5d48d 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/iar/MIMXRT1052xxxxx_sdram_txt.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/iar/MIMXRT1052xxxxx_sdram_txt.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/iar/startup_MIMXRT1052.s b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/iar/startup_MIMXRT1052.s
index a4f6f7fee8..a4f6f7fee8 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/iar/startup_MIMXRT1052.s
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/iar/startup_MIMXRT1052.s
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/mcuxpresso/MIMXRT1050-EVK_IS25WP064A.cfx b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/mcuxpresso/MIMXRT1050-EVK_IS25WP064A.cfx
index 5d346a5eaa..5d346a5eaa 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/mcuxpresso/MIMXRT1050-EVK_IS25WP064A.cfx
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/mcuxpresso/MIMXRT1050-EVK_IS25WP064A.cfx
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/mcuxpresso/MIMXRT1050-EVK_S26KS512S.cfx b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/mcuxpresso/MIMXRT1050-EVK_S26KS512S.cfx
index b19a9e9c6d..b19a9e9c6d 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/mcuxpresso/MIMXRT1050-EVK_S26KS512S.cfx
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/mcuxpresso/MIMXRT1050-EVK_S26KS512S.cfx
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/mcuxpresso/startup_mimxrt1052.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/mcuxpresso/startup_mimxrt1052.c
index efa29284ad..efa29284ad 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/mcuxpresso/startup_mimxrt1052.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/mcuxpresso/startup_mimxrt1052.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/mcuxpresso/startup_mimxrt1052.cpp b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/mcuxpresso/startup_mimxrt1052.cpp
index efa29284ad..efa29284ad 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/mcuxpresso/startup_mimxrt1052.cpp
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/mcuxpresso/startup_mimxrt1052.cpp
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/board.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/board.c
index bb66fd3745..bb66fd3745 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/board.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/board.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/board.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/board.h
index 4f359dcd4e..4f359dcd4e 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/board.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/board.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/clock_config.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/clock_config.c
index 3a4e52d33b..3a4e52d33b 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/clock_config.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/clock_config.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/clock_config.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/clock_config.h
index 6f7ae90629..6f7ae90629 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/clock_config.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/clock_config.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/peripherals.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/peripherals.c
index c699ea2457..c699ea2457 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/peripherals.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/peripherals.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/peripherals.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/peripherals.h
index 321b18acb5..321b18acb5 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/peripherals.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/peripherals.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/pin_mux.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/pin_mux.c
index d0318c7d76..d0318c7d76 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/pin_mux.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/pin_mux.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/pin_mux.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/pin_mux.h
index 3d8b08179b..3d8b08179b 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/pin_mux.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/project_template/pin_mux.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/system_MIMXRT1052.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/system_MIMXRT1052.c
index e5b034d158..e5b034d158 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/system_MIMXRT1052.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/system_MIMXRT1052.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/system_MIMXRT1052.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/system_MIMXRT1052.h
index 74941f9fbd..74941f9fbd 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/system_MIMXRT1052.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/system_MIMXRT1052.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/template/RTE_Device.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/template/RTE_Device.h
index 2d2e5f8a27..2d2e5f8a27 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/template/RTE_Device.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/template/RTE_Device.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/debug_console/fsl_debug_console.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/debug_console/fsl_debug_console.c
index 2d55e36d3e..2d55e36d3e 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/debug_console/fsl_debug_console.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/debug_console/fsl_debug_console.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/debug_console/fsl_debug_console.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/debug_console/fsl_debug_console.h
index 5a0810306c..5a0810306c 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/debug_console/fsl_debug_console.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/debug_console/fsl_debug_console.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/debug_console/fsl_debug_console_conf.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/debug_console/fsl_debug_console_conf.h
index 4a7b331329..4a7b331329 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/debug_console/fsl_debug_console_conf.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/debug_console/fsl_debug_console_conf.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/fsl_assert.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/fsl_assert.c
index 1c3304f6e3..1c3304f6e3 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/fsl_assert.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/fsl_assert.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/fsl_notifier.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/fsl_notifier.c
index 26111861b7..26111861b7 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/fsl_notifier.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/fsl_notifier.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/fsl_notifier.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/fsl_notifier.h
index 3d0b6a8384..3d0b6a8384 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/fsl_notifier.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/fsl_notifier.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/fsl_sbrk.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/fsl_sbrk.c
index 9899c90b93..9899c90b93 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/fsl_sbrk.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/fsl_sbrk.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/fsl_shell.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/fsl_shell.c
index a2f728d7e8..a2f728d7e8 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/fsl_shell.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/fsl_shell.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/fsl_shell.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/fsl_shell.h
index c6afe5d397..c6afe5d397 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/fsl_shell.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/fsl_shell.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/str/fsl_str.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/str/fsl_str.c
index 0e50833a03..0e50833a03 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/str/fsl_str.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/str/fsl_str.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/str/fsl_str.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/str/fsl_str.h
index bf7adcc52a..bf7adcc52a 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/str/fsl_str.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/str/fsl_str.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/usb_device_config.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/usb_device_config.h
index 33a3667222..33a3667222 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/usb_device_config.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/utilities/usb_device_config.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/xip/fsl_flexspi_nor_boot.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/xip/fsl_flexspi_nor_boot.c
index d11ab3b0e2..d11ab3b0e2 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/xip/fsl_flexspi_nor_boot.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/xip/fsl_flexspi_nor_boot.c
diff --git a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/xip/fsl_flexspi_nor_boot.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/xip/fsl_flexspi_nor_boot.h
index 25280629c5..25280629c5 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/MIMXRT1052/xip/fsl_flexspi_nor_boot.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/MIMXRT1052/xip/fsl_flexspi_nor_boot.h
diff --git a/bsp/imxrt/libraries/MIMXRT1050/SConscript b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/SConscript
index adf8177948..adf8177948 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/SConscript
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1050/SConscript
diff --git a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/arm_common_tables.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/arm_common_tables.h
index dfea7460e9..dfea7460e9 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/arm_common_tables.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/arm_common_tables.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/arm_const_structs.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/arm_const_structs.h
index 80a3e8bbe7..80a3e8bbe7 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/arm_const_structs.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/arm_const_structs.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/arm_math.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/arm_math.h
index 27c29911e3..27c29911e3 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/arm_math.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/arm_math.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/cmsis_armcc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/cmsis_armcc.h
index 1c9674bc5b..1c9674bc5b 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/cmsis_armcc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/cmsis_armcc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/cmsis_armclang.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/cmsis_armclang.h
index 8224cdb37b..8224cdb37b 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/cmsis_armclang.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/cmsis_armclang.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/cmsis_armclang_ltm.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/cmsis_armclang_ltm.h
index d6b28d430a..d6b28d430a 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/cmsis_armclang_ltm.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/cmsis_armclang_ltm.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/cmsis_compiler.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/cmsis_compiler.h
index adbf296f15..adbf296f15 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/cmsis_compiler.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/cmsis_compiler.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/cmsis_gcc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/cmsis_gcc.h
index b111f6248c..b111f6248c 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/cmsis_gcc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/cmsis_gcc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/cmsis_iccarm.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/cmsis_iccarm.h
index 6580cce3ce..6580cce3ce 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/cmsis_iccarm.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/cmsis_iccarm.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/cmsis_version.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/cmsis_version.h
index f2e2746626..f2e2746626 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/cmsis_version.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/cmsis_version.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_armv8mbl.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_armv8mbl.h
index 09501ad997..09501ad997 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_armv8mbl.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_armv8mbl.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_armv8mml.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_armv8mml.h
index b1c1595a41..b1c1595a41 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_armv8mml.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_armv8mml.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_cm0.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_cm0.h
index cd4451220a..cd4451220a 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_cm0.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_cm0.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_cm0plus.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_cm0plus.h
index 98cfc2af64..98cfc2af64 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_cm0plus.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_cm0plus.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_cm23.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_cm23.h
index 7d1d478af2..7d1d478af2 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_cm23.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_cm23.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_cm3.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_cm3.h
index 8f87f4726c..8f87f4726c 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_cm3.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_cm3.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_cm33.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_cm33.h
index 5072590c0d..5072590c0d 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_cm33.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_cm33.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_cm4.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_cm4.h
index 3b6faf7eec..3b6faf7eec 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_cm4.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_cm4.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_cm7.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_cm7.h
index 368714ec6c..368714ec6c 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_cm7.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_cm7.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_sc000.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_sc000.h
index 9aab5e5b3e..9aab5e5b3e 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_sc000.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_sc000.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_sc300.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_sc300.h
index a569ef2ace..a569ef2ace 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_sc300.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/core_sc300.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/mpu_armv7.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/mpu_armv7.h
index 4592d60879..4592d60879 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/mpu_armv7.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/mpu_armv7.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/mpu_armv8.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/mpu_armv8.h
index 43d6fec7a2..43d6fec7a2 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/mpu_armv8.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/mpu_armv8.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/tz_context.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/tz_context.h
index facc2c9a47..facc2c9a47 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/Include/tz_context.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/Include/tz_context.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/LICENSE.txt b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/LICENSE.txt
index 8dada3edaf..8dada3edaf 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/CMSIS/LICENSE.txt
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/CMSIS/LICENSE.txt
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/MIMXRT1062.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/MIMXRT1062.h
index 355a347ada..355a347ada 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/MIMXRT1062.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/MIMXRT1062.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/MIMXRT1062.xml b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/MIMXRT1062.xml
index e3f8163c13..e3f8163c13 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/MIMXRT1062.xml
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/MIMXRT1062.xml
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/MIMXRT1062_features.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/MIMXRT1062_features.h
index 22f37ed04e..22f37ed04e 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/MIMXRT1062_features.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/MIMXRT1062_features.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/MIMXRT1062xxxxx_flexspi_nor.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/MIMXRT1062xxxxx_flexspi_nor.scf
index f4cfe95c38..f4cfe95c38 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/MIMXRT1062xxxxx_flexspi_nor.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/MIMXRT1062xxxxx_flexspi_nor.scf
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/MIMXRT1062xxxxx_flexspi_nor_sdram.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/MIMXRT1062xxxxx_flexspi_nor_sdram.scf
index dc43dbc5bb..dc43dbc5bb 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/MIMXRT1062xxxxx_flexspi_nor_sdram.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/MIMXRT1062xxxxx_flexspi_nor_sdram.scf
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/MIMXRT1062xxxxx_ram.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/MIMXRT1062xxxxx_ram.scf
index 31830845fd..31830845fd 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/MIMXRT1062xxxxx_ram.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/MIMXRT1062xxxxx_ram.scf
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/MIMXRT1062xxxxx_sdram.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/MIMXRT1062xxxxx_sdram.scf
index b4b8a208cc..b4b8a208cc 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/MIMXRT1062xxxxx_sdram.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/MIMXRT1062xxxxx_sdram.scf
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/MIMXRT1062xxxxx_sdram_txt.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/MIMXRT1062xxxxx_sdram_txt.scf
index 8317c1eb19..8317c1eb19 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/MIMXRT1062xxxxx_sdram_txt.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/MIMXRT1062xxxxx_sdram_txt.scf
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/MIMXRT106x_QSPI_4KB_SEC.FLM b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/MIMXRT106x_QSPI_4KB_SEC.FLM
index be10fdfb85..be10fdfb85 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/MIMXRT106x_QSPI_4KB_SEC.FLM
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/MIMXRT106x_QSPI_4KB_SEC.FLM
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/evkbmimxrt1060_flexspi_nor.ini b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/evkbmimxrt1060_flexspi_nor.ini
index 3d9fd814bb..3d9fd814bb 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/evkbmimxrt1060_flexspi_nor.ini
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/evkbmimxrt1060_flexspi_nor.ini
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/evkbmimxrt1060_flexspi_nor_sdram.ini b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/evkbmimxrt1060_flexspi_nor_sdram.ini
index 23f64136f0..23f64136f0 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/evkbmimxrt1060_flexspi_nor_sdram.ini
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/evkbmimxrt1060_flexspi_nor_sdram.ini
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/evkmimxrt1060_ram.ini b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/evkmimxrt1060_ram.ini
index 7eccf48374..7eccf48374 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/evkmimxrt1060_ram.ini
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/evkmimxrt1060_ram.ini
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/evkmimxrt1060_sdram_init.ini b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/evkmimxrt1060_sdram_init.ini
index ad36a2e157..ad36a2e157 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/evkmimxrt1060_sdram_init.ini
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/evkmimxrt1060_sdram_init.ini
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/startup_MIMXRT1062.S b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/startup_MIMXRT1062.S
index 44891fca0c..44891fca0c 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/startup_MIMXRT1062.S
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/arm/startup_MIMXRT1062.S
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_enet_cmsis.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_enet_cmsis.c
index e2ce2505bf..e2ce2505bf 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_enet_cmsis.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_enet_cmsis.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_enet_cmsis.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_enet_cmsis.h
index 7ef6f64add..7ef6f64add 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_enet_cmsis.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_enet_cmsis.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_enet_phy_cmsis.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_enet_phy_cmsis.c
index 9c5e49681c..9c5e49681c 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_enet_phy_cmsis.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_enet_phy_cmsis.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_enet_phy_cmsis.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_enet_phy_cmsis.h
index 6b33bf9ecd..6b33bf9ecd 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_enet_phy_cmsis.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_enet_phy_cmsis.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_lpi2c_cmsis.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_lpi2c_cmsis.c
index 832db8e0b8..832db8e0b8 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_lpi2c_cmsis.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_lpi2c_cmsis.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_lpi2c_cmsis.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_lpi2c_cmsis.h
index 385daa89a4..385daa89a4 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_lpi2c_cmsis.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_lpi2c_cmsis.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_lpspi_cmsis.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_lpspi_cmsis.c
index ed512afb86..ed512afb86 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_lpspi_cmsis.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_lpspi_cmsis.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_lpspi_cmsis.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_lpspi_cmsis.h
index 534d399973..534d399973 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_lpspi_cmsis.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_lpspi_cmsis.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_lpuart_cmsis.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_lpuart_cmsis.c
index 70c622bb28..70c622bb28 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_lpuart_cmsis.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_lpuart_cmsis.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_lpuart_cmsis.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_lpuart_cmsis.h
index 53a8d654fc..53a8d654fc 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_lpuart_cmsis.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/cmsis_drivers/fsl_lpuart_cmsis.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_adc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_adc.c
index 909a6f3b50..909a6f3b50 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_adc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_adc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_adc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_adc.h
index c033ba6349..c033ba6349 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_adc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_adc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_adc_etc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_adc_etc.c
index e98ed23e28..e98ed23e28 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_adc_etc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_adc_etc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_adc_etc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_adc_etc.h
index e34e19b00a..e34e19b00a 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_adc_etc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_adc_etc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_aipstz.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_aipstz.c
index 077b4e01e2..077b4e01e2 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_aipstz.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_aipstz.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_aipstz.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_aipstz.h
index a1639f95f1..a1639f95f1 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_aipstz.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_aipstz.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_aoi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_aoi.c
index a8f1f29ddb..a8f1f29ddb 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_aoi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_aoi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_aoi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_aoi.h
index 6d905b9d64..6d905b9d64 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_aoi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_aoi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_bee.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_bee.c
index d4ffdacfb9..d4ffdacfb9 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_bee.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_bee.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_bee.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_bee.h
index 0ea8f80963..0ea8f80963 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_bee.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_bee.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_cache.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_cache.c
index 721a3fb04e..721a3fb04e 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_cache.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_cache.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_cache.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_cache.h
index 9708edd999..9708edd999 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_cache.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_cache.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_clock.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_clock.c
index 72cb8e2635..72cb8e2635 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_clock.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_clock.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_clock.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_clock.h
index 0b1467833e..0b1467833e 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_clock.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_clock.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_cmp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_cmp.c
index 8f6bed69b4..8f6bed69b4 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_cmp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_cmp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_cmp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_cmp.h
index 4b5b7bfcb7..4b5b7bfcb7 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_cmp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_cmp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_common.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_common.c
index d3af9fdfc6..d3af9fdfc6 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_common.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_common.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_common.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_common.h
index d9cb304f2f..d9cb304f2f 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_common.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_common.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_common_arm.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_common_arm.c
index e77a265ce4..e77a265ce4 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_common_arm.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_common_arm.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_common_arm.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_common_arm.h
index 2678ff625c..2678ff625c 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_common_arm.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_common_arm.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_csi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_csi.c
index e23fba521b..e23fba521b 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_csi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_csi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_csi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_csi.h
index dd6f5c08d8..dd6f5c08d8 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_csi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_csi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_dcdc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_dcdc.c
index a4785dd48f..a4785dd48f 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_dcdc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_dcdc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_dcdc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_dcdc.h
index 0335fcc83b..0335fcc83b 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_dcdc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_dcdc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_dcp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_dcp.c
index a0b82bae1c..a0b82bae1c 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_dcp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_dcp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_dcp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_dcp.h
index b31944ddc5..b31944ddc5 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_dcp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_dcp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_dmamux.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_dmamux.c
index 8bfbe6c367..8bfbe6c367 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_dmamux.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_dmamux.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_dmamux.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_dmamux.h
index 2f627c2451..2f627c2451 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_dmamux.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_dmamux.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_edma.c
index 269d62c7ff..269d62c7ff 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_edma.h
index 3d31f88365..3d31f88365 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_elcdif.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_elcdif.c
index 39cb72607f..39cb72607f 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_elcdif.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_elcdif.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_elcdif.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_elcdif.h
index a9d56a1dad..a9d56a1dad 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_elcdif.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_elcdif.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_enc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_enc.c
index aab9a505d8..aab9a505d8 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_enc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_enc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_enc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_enc.h
index 28ce466ce3..28ce466ce3 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_enc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_enc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_enet.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_enet.c
index cf26e857c1..cf26e857c1 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_enet.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_enet.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_enet.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_enet.h
index 740ac58a22..740ac58a22 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_enet.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_enet.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_ewm.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_ewm.c
index 593cf87a50..593cf87a50 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_ewm.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_ewm.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_ewm.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_ewm.h
index dbef1b3d07..dbef1b3d07 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_ewm.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_ewm.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexcan.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexcan.c
index 1f495af526..1f495af526 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexcan.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexcan.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexcan.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexcan.h
index 6c34277a0d..6c34277a0d 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexcan.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexcan.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexcan_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexcan_edma.c
index e067c86eaa..e067c86eaa 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexcan_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexcan_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexcan_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexcan_edma.h
index b5606c269a..b5606c269a 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexcan_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexcan_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio.c
index 18531f7743..18531f7743 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio.h
index 9382738696..9382738696 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_camera.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_camera.c
index 812605626f..812605626f 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_camera.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_camera.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_camera.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_camera.h
index 93612a7188..93612a7188 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_camera.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_camera.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_camera_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_camera_edma.c
index 12bb77b020..12bb77b020 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_camera_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_camera_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_camera_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_camera_edma.h
index ff71a44cfe..ff71a44cfe 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_camera_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_camera_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_i2c_master.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_i2c_master.c
index 9158236bb2..9158236bb2 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_i2c_master.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_i2c_master.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_i2c_master.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_i2c_master.h
index 7855f954c5..7855f954c5 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_i2c_master.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_i2c_master.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_i2s.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_i2s.c
index 087e0d691d..087e0d691d 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_i2s.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_i2s.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_i2s.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_i2s.h
index 3497d7c7ac..3497d7c7ac 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_i2s.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_i2s.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_i2s_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_i2s_edma.c
index faa1541530..faa1541530 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_i2s_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_i2s_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_i2s_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_i2s_edma.h
index a3a0ef1264..a3a0ef1264 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_i2s_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_i2s_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_mculcd.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_mculcd.c
index 5db3141200..5db3141200 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_mculcd.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_mculcd.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_mculcd.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_mculcd.h
index 046b98c37a..046b98c37a 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_mculcd.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_mculcd.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_mculcd_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_mculcd_edma.c
index 458ad8e72b..458ad8e72b 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_mculcd_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_mculcd_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_mculcd_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_mculcd_edma.h
index 200440baae..200440baae 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_mculcd_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_mculcd_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_spi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_spi.c
index 06542d9120..06542d9120 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_spi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_spi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_spi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_spi.h
index 61c1034fc2..61c1034fc2 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_spi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_spi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_spi_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_spi_edma.c
index c1feba0f00..c1feba0f00 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_spi_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_spi_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_spi_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_spi_edma.h
index c71a1b1fda..c71a1b1fda 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_spi_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_spi_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_uart.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_uart.c
index 0d308b16a7..0d308b16a7 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_uart.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_uart.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_uart.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_uart.h
index 783c31885e..783c31885e 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_uart.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_uart.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_uart_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_uart_edma.c
index f2502c9df2..f2502c9df2 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_uart_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_uart_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_uart_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_uart_edma.h
index 3f145ea6a4..3f145ea6a4 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_uart_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexio_uart_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexram.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexram.c
index 65e7318301..65e7318301 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexram.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexram.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexram.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexram.h
index 3c9a9c2db3..3c9a9c2db3 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexram.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexram.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexram_allocate.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexram_allocate.c
index 2c7db7856e..2c7db7856e 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexram_allocate.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexram_allocate.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexram_allocate.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexram_allocate.h
index 7c146c08a7..7c146c08a7 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexram_allocate.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexram_allocate.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexspi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexspi.c
index 7964163917..7964163917 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexspi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexspi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexspi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexspi.h
index 5269d439da..5269d439da 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexspi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexspi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexspi_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexspi_edma.c
index 6947e21c77..6947e21c77 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexspi_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexspi_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexspi_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexspi_edma.h
index 6a57d27332..6a57d27332 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexspi_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_flexspi_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_ft5406_rt.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_ft5406_rt.c
index c8ec4363e0..c8ec4363e0 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_ft5406_rt.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_ft5406_rt.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_ft5406_rt.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_ft5406_rt.h
index 0ae210a804..0ae210a804 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_ft5406_rt.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_ft5406_rt.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gpc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gpc.c
index e5cef48d1b..e5cef48d1b 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gpc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gpc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gpc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gpc.h
index 31375224bc..31375224bc 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gpc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gpc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gpio.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gpio.c
index 68ccade87d..68ccade87d 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gpio.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gpio.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gpio.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gpio.h
index bd0e7f20bb..bd0e7f20bb 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gpio.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gpio.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gpt.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gpt.c
index 691cdf590e..691cdf590e 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gpt.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gpt.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gpt.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gpt.h
index ec274588bf..ec274588bf 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gpt.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gpt.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gt911.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gt911.c
index 38912aa4df..38912aa4df 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gt911.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gt911.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gt911.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gt911.h
index 816b3e313f..816b3e313f 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gt911.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_gt911.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_iomuxc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_iomuxc.h
index a6ea1f69fb..a6ea1f69fb 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_iomuxc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_iomuxc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_kpp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_kpp.c
index 8c0b1958be..8c0b1958be 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_kpp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_kpp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_kpp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_kpp.h
index dc65aaf8d7..dc65aaf8d7 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_kpp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_kpp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpi2c.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpi2c.c
index d4b8f9a82a..d4b8f9a82a 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpi2c.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpi2c.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpi2c.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpi2c.h
index 825a11f217..825a11f217 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpi2c.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpi2c.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpi2c_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpi2c_edma.c
index 82c77b8c2d..82c77b8c2d 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpi2c_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpi2c_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpi2c_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpi2c_edma.h
index 1d48fdf296..1d48fdf296 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpi2c_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpi2c_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpi2c_freertos.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpi2c_freertos.c
index efb2d40333..efb2d40333 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpi2c_freertos.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpi2c_freertos.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpi2c_freertos.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpi2c_freertos.h
index 90bc78e934..90bc78e934 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpi2c_freertos.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpi2c_freertos.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpspi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpspi.c
index e9436d2a36..e9436d2a36 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpspi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpspi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpspi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpspi.h
index dffcad8ddc..dffcad8ddc 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpspi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpspi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpspi_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpspi_edma.c
index cd46d73e8d..cd46d73e8d 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpspi_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpspi_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpspi_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpspi_edma.h
index adfc4e51e2..adfc4e51e2 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpspi_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpspi_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpspi_freertos.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpspi_freertos.c
index 58305df266..58305df266 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpspi_freertos.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpspi_freertos.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpspi_freertos.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpspi_freertos.h
index 2c6bc1e1d5..2c6bc1e1d5 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpspi_freertos.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpspi_freertos.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpuart.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpuart.c
index 7da69430af..7da69430af 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpuart.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpuart.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpuart.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpuart.h
index cbe43ddf6a..cbe43ddf6a 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpuart.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpuart.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpuart_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpuart_edma.c
index f812f570cd..f812f570cd 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpuart_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpuart_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpuart_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpuart_edma.h
index f237efcc61..f237efcc61 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpuart_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpuart_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpuart_freertos.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpuart_freertos.c
index bc6a6f7df6..bc6a6f7df6 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpuart_freertos.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpuart_freertos.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpuart_freertos.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpuart_freertos.h
index 05d842efd4..05d842efd4 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpuart_freertos.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_lpuart_freertos.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_nic301.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_nic301.h
index fb7feec8ec..fb7feec8ec 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_nic301.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_nic301.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_ocotp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_ocotp.c
index 4c15d6974d..4c15d6974d 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_ocotp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_ocotp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_ocotp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_ocotp.h
index 73a405a12a..73a405a12a 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_ocotp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_ocotp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_os_abstraction.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_os_abstraction.h
index 379bde9c2c..379bde9c2c 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_os_abstraction.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_os_abstraction.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_os_abstraction_config.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_os_abstraction_config.h
index 234cf972bc..234cf972bc 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_os_abstraction_config.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_os_abstraction_config.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_os_abstraction_rtthread.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_os_abstraction_rtthread.c
index 6b8fc6ca16..6b8fc6ca16 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_os_abstraction_rtthread.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_os_abstraction_rtthread.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_os_abstraction_rtthread.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_os_abstraction_rtthread.h
index 40bd24271a..40bd24271a 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_os_abstraction_rtthread.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_os_abstraction_rtthread.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pit.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pit.c
index 659de24999..659de24999 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pit.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pit.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pit.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pit.h
index 2b035d41ad..2b035d41ad 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pit.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pit.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pmu.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pmu.c
index 8e8b0473bf..8e8b0473bf 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pmu.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pmu.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pmu.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pmu.h
index 5e66473a41..5e66473a41 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pmu.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pmu.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pwm.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pwm.c
index d16fe3a139..d16fe3a139 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pwm.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pwm.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pwm.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pwm.h
index 081abf1521..081abf1521 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pwm.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pwm.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pxp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pxp.c
index 2e55f5d7b8..2e55f5d7b8 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pxp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pxp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pxp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pxp.h
index a29aace158..a29aace158 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pxp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_pxp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_qtmr.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_qtmr.c
index 24b9becec7..24b9becec7 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_qtmr.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_qtmr.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_qtmr.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_qtmr.h
index ad214b2117..ad214b2117 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_qtmr.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_qtmr.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_romapi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_romapi.c
index 413d652c35..413d652c35 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_romapi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_romapi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_romapi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_romapi.h
index cc8042ca3f..cc8042ca3f 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_romapi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_romapi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_rtwdog.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_rtwdog.c
index 4b49280bf8..4b49280bf8 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_rtwdog.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_rtwdog.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_rtwdog.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_rtwdog.h
index 5eecb5a23b..5eecb5a23b 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_rtwdog.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_rtwdog.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_sai.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_sai.c
index b77e482dac..b77e482dac 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_sai.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_sai.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_sai.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_sai.h
index d69e13ac9d..d69e13ac9d 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_sai.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_sai.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_sai_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_sai_edma.c
index 0b62c40d14..0b62c40d14 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_sai_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_sai_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_sai_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_sai_edma.h
index e457271986..e457271986 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_sai_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_sai_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_semc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_semc.c
index 84b54317b8..84b54317b8 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_semc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_semc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_semc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_semc.h
index e6efec0d8e..e6efec0d8e 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_semc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_semc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_snvs_hp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_snvs_hp.c
index 485ba01b58..485ba01b58 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_snvs_hp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_snvs_hp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_snvs_hp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_snvs_hp.h
index 713f16b037..713f16b037 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_snvs_hp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_snvs_hp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_snvs_lp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_snvs_lp.c
index c9a703eebe..c9a703eebe 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_snvs_lp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_snvs_lp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_snvs_lp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_snvs_lp.h
index 44b9aa02d6..44b9aa02d6 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_snvs_lp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_snvs_lp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_spdif.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_spdif.c
index 72f1c60563..72f1c60563 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_spdif.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_spdif.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_spdif.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_spdif.h
index c1656c10a8..c1656c10a8 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_spdif.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_spdif.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_spdif_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_spdif_edma.c
index 88b95bd195..88b95bd195 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_spdif_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_spdif_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_spdif_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_spdif_edma.h
index 964bf1e7ab..964bf1e7ab 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_spdif_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_spdif_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_src.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_src.c
index 10af22893a..10af22893a 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_src.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_src.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_src.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_src.h
index 33ebf14f14..33ebf14f14 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_src.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_src.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_tempmon.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_tempmon.c
index c0486bd6d7..c0486bd6d7 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_tempmon.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_tempmon.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_tempmon.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_tempmon.h
index bb453de2a3..bb453de2a3 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_tempmon.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_tempmon.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_trng.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_trng.c
index d676a2413b..d676a2413b 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_trng.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_trng.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_trng.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_trng.h
index cf154e4430..cf154e4430 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_trng.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_trng.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_tsc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_tsc.c
index 403f661fa6..403f661fa6 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_tsc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_tsc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_tsc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_tsc.h
index c43fc39ecb..c43fc39ecb 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_tsc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_tsc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_usdhc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_usdhc.c
index f2c82d8cde..f2c82d8cde 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_usdhc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_usdhc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_usdhc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_usdhc.h
index bf4d35cfe6..bf4d35cfe6 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_usdhc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_usdhc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_video_common.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_video_common.c
index f8aaeef2e2..f8aaeef2e2 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_video_common.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_video_common.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_video_common.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_video_common.h
index b4b0ce78e2..b4b0ce78e2 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_video_common.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_video_common.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_wdog.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_wdog.c
index ea6c970b33..ea6c970b33 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_wdog.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_wdog.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_wdog.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_wdog.h
index c49b39abe9..c49b39abe9 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_wdog.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_wdog.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_xbara.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_xbara.c
index cc6307bbb6..cc6307bbb6 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_xbara.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_xbara.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_xbara.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_xbara.h
index 71756e4769..71756e4769 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_xbara.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_xbara.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_xbarb.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_xbarb.c
index c1878a2ae4..c1878a2ae4 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_xbarb.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_xbarb.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_xbarb.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_xbarb.h
index def13c31ad..def13c31ad 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_xbarb.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/fsl_xbarb.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/generic_list.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/generic_list.c
index 80dd21425d..80dd21425d 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/generic_list.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/generic_list.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/generic_list.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/generic_list.h
index def00efe8e..def00efe8e 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/generic_list.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/drivers/generic_list.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/fsl_device_registers.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/fsl_device_registers.h
index 3feb56d8de..3feb56d8de 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/fsl_device_registers.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/fsl_device_registers.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/gcc/MIMXRT1062xxxxx_flexspi_nor.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/gcc/MIMXRT1062xxxxx_flexspi_nor.ld
index 633f7dd6dc..633f7dd6dc 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/gcc/MIMXRT1062xxxxx_flexspi_nor.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/gcc/MIMXRT1062xxxxx_flexspi_nor.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/gcc/MIMXRT1062xxxxx_flexspi_nor_sdram.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/gcc/MIMXRT1062xxxxx_flexspi_nor_sdram.ld
index 0c006d2925..0c006d2925 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/gcc/MIMXRT1062xxxxx_flexspi_nor_sdram.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/gcc/MIMXRT1062xxxxx_flexspi_nor_sdram.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/gcc/MIMXRT1062xxxxx_ram.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/gcc/MIMXRT1062xxxxx_ram.ld
index 553148c72b..553148c72b 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/gcc/MIMXRT1062xxxxx_ram.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/gcc/MIMXRT1062xxxxx_ram.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/gcc/MIMXRT1062xxxxx_sdram.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/gcc/MIMXRT1062xxxxx_sdram.ld
index 0c3c2c0fe7..0c3c2c0fe7 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/gcc/MIMXRT1062xxxxx_sdram.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/gcc/MIMXRT1062xxxxx_sdram.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/gcc/MIMXRT1062xxxxx_sdram_txt.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/gcc/MIMXRT1062xxxxx_sdram_txt.ld
index 317a1d0fde..317a1d0fde 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/gcc/MIMXRT1062xxxxx_sdram_txt.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/gcc/MIMXRT1062xxxxx_sdram_txt.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/gcc/startup_MIMXRT1062.S b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/gcc/startup_MIMXRT1062.S
index cc40aab745..cc40aab745 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/gcc/startup_MIMXRT1062.S
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/gcc/startup_MIMXRT1062.S
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/iar/MIMXRT1062xxxxx_flexspi_nor.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/iar/MIMXRT1062xxxxx_flexspi_nor.icf
index 3c50fb3f76..3c50fb3f76 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/iar/MIMXRT1062xxxxx_flexspi_nor.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/iar/MIMXRT1062xxxxx_flexspi_nor.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/iar/MIMXRT1062xxxxx_flexspi_nor_sdram.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/iar/MIMXRT1062xxxxx_flexspi_nor_sdram.icf
index 8794b4752c..8794b4752c 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/iar/MIMXRT1062xxxxx_flexspi_nor_sdram.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/iar/MIMXRT1062xxxxx_flexspi_nor_sdram.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/iar/MIMXRT1062xxxxx_ram.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/iar/MIMXRT1062xxxxx_ram.icf
index 08e8bb6793..08e8bb6793 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/iar/MIMXRT1062xxxxx_ram.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/iar/MIMXRT1062xxxxx_ram.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/iar/MIMXRT1062xxxxx_sdram.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/iar/MIMXRT1062xxxxx_sdram.icf
index 6d3f522c0b..6d3f522c0b 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/iar/MIMXRT1062xxxxx_sdram.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/iar/MIMXRT1062xxxxx_sdram.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/iar/MIMXRT1062xxxxx_sdram_txt.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/iar/MIMXRT1062xxxxx_sdram_txt.icf
index 6c4eb4c471..6c4eb4c471 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/iar/MIMXRT1062xxxxx_sdram_txt.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/iar/MIMXRT1062xxxxx_sdram_txt.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/iar/startup_MIMXRT1062.s b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/iar/startup_MIMXRT1062.s
index 0551d40402..0551d40402 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/iar/startup_MIMXRT1062.s
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/iar/startup_MIMXRT1062.s
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/mcuxpresso/startup_mimxrt1062.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/mcuxpresso/startup_mimxrt1062.c
index ad52864092..ad52864092 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/mcuxpresso/startup_mimxrt1062.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/mcuxpresso/startup_mimxrt1062.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/mcuxpresso/startup_mimxrt1062.cpp b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/mcuxpresso/startup_mimxrt1062.cpp
index ad52864092..ad52864092 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/mcuxpresso/startup_mimxrt1062.cpp
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/mcuxpresso/startup_mimxrt1062.cpp
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/board.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/board.c
index 586741062c..586741062c 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/board.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/board.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/board.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/board.h
index af781e3dec..af781e3dec 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/board.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/board.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/clock_config.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/clock_config.c
index c4c6c75863..c4c6c75863 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/clock_config.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/clock_config.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/clock_config.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/clock_config.h
index 07812c0f7a..07812c0f7a 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/clock_config.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/clock_config.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/peripherals.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/peripherals.c
index fdbb5d7516..fdbb5d7516 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/peripherals.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/peripherals.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/peripherals.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/peripherals.h
index 1503606377..1503606377 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/peripherals.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/peripherals.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/pin_mux.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/pin_mux.c
index 9b8cb78e32..9b8cb78e32 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/pin_mux.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/pin_mux.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/pin_mux.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/pin_mux.h
index 3ce8fab853..3ce8fab853 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/pin_mux.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/project_template/pin_mux.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/system_MIMXRT1062.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/system_MIMXRT1062.c
index 3044416255..3044416255 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/system_MIMXRT1062.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/system_MIMXRT1062.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/system_MIMXRT1062.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/system_MIMXRT1062.h
index 3a89e63b15..3a89e63b15 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/system_MIMXRT1062.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/system_MIMXRT1062.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/template/RTE_Device.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/template/RTE_Device.h
index efcb2c44f0..efcb2c44f0 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/template/RTE_Device.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/template/RTE_Device.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/debug_console/fsl_debug_console.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/debug_console/fsl_debug_console.c
index 1efdbbbbdf..1efdbbbbdf 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/debug_console/fsl_debug_console.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/debug_console/fsl_debug_console.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/debug_console/fsl_debug_console.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/debug_console/fsl_debug_console.h
index 374148ff85..374148ff85 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/debug_console/fsl_debug_console.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/debug_console/fsl_debug_console.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/debug_console/fsl_debug_console_conf.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/debug_console/fsl_debug_console_conf.h
index a997ab5bcc..a997ab5bcc 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/debug_console/fsl_debug_console_conf.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/debug_console/fsl_debug_console_conf.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/debug_console_lite/fsl_assert.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/debug_console_lite/fsl_assert.c
index bb9127acdf..bb9127acdf 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/debug_console_lite/fsl_assert.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/debug_console_lite/fsl_assert.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/debug_console_lite/fsl_debug_console.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/debug_console_lite/fsl_debug_console.c
index 977e7cd5c6..977e7cd5c6 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/debug_console_lite/fsl_debug_console.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/debug_console_lite/fsl_debug_console.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/debug_console_lite/fsl_debug_console.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/debug_console_lite/fsl_debug_console.h
index 72f9a86d18..72f9a86d18 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/debug_console_lite/fsl_debug_console.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/debug_console_lite/fsl_debug_console.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/fsl_assert.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/fsl_assert.c
index bb9127acdf..bb9127acdf 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/fsl_assert.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/fsl_assert.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/fsl_memcpy.S b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/fsl_memcpy.S
index de2b4d674d..de2b4d674d 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/fsl_memcpy.S
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/fsl_memcpy.S
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/fsl_notifier.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/fsl_notifier.c
index 7b7c02dc3d..7b7c02dc3d 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/fsl_notifier.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/fsl_notifier.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/fsl_notifier.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/fsl_notifier.h
index d93578c13f..d93578c13f 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/fsl_notifier.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/fsl_notifier.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/fsl_sbrk.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/fsl_sbrk.c
index 55363fd59e..55363fd59e 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/fsl_sbrk.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/fsl_sbrk.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/fsl_shell.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/fsl_shell.c
index 5057050a29..5057050a29 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/fsl_shell.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/fsl_shell.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/fsl_shell.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/fsl_shell.h
index 313df41311..313df41311 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/fsl_shell.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/fsl_shell.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/str/fsl_str.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/str/fsl_str.c
index 1c0dccf905..1c0dccf905 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/str/fsl_str.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/str/fsl_str.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/str/fsl_str.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/str/fsl_str.h
index bf7adcc52a..bf7adcc52a 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/str/fsl_str.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/utilities/str/fsl_str.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/xip/fsl_flexspi_nor_boot.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/xip/fsl_flexspi_nor_boot.c
index f71bdab69e..f71bdab69e 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/xip/fsl_flexspi_nor_boot.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/xip/fsl_flexspi_nor_boot.c
diff --git a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/xip/fsl_flexspi_nor_boot.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/xip/fsl_flexspi_nor_boot.h
index 38d5d1833e..38d5d1833e 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/MIMXRT1060/xip/fsl_flexspi_nor_boot.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/MIMXRT1060/xip/fsl_flexspi_nor_boot.h
diff --git a/bsp/imxrt/libraries/MIMXRT1060/SConscript b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/SConscript
index f17ae03486..f17ae03486 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/SConscript
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1060/SConscript
diff --git a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/arm_common_tables.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/arm_common_tables.h
index dfea7460e9..dfea7460e9 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/arm_common_tables.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/arm_common_tables.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/arm_const_structs.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/arm_const_structs.h
index 80a3e8bbe7..80a3e8bbe7 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/arm_const_structs.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/arm_const_structs.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/arm_math.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/arm_math.h
index 62f87bec87..62f87bec87 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/arm_math.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/arm_math.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/cmsis_armcc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/cmsis_armcc.h
index 093d35b9e5..093d35b9e5 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/cmsis_armcc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/cmsis_armcc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/cmsis_armclang.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/cmsis_armclang.h
index 5c4c20e877..5c4c20e877 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/cmsis_armclang.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/cmsis_armclang.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/cmsis_compiler.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/cmsis_compiler.h
index 94212eb87a..94212eb87a 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/cmsis_compiler.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/cmsis_compiler.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/cmsis_gcc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/cmsis_gcc.h
index 5d0f07e8ac..5d0f07e8ac 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/cmsis_gcc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/cmsis_gcc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/cmsis_iccarm.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/cmsis_iccarm.h
index edcaee3d4a..edcaee3d4a 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/cmsis_iccarm.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/cmsis_iccarm.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/cmsis_version.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/cmsis_version.h
index 660f612aa3..660f612aa3 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/cmsis_version.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/cmsis_version.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_armv8mbl.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_armv8mbl.h
index 47a39893ac..47a39893ac 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_armv8mbl.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_armv8mbl.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_armv8mml.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_armv8mml.h
index 0951a1f781..0951a1f781 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_armv8mml.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_armv8mml.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_cm0.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_cm0.h
index a3f1b9ac33..a3f1b9ac33 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_cm0.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_cm0.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_cm0plus.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_cm0plus.h
index f8f30c3496..f8f30c3496 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_cm0plus.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_cm0plus.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_cm23.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_cm23.h
index 7d1d478af2..7d1d478af2 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_cm23.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_cm23.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_cm3.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_cm3.h
index a2c0d08057..a2c0d08057 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_cm3.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_cm3.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_cm33.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_cm33.h
index b1efbcae7c..b1efbcae7c 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_cm33.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_cm33.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_cm4.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_cm4.h
index a11a3817a2..a11a3817a2 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_cm4.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_cm4.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_cm7.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_cm7.h
index 1fe53bf012..1fe53bf012 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_cm7.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_cm7.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_dsp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_dsp.h
index 6c21a47d80..6c21a47d80 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_dsp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_dsp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_sc000.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_sc000.h
index 9aab5e5b3e..9aab5e5b3e 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_sc000.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_sc000.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_sc300.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_sc300.h
index a569ef2ace..a569ef2ace 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_sc300.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/core_sc300.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/mpu_armv7.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/mpu_armv7.h
index aa180c9e59..aa180c9e59 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/mpu_armv7.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/mpu_armv7.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/mpu_armv8.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/mpu_armv8.h
index 0ccfc74fe5..0ccfc74fe5 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/mpu_armv8.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/mpu_armv8.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/tz_context.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/tz_context.h
index 0d09749f3a..0d09749f3a 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/Include/tz_context.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/Include/tz_context.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/LICENSE.txt b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/LICENSE.txt
index 8dada3edaf..8dada3edaf 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/CMSIS/LICENSE.txt
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/CMSIS/LICENSE.txt
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/MIMXRT1061.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/MIMXRT1061.h
index 2caac6addb..2caac6addb 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/MIMXRT1061.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/MIMXRT1061.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/MIMXRT1061.xml b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/MIMXRT1061.xml
index 6ab4e8f15d..6ab4e8f15d 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/MIMXRT1061.xml
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/MIMXRT1061.xml
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/MIMXRT1061_features.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/MIMXRT1061_features.h
index e0691d34f2..e0691d34f2 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/MIMXRT1061_features.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/MIMXRT1061_features.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/arm/MIMXRT1061xxxxx_flexspi_nor.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/arm/MIMXRT1061xxxxx_flexspi_nor.scf
index e566fa3841..e566fa3841 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/arm/MIMXRT1061xxxxx_flexspi_nor.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/arm/MIMXRT1061xxxxx_flexspi_nor.scf
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/arm/MIMXRT1061xxxxx_flexspi_nor_sdram.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/arm/MIMXRT1061xxxxx_flexspi_nor_sdram.scf
index 267e4be1d2..267e4be1d2 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/arm/MIMXRT1061xxxxx_flexspi_nor_sdram.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/arm/MIMXRT1061xxxxx_flexspi_nor_sdram.scf
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/arm/MIMXRT1061xxxxx_ram.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/arm/MIMXRT1061xxxxx_ram.scf
index 58f84b2251..58f84b2251 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/arm/MIMXRT1061xxxxx_ram.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/arm/MIMXRT1061xxxxx_ram.scf
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/arm/MIMXRT1061xxxxx_sdram.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/arm/MIMXRT1061xxxxx_sdram.scf
index 5accb0c271..5accb0c271 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/arm/MIMXRT1061xxxxx_sdram.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/arm/MIMXRT1061xxxxx_sdram.scf
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/arm/MIMXRT1061xxxxx_sdram_txt.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/arm/MIMXRT1061xxxxx_sdram_txt.scf
index bcbf41ac50..bcbf41ac50 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/arm/MIMXRT1061xxxxx_sdram_txt.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/arm/MIMXRT1061xxxxx_sdram_txt.scf
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/arm/MIMXRT106x_QSPI_4KB_SEC.FLM b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/arm/MIMXRT106x_QSPI_4KB_SEC.FLM
index be10fdfb85..be10fdfb85 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/arm/MIMXRT106x_QSPI_4KB_SEC.FLM
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/arm/MIMXRT106x_QSPI_4KB_SEC.FLM
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/arm/startup_MIMXRT1061.s b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/arm/startup_MIMXRT1061.s
index 21d9644381..21d9644381 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/arm/startup_MIMXRT1061.s
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/arm/startup_MIMXRT1061.s
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_adc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_adc.c
index b2fa29b718..b2fa29b718 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_adc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_adc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_adc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_adc.h
index 645e22e3f6..645e22e3f6 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_adc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_adc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_adc_etc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_adc_etc.c
index cdd5db1f9d..cdd5db1f9d 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_adc_etc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_adc_etc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_adc_etc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_adc_etc.h
index 4b43f1aa15..4b43f1aa15 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_adc_etc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_adc_etc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_aipstz.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_aipstz.c
index cef6997595..cef6997595 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_aipstz.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_aipstz.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_aipstz.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_aipstz.h
index 432e0d52ef..432e0d52ef 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_aipstz.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_aipstz.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_aoi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_aoi.c
index 85d8b1fe97..85d8b1fe97 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_aoi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_aoi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_aoi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_aoi.h
index ca6cd73b79..ca6cd73b79 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_aoi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_aoi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_bee.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_bee.c
index 3632743903..3632743903 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_bee.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_bee.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_bee.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_bee.h
index 77068a7ab6..77068a7ab6 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_bee.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_bee.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_cache.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_cache.c
index 259f299466..259f299466 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_cache.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_cache.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_cache.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_cache.h
index 17e30a61d2..17e30a61d2 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_cache.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_cache.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_clock.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_clock.c
index e7ab392f0c..e7ab392f0c 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_clock.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_clock.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_clock.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_clock.h
index e0ca44ce54..e0ca44ce54 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_clock.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_clock.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_cmp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_cmp.c
index 806703bac8..806703bac8 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_cmp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_cmp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_cmp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_cmp.h
index c62c710842..c62c710842 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_cmp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_cmp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_common.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_common.c
index deca9c626e..deca9c626e 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_common.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_common.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_common.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_common.h
index 65bc0acce1..65bc0acce1 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_common.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_common.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_common_arm.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_common_arm.c
index e77a265ce4..e77a265ce4 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_common_arm.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_common_arm.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_common_arm.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_common_arm.h
index 2678ff625c..2678ff625c 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_common_arm.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_common_arm.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_dcdc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_dcdc.c
index 248628763c..248628763c 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_dcdc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_dcdc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_dcdc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_dcdc.h
index 62636f4186..62636f4186 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_dcdc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_dcdc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_dcp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_dcp.c
index b5d2dee619..b5d2dee619 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_dcp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_dcp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_dcp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_dcp.h
index ce6625597c..ce6625597c 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_dcp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_dcp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_dmamux.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_dmamux.c
index 8bfbe6c367..8bfbe6c367 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_dmamux.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_dmamux.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_dmamux.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_dmamux.h
index 096bb851bf..096bb851bf 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_dmamux.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_dmamux.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_edma.c
index b0456f1d0a..b0456f1d0a 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_edma.h
index 6fe8de688d..6fe8de688d 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_enc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_enc.c
index 0c90627759..0c90627759 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_enc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_enc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_enc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_enc.h
index badd234cf2..badd234cf2 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_enc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_enc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_enet.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_enet.c
index e30d9f2312..e30d9f2312 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_enet.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_enet.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_enet.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_enet.h
index 1cc60b0b05..1cc60b0b05 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_enet.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_enet.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_ewm.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_ewm.c
index 15182e15fa..15182e15fa 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_ewm.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_ewm.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_ewm.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_ewm.h
index 3b5fd3a7de..3b5fd3a7de 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_ewm.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_ewm.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexcan.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexcan.c
index 47cea9785d..47cea9785d 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexcan.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexcan.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexcan.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexcan.h
index 9fe1b43996..9fe1b43996 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexcan.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexcan.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio.c
index 9cb5046e05..9cb5046e05 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio.h
index b54a1dc2f6..b54a1dc2f6 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_camera.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_camera.c
index e699522c62..e699522c62 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_camera.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_camera.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_camera.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_camera.h
index 6d7fec2574..6d7fec2574 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_camera.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_camera.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_camera_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_camera_edma.c
index 5fb650bb63..5fb650bb63 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_camera_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_camera_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_camera_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_camera_edma.h
index 303eac4048..303eac4048 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_camera_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_camera_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_i2c_master.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_i2c_master.c
index a3a237a35c..a3a237a35c 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_i2c_master.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_i2c_master.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_i2c_master.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_i2c_master.h
index c55d476a80..c55d476a80 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_i2c_master.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_i2c_master.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_i2s.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_i2s.c
index acf2ea32a7..acf2ea32a7 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_i2s.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_i2s.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_i2s.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_i2s.h
index 32e792596b..32e792596b 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_i2s.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_i2s.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_i2s_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_i2s_edma.c
index 5774768afe..5774768afe 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_i2s_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_i2s_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_i2s_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_i2s_edma.h
index 817f197059..817f197059 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_i2s_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_i2s_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_mculcd.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_mculcd.c
index e5d5b5d8c6..e5d5b5d8c6 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_mculcd.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_mculcd.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_mculcd.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_mculcd.h
index feb196cb81..feb196cb81 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_mculcd.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_mculcd.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_mculcd_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_mculcd_edma.c
index 0b5187833f..0b5187833f 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_mculcd_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_mculcd_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_mculcd_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_mculcd_edma.h
index c9b000b400..c9b000b400 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_mculcd_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_mculcd_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_spi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_spi.c
index f21de1fd02..f21de1fd02 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_spi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_spi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_spi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_spi.h
index 575ac0bd14..575ac0bd14 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_spi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_spi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_spi_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_spi_edma.c
index e680b53371..e680b53371 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_spi_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_spi_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_spi_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_spi_edma.h
index 79c6e23523..79c6e23523 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_spi_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_spi_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_uart.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_uart.c
index 41d872add9..41d872add9 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_uart.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_uart.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_uart.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_uart.h
index 0634c62c69..0634c62c69 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_uart.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_uart.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_uart_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_uart_edma.c
index bb8b1ee30f..bb8b1ee30f 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_uart_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_uart_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_uart_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_uart_edma.h
index 5a6b36f6eb..5a6b36f6eb 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_uart_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexio_uart_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexram.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexram.c
index ee93440d94..ee93440d94 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexram.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexram.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexram.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexram.h
index f5e1859e9f..f5e1859e9f 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexram.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexram.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexspi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexspi.c
index 7972aff3ad..7972aff3ad 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexspi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexspi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexspi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexspi.h
index fcafc20f43..fcafc20f43 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexspi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_flexspi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_gpc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_gpc.c
index a91e16377b..a91e16377b 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_gpc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_gpc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_gpc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_gpc.h
index 09dbaa15de..09dbaa15de 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_gpc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_gpc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_gpio.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_gpio.c
index 98434f323d..98434f323d 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_gpio.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_gpio.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_gpio.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_gpio.h
index 99b30f8936..99b30f8936 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_gpio.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_gpio.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_gpt.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_gpt.c
index 697be010a7..697be010a7 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_gpt.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_gpt.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_gpt.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_gpt.h
index 3666505905..3666505905 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_gpt.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_gpt.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_iomuxc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_iomuxc.h
index 5c4a5c28fa..5c4a5c28fa 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_iomuxc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_iomuxc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_kpp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_kpp.c
index a7c8b3475f..a7c8b3475f 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_kpp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_kpp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_kpp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_kpp.h
index e462a38f63..e462a38f63 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_kpp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_kpp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpi2c.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpi2c.c
index 67b81fde79..67b81fde79 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpi2c.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpi2c.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpi2c.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpi2c.h
index 41f83369b7..41f83369b7 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpi2c.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpi2c.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpi2c_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpi2c_edma.c
index e8de4a1c89..e8de4a1c89 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpi2c_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpi2c_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpi2c_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpi2c_edma.h
index 30d528e555..30d528e555 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpi2c_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpi2c_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpspi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpspi.c
index dbfbe38c98..dbfbe38c98 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpspi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpspi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpspi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpspi.h
index 40236798d1..40236798d1 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpspi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpspi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpspi_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpspi_edma.c
index a26599bd21..a26599bd21 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpspi_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpspi_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpspi_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpspi_edma.h
index a2f9ef55e0..a2f9ef55e0 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpspi_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpspi_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpuart.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpuart.c
index 3a8a437036..3a8a437036 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpuart.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpuart.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpuart.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpuart.h
index ddfa6f6d6b..ddfa6f6d6b 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpuart.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpuart.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpuart_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpuart_edma.c
index 5e7561399c..5e7561399c 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpuart_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpuart_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpuart_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpuart_edma.h
index 53ac71036b..53ac71036b 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpuart_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_lpuart_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_ocotp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_ocotp.c
index 9ac6f0056b..9ac6f0056b 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_ocotp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_ocotp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_ocotp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_ocotp.h
index d962187337..d962187337 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_ocotp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_ocotp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_os_abstraction.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_os_abstraction.h
index 379bde9c2c..379bde9c2c 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_os_abstraction.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_os_abstraction.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_os_abstraction_config.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_os_abstraction_config.h
index 234cf972bc..234cf972bc 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_os_abstraction_config.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_os_abstraction_config.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_os_abstraction_rtthread.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_os_abstraction_rtthread.c
index 6b8fc6ca16..6b8fc6ca16 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_os_abstraction_rtthread.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_os_abstraction_rtthread.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_os_abstraction_rtthread.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_os_abstraction_rtthread.h
index 40bd24271a..40bd24271a 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_os_abstraction_rtthread.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_os_abstraction_rtthread.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_pit.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_pit.c
index 2d15e76865..2d15e76865 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_pit.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_pit.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_pit.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_pit.h
index 1de4984358..1de4984358 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_pit.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_pit.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_pmu.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_pmu.c
index f3e0571f0d..f3e0571f0d 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_pmu.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_pmu.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_pmu.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_pmu.h
index 6d9639d22e..6d9639d22e 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_pmu.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_pmu.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_pwm.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_pwm.c
index ebb9d283dd..ebb9d283dd 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_pwm.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_pwm.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_pwm.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_pwm.h
index 29e78a2be1..29e78a2be1 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_pwm.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_pwm.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_qtmr.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_qtmr.c
index 88294a994f..88294a994f 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_qtmr.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_qtmr.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_qtmr.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_qtmr.h
index 26d1204ebb..26d1204ebb 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_qtmr.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_qtmr.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_rtwdog.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_rtwdog.c
index 9a32bd8064..9a32bd8064 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_rtwdog.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_rtwdog.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_rtwdog.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_rtwdog.h
index b1a708fc80..b1a708fc80 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_rtwdog.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_rtwdog.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_sai.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_sai.c
index 9bf4c59ba2..9bf4c59ba2 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_sai.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_sai.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_sai.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_sai.h
index 6a9c8355f0..6a9c8355f0 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_sai.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_sai.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_sai_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_sai_edma.c
index 6fb16e06f2..6fb16e06f2 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_sai_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_sai_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_sai_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_sai_edma.h
index 71305fd448..71305fd448 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_sai_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_sai_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_semc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_semc.c
index 68a517c3eb..68a517c3eb 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_semc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_semc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_semc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_semc.h
index 41ad2b2362..41ad2b2362 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_semc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_semc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_snvs_hp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_snvs_hp.c
index c59e9fc035..c59e9fc035 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_snvs_hp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_snvs_hp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_snvs_hp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_snvs_hp.h
index 0b86d09850..0b86d09850 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_snvs_hp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_snvs_hp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_snvs_lp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_snvs_lp.c
index 96f41cb054..96f41cb054 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_snvs_lp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_snvs_lp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_snvs_lp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_snvs_lp.h
index 7f012ccd8a..7f012ccd8a 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_snvs_lp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_snvs_lp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_spdif.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_spdif.c
index 2431301b5e..2431301b5e 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_spdif.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_spdif.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_spdif.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_spdif.h
index 2b4a23ad18..2b4a23ad18 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_spdif.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_spdif.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_spdif_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_spdif_edma.c
index 8504a25ec9..8504a25ec9 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_spdif_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_spdif_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_spdif_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_spdif_edma.h
index b39c202671..b39c202671 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_spdif_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_spdif_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_src.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_src.c
index 10af22893a..10af22893a 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_src.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_src.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_src.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_src.h
index 5a8830f69d..5a8830f69d 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_src.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_src.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_tempmon.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_tempmon.c
index 2d110547df..2d110547df 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_tempmon.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_tempmon.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_tempmon.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_tempmon.h
index eaa5be67dd..eaa5be67dd 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_tempmon.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_tempmon.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_trng.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_trng.c
index 28e02887dd..28e02887dd 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_trng.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_trng.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_trng.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_trng.h
index a2c3911428..a2c3911428 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_trng.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_trng.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_tsc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_tsc.c
index 47f52b3db0..47f52b3db0 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_tsc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_tsc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_tsc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_tsc.h
index bb94af4308..bb94af4308 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_tsc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_tsc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_usdhc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_usdhc.c
index 7a3015d584..7a3015d584 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_usdhc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_usdhc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_usdhc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_usdhc.h
index acf33a1f0b..acf33a1f0b 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_usdhc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_usdhc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_wdog.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_wdog.c
index 54ee7e6194..54ee7e6194 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_wdog.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_wdog.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_wdog.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_wdog.h
index d8e0628a3e..d8e0628a3e 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_wdog.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_wdog.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_xbara.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_xbara.c
index ab39eb738f..ab39eb738f 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_xbara.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_xbara.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_xbara.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_xbara.h
index 5fd6945600..5fd6945600 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_xbara.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_xbara.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_xbarb.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_xbarb.c
index ec8c05f1a5..ec8c05f1a5 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_xbarb.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_xbarb.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_xbarb.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_xbarb.h
index b459880605..b459880605 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_xbarb.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/fsl_xbarb.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/generic_list.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/generic_list.c
index 80dd21425d..80dd21425d 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/generic_list.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/generic_list.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/generic_list.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/generic_list.h
index def00efe8e..def00efe8e 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/generic_list.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/drivers/generic_list.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/fsl_device_registers.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/fsl_device_registers.h
index 70810a49d7..70810a49d7 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/fsl_device_registers.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/fsl_device_registers.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/gcc/MIMXRT1061xxxxx_flexspi_nor.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/gcc/MIMXRT1061xxxxx_flexspi_nor.ld
index 1463e33d7c..1463e33d7c 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/gcc/MIMXRT1061xxxxx_flexspi_nor.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/gcc/MIMXRT1061xxxxx_flexspi_nor.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/gcc/MIMXRT1061xxxxx_flexspi_nor_sdram.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/gcc/MIMXRT1061xxxxx_flexspi_nor_sdram.ld
index 7cd6f51c54..7cd6f51c54 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/gcc/MIMXRT1061xxxxx_flexspi_nor_sdram.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/gcc/MIMXRT1061xxxxx_flexspi_nor_sdram.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/gcc/MIMXRT1061xxxxx_ram.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/gcc/MIMXRT1061xxxxx_ram.ld
index 5f5e346db1..5f5e346db1 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/gcc/MIMXRT1061xxxxx_ram.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/gcc/MIMXRT1061xxxxx_ram.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/gcc/MIMXRT1061xxxxx_sdram.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/gcc/MIMXRT1061xxxxx_sdram.ld
index c73fbcd316..c73fbcd316 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/gcc/MIMXRT1061xxxxx_sdram.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/gcc/MIMXRT1061xxxxx_sdram.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/gcc/MIMXRT1061xxxxx_sdram_txt.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/gcc/MIMXRT1061xxxxx_sdram_txt.ld
index d870c3b89d..d870c3b89d 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/gcc/MIMXRT1061xxxxx_sdram_txt.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/gcc/MIMXRT1061xxxxx_sdram_txt.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/gcc/startup_MIMXRT1061.S b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/gcc/startup_MIMXRT1061.S
index ea25d6ffb5..ea25d6ffb5 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/gcc/startup_MIMXRT1061.S
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/gcc/startup_MIMXRT1061.S
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/iar/MIMXRT1061xxxxx_flexspi_nor.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/iar/MIMXRT1061xxxxx_flexspi_nor.icf
index c8b8a4c8b5..c8b8a4c8b5 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/iar/MIMXRT1061xxxxx_flexspi_nor.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/iar/MIMXRT1061xxxxx_flexspi_nor.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/iar/MIMXRT1061xxxxx_flexspi_nor_sdram.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/iar/MIMXRT1061xxxxx_flexspi_nor_sdram.icf
index 7d3670fde1..7d3670fde1 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/iar/MIMXRT1061xxxxx_flexspi_nor_sdram.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/iar/MIMXRT1061xxxxx_flexspi_nor_sdram.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/iar/MIMXRT1061xxxxx_ram.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/iar/MIMXRT1061xxxxx_ram.icf
index 57b4011a8a..57b4011a8a 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/iar/MIMXRT1061xxxxx_ram.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/iar/MIMXRT1061xxxxx_ram.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/iar/MIMXRT1061xxxxx_sdram.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/iar/MIMXRT1061xxxxx_sdram.icf
index 3b56109cd1..3b56109cd1 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/iar/MIMXRT1061xxxxx_sdram.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/iar/MIMXRT1061xxxxx_sdram.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/iar/MIMXRT1061xxxxx_sdram_txt.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/iar/MIMXRT1061xxxxx_sdram_txt.icf
index a2d7b8c967..a2d7b8c967 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/iar/MIMXRT1061xxxxx_sdram_txt.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/iar/MIMXRT1061xxxxx_sdram_txt.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/iar/startup_MIMXRT1061.s b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/iar/startup_MIMXRT1061.s
index ad3483a07f..ad3483a07f 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/iar/startup_MIMXRT1061.s
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/iar/startup_MIMXRT1061.s
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/mcuxpresso/startup_mimxrt1061.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/mcuxpresso/startup_mimxrt1061.c
index e56cbeff7c..e56cbeff7c 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/mcuxpresso/startup_mimxrt1061.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/mcuxpresso/startup_mimxrt1061.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/mcuxpresso/startup_mimxrt1061.cpp b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/mcuxpresso/startup_mimxrt1061.cpp
index e56cbeff7c..e56cbeff7c 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/mcuxpresso/startup_mimxrt1061.cpp
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/mcuxpresso/startup_mimxrt1061.cpp
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/board.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/board.c
index efbf55c5db..efbf55c5db 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/board.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/board.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/board.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/board.h
index 862b48eef3..862b48eef3 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/board.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/board.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/clock_config.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/clock_config.c
index 0453127dfc..0453127dfc 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/clock_config.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/clock_config.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/clock_config.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/clock_config.h
index 32e8ed4144..32e8ed4144 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/clock_config.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/clock_config.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/peripherals.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/peripherals.c
index 53a5d88fd4..53a5d88fd4 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/peripherals.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/peripherals.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/peripherals.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/peripherals.h
index 1503606377..1503606377 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/peripherals.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/peripherals.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/pin_mux.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/pin_mux.c
index 12de3f2b1f..12de3f2b1f 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/pin_mux.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/pin_mux.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/pin_mux.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/pin_mux.h
index 3ce8fab853..3ce8fab853 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/pin_mux.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/project_template/pin_mux.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/system_MIMXRT1061.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/system_MIMXRT1061.c
index fb6c157c49..fb6c157c49 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/system_MIMXRT1061.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/system_MIMXRT1061.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/system_MIMXRT1061.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/system_MIMXRT1061.h
index 65de08cf6e..65de08cf6e 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/system_MIMXRT1061.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/system_MIMXRT1061.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/debug_console/fsl_debug_console.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/debug_console/fsl_debug_console.c
index bb91a37a45..bb91a37a45 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/debug_console/fsl_debug_console.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/debug_console/fsl_debug_console.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/debug_console/fsl_debug_console.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/debug_console/fsl_debug_console.h
index 986da32347..986da32347 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/debug_console/fsl_debug_console.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/debug_console/fsl_debug_console.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/debug_console/fsl_debug_console_conf.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/debug_console/fsl_debug_console_conf.h
index 366c6cdc21..366c6cdc21 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/debug_console/fsl_debug_console_conf.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/debug_console/fsl_debug_console_conf.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/fsl_assert.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/fsl_assert.c
index 9052faf9cb..9052faf9cb 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/fsl_assert.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/fsl_assert.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/fsl_notifier.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/fsl_notifier.c
index 393c83a797..393c83a797 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/fsl_notifier.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/fsl_notifier.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/fsl_notifier.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/fsl_notifier.h
index d93578c13f..d93578c13f 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/fsl_notifier.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/fsl_notifier.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/fsl_shell.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/fsl_shell.c
index 1f79287206..1f79287206 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/fsl_shell.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/fsl_shell.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/fsl_shell.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/fsl_shell.h
index 9eaf951ff0..9eaf951ff0 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/fsl_shell.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/fsl_shell.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/str/fsl_str.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/str/fsl_str.c
index c4d1a0c798..c4d1a0c798 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/str/fsl_str.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/str/fsl_str.c
diff --git a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/str/fsl_str.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/str/fsl_str.h
index bf7adcc52a..bf7adcc52a 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/str/fsl_str.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/MIMXRT1061/utilities/str/fsl_str.h
diff --git a/bsp/imxrt/libraries/MIMXRT1061/SConscript b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/SConscript
index 33f85d0e26..33f85d0e26 100644
--- a/bsp/imxrt/libraries/MIMXRT1061/SConscript
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1061/SConscript
diff --git a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/arm_common_tables.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/arm_common_tables.h
index dfea7460e9..dfea7460e9 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/arm_common_tables.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/arm_common_tables.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/arm_const_structs.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/arm_const_structs.h
index 80a3e8bbe7..80a3e8bbe7 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/arm_const_structs.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/arm_const_structs.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/arm_math.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/arm_math.h
index d6b5b2b1ce..d6b5b2b1ce 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/arm_math.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/arm_math.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/cmsis_armcc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/cmsis_armcc.h
index 97d14ddcd9..97d14ddcd9 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/cmsis_armcc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/cmsis_armcc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/cmsis_armclang.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/cmsis_armclang.h
index 027ede25fe..027ede25fe 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/cmsis_armclang.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/cmsis_armclang.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/cmsis_compiler.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/cmsis_compiler.h
index 94212eb87a..94212eb87a 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/cmsis_compiler.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/cmsis_compiler.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/cmsis_gcc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/cmsis_gcc.h
index 092d001f30..092d001f30 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/cmsis_gcc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/cmsis_gcc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/cmsis_iccarm.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/cmsis_iccarm.h
index edcaee3d4a..edcaee3d4a 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/cmsis_iccarm.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/cmsis_iccarm.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/cmsis_version.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/cmsis_version.h
index 660f612aa3..660f612aa3 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/cmsis_version.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/cmsis_version.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_armv8mbl.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_armv8mbl.h
index 09501ad997..09501ad997 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_armv8mbl.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_armv8mbl.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_armv8mml.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_armv8mml.h
index b1c1595a41..b1c1595a41 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_armv8mml.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_armv8mml.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_cm0.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_cm0.h
index cd4451220a..cd4451220a 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_cm0.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_cm0.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_cm0plus.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_cm0plus.h
index 98cfc2af64..98cfc2af64 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_cm0plus.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_cm0plus.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_cm23.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_cm23.h
index 7d1d478af2..7d1d478af2 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_cm23.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_cm23.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_cm3.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_cm3.h
index 8f87f4726c..8f87f4726c 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_cm3.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_cm3.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_cm33.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_cm33.h
index 5072590c0d..5072590c0d 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_cm33.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_cm33.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_cm4.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_cm4.h
index 3b6faf7eec..3b6faf7eec 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_cm4.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_cm4.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_cm7.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_cm7.h
index 1fe53bf012..1fe53bf012 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_cm7.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_cm7.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_sc000.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_sc000.h
index 9aab5e5b3e..9aab5e5b3e 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_sc000.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_sc000.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_sc300.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_sc300.h
index a569ef2ace..a569ef2ace 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_sc300.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/core_sc300.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/mpu_armv7.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/mpu_armv7.h
index c704e9258d..c704e9258d 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/mpu_armv7.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/mpu_armv7.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/mpu_armv8.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/mpu_armv8.h
index 43d6fec7a2..43d6fec7a2 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/mpu_armv8.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/mpu_armv8.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/tz_context.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/tz_context.h
index facc2c9a47..facc2c9a47 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/Include/tz_context.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/Include/tz_context.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/LICENSE.txt b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/LICENSE.txt
index 8dada3edaf..8dada3edaf 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/CMSIS/LICENSE.txt
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/CMSIS/LICENSE.txt
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/MIMXRT1064.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/MIMXRT1064.h
index 394b9e122d..394b9e122d 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/MIMXRT1064.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/MIMXRT1064.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/MIMXRT1064.xml b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/MIMXRT1064.xml
index e331243edf..e331243edf 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/MIMXRT1064.xml
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/MIMXRT1064.xml
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/MIMXRT1064_features.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/MIMXRT1064_features.h
index 326b55a528..326b55a528 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/MIMXRT1064_features.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/MIMXRT1064_features.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/arm/MIMXRT1064xxxxx_flexspi_nor.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/arm/MIMXRT1064xxxxx_flexspi_nor.scf
index 6123b49b3a..6123b49b3a 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/arm/MIMXRT1064xxxxx_flexspi_nor.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/arm/MIMXRT1064xxxxx_flexspi_nor.scf
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/arm/MIMXRT1064xxxxx_flexspi_nor_sdram.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/arm/MIMXRT1064xxxxx_flexspi_nor_sdram.scf
index ea8d11897b..ea8d11897b 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/arm/MIMXRT1064xxxxx_flexspi_nor_sdram.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/arm/MIMXRT1064xxxxx_flexspi_nor_sdram.scf
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/arm/MIMXRT1064xxxxx_ram.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/arm/MIMXRT1064xxxxx_ram.scf
index c59af4ef4f..c59af4ef4f 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/arm/MIMXRT1064xxxxx_ram.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/arm/MIMXRT1064xxxxx_ram.scf
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/arm/MIMXRT1064xxxxx_sdram.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/arm/MIMXRT1064xxxxx_sdram.scf
index 2d29922002..2d29922002 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/arm/MIMXRT1064xxxxx_sdram.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/arm/MIMXRT1064xxxxx_sdram.scf
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/arm/MIMXRT1064xxxxx_sdram_txt.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/arm/MIMXRT1064xxxxx_sdram_txt.scf
index add79511c3..add79511c3 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/arm/MIMXRT1064xxxxx_sdram_txt.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/arm/MIMXRT1064xxxxx_sdram_txt.scf
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/arm/evkmimxrt1064_flexspi_nor.ini b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/arm/evkmimxrt1064_flexspi_nor.ini
index 62f242e795..62f242e795 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/arm/evkmimxrt1064_flexspi_nor.ini
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/arm/evkmimxrt1064_flexspi_nor.ini
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/arm/startup_MIMXRT1064.s b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/arm/startup_MIMXRT1064.s
index 4c496bc8b9..4c496bc8b9 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/arm/startup_MIMXRT1064.s
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/arm/startup_MIMXRT1064.s
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/cmsis_drivers/fsl_lpi2c_cmsis.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/cmsis_drivers/fsl_lpi2c_cmsis.c
index 56173ee6fb..56173ee6fb 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/cmsis_drivers/fsl_lpi2c_cmsis.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/cmsis_drivers/fsl_lpi2c_cmsis.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/cmsis_drivers/fsl_lpi2c_cmsis.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/cmsis_drivers/fsl_lpi2c_cmsis.h
index 9db2c51777..9db2c51777 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/cmsis_drivers/fsl_lpi2c_cmsis.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/cmsis_drivers/fsl_lpi2c_cmsis.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/cmsis_drivers/fsl_lpspi_cmsis.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/cmsis_drivers/fsl_lpspi_cmsis.c
index 09608a7623..09608a7623 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/cmsis_drivers/fsl_lpspi_cmsis.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/cmsis_drivers/fsl_lpspi_cmsis.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/cmsis_drivers/fsl_lpspi_cmsis.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/cmsis_drivers/fsl_lpspi_cmsis.h
index cdf106ff29..cdf106ff29 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/cmsis_drivers/fsl_lpspi_cmsis.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/cmsis_drivers/fsl_lpspi_cmsis.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/cmsis_drivers/fsl_lpuart_cmsis.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/cmsis_drivers/fsl_lpuart_cmsis.c
index 75a9840b4b..75a9840b4b 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/cmsis_drivers/fsl_lpuart_cmsis.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/cmsis_drivers/fsl_lpuart_cmsis.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/cmsis_drivers/fsl_lpuart_cmsis.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/cmsis_drivers/fsl_lpuart_cmsis.h
index 5d3a8530ed..5d3a8530ed 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/cmsis_drivers/fsl_lpuart_cmsis.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/cmsis_drivers/fsl_lpuart_cmsis.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_adc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_adc.c
index 265e196936..265e196936 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_adc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_adc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_adc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_adc.h
index 99429e6098..99429e6098 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_adc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_adc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_adc_etc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_adc_etc.c
index 66f7fee9a8..66f7fee9a8 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_adc_etc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_adc_etc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_adc_etc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_adc_etc.h
index cdcd7b7d4f..cdcd7b7d4f 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_adc_etc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_adc_etc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_aipstz.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_aipstz.c
index fcb55bfee1..fcb55bfee1 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_aipstz.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_aipstz.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_aipstz.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_aipstz.h
index 3926e11bca..3926e11bca 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_aipstz.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_aipstz.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_aoi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_aoi.c
index 8de79d1058..8de79d1058 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_aoi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_aoi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_aoi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_aoi.h
index 476da05a9a..476da05a9a 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_aoi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_aoi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_bee.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_bee.c
index 9bee27f9c3..9bee27f9c3 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_bee.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_bee.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_bee.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_bee.h
index 31f5cb491f..31f5cb491f 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_bee.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_bee.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_cache.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_cache.c
index 4504ed47d3..4504ed47d3 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_cache.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_cache.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_cache.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_cache.h
index e34d038efb..e34d038efb 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_cache.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_cache.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_clock.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_clock.c
index 2b93ad4290..2b93ad4290 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_clock.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_clock.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_clock.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_clock.h
index 20f8ebcb67..20f8ebcb67 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_clock.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_clock.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_cmp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_cmp.c
index 381254860f..381254860f 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_cmp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_cmp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_cmp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_cmp.h
index e14a94b2e5..e14a94b2e5 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_cmp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_cmp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_common.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_common.c
index c5ae4deeb8..c5ae4deeb8 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_common.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_common.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_common.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_common.h
index f578c5bc14..f578c5bc14 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_common.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_common.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_csi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_csi.c
index e9fb84d247..e9fb84d247 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_csi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_csi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_csi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_csi.h
index ac88f970fe..ac88f970fe 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_csi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_csi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_dcdc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_dcdc.c
index ab00279039..ab00279039 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_dcdc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_dcdc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_dcdc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_dcdc.h
index e0c52bdc50..e0c52bdc50 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_dcdc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_dcdc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_dcp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_dcp.c
index 9f27782e58..9f27782e58 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_dcp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_dcp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_dcp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_dcp.h
index 1c3552f919..1c3552f919 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_dcp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_dcp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_dmamux.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_dmamux.c
index 2a301bda1a..2a301bda1a 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_dmamux.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_dmamux.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_dmamux.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_dmamux.h
index dd6b871cee..dd6b871cee 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_dmamux.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_dmamux.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_edma.c
index 8105df73c4..8105df73c4 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_edma.h
index a586c046e5..a586c046e5 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_elcdif.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_elcdif.c
index 617fd299e5..617fd299e5 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_elcdif.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_elcdif.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_elcdif.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_elcdif.h
index 6a9593441c..6a9593441c 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_elcdif.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_elcdif.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_enc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_enc.c
index a6fce30475..a6fce30475 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_enc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_enc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_enc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_enc.h
index 6f9f8b52ee..6f9f8b52ee 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_enc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_enc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_enet.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_enet.c
index 71b60b0bbc..71b60b0bbc 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_enet.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_enet.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_enet.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_enet.h
index 38e75d5a90..38e75d5a90 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_enet.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_enet.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_ewm.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_ewm.c
index a83883e19c..a83883e19c 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_ewm.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_ewm.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_ewm.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_ewm.h
index 4295e0a9c8..4295e0a9c8 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_ewm.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_ewm.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexcan.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexcan.c
index fe78b8ed7e..fe78b8ed7e 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexcan.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexcan.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexcan.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexcan.h
index d1cba4542e..d1cba4542e 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexcan.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexcan.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio.c
index 339c6d4459..339c6d4459 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio.h
index f9c259b00b..f9c259b00b 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_i2c_master.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_i2c_master.c
index e448d1a8cd..e448d1a8cd 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_i2c_master.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_i2c_master.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_i2c_master.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_i2c_master.h
index 394d715722..394d715722 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_i2c_master.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_i2c_master.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_i2s.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_i2s.c
index 871b1c9f7f..871b1c9f7f 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_i2s.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_i2s.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_i2s.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_i2s.h
index 6d9a713cb5..6d9a713cb5 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_i2s.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_i2s.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_i2s_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_i2s_edma.c
index 2c6e66e2bb..2c6e66e2bb 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_i2s_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_i2s_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_i2s_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_i2s_edma.h
index 47221dac85..47221dac85 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_i2s_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_i2s_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_spi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_spi.c
index fa5847948a..fa5847948a 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_spi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_spi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_spi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_spi.h
index 44d8a7274f..44d8a7274f 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_spi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_spi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_spi_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_spi_edma.c
index 5c79a19f4c..5c79a19f4c 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_spi_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_spi_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_spi_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_spi_edma.h
index 79c6e23523..79c6e23523 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_spi_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_spi_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_uart.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_uart.c
index d6c8f378c2..d6c8f378c2 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_uart.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_uart.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_uart.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_uart.h
index 2b08169b9f..2b08169b9f 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_uart.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_uart.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_uart_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_uart_edma.c
index e8f881af05..e8f881af05 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_uart_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_uart_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_uart_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_uart_edma.h
index 467293aa2c..467293aa2c 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_uart_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexio_uart_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexram.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexram.c
index 671a9e5de1..671a9e5de1 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexram.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexram.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexram.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexram.h
index 0c9f074549..0c9f074549 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexram.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexram.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexspi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexspi.c
index 39a6774e03..39a6774e03 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexspi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexspi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexspi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexspi.h
index 9a9ff657da..9a9ff657da 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexspi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_flexspi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_gpc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_gpc.c
index 3413f1d58a..3413f1d58a 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_gpc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_gpc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_gpc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_gpc.h
index 09dbaa15de..09dbaa15de 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_gpc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_gpc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_gpio.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_gpio.c
index 1ea944e871..1ea944e871 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_gpio.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_gpio.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_gpio.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_gpio.h
index 2d84f379a2..2d84f379a2 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_gpio.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_gpio.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_gpt.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_gpt.c
index 536ea91aee..536ea91aee 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_gpt.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_gpt.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_gpt.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_gpt.h
index 8f5a2ef5c5..8f5a2ef5c5 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_gpt.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_gpt.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_iomuxc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_iomuxc.h
index 95d7499aaa..95d7499aaa 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_iomuxc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_iomuxc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_kpp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_kpp.c
index ad05c32bd5..ad05c32bd5 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_kpp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_kpp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_kpp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_kpp.h
index ddec92d2c2..ddec92d2c2 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_kpp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_kpp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpi2c.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpi2c.c
index aa90a4152a..aa90a4152a 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpi2c.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpi2c.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpi2c.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpi2c.h
index ac511f46b8..ac511f46b8 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpi2c.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpi2c.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpi2c_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpi2c_edma.c
index 431f144f36..431f144f36 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpi2c_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpi2c_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpi2c_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpi2c_edma.h
index 30d528e555..30d528e555 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpi2c_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpi2c_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpi2c_freertos.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpi2c_freertos.c
index ffee832cfd..ffee832cfd 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpi2c_freertos.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpi2c_freertos.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpi2c_freertos.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpi2c_freertos.h
index 4e49e7fe4c..4e49e7fe4c 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpi2c_freertos.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpi2c_freertos.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpspi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpspi.c
index a1c645a4f1..a1c645a4f1 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpspi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpspi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpspi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpspi.h
index 1ac59504ed..1ac59504ed 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpspi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpspi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpspi_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpspi_edma.c
index 2a2616a75f..2a2616a75f 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpspi_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpspi_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpspi_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpspi_edma.h
index 8ef2cde1ed..8ef2cde1ed 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpspi_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpspi_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpspi_freertos.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpspi_freertos.c
index 1c3c6b9d1e..1c3c6b9d1e 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpspi_freertos.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpspi_freertos.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpspi_freertos.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpspi_freertos.h
index 5b1433c6e2..5b1433c6e2 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpspi_freertos.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpspi_freertos.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpuart.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpuart.c
index abe804c549..abe804c549 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpuart.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpuart.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpuart.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpuart.h
index 5c149de37f..5c149de37f 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpuart.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpuart.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpuart_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpuart_edma.c
index 01bc6b1ed8..01bc6b1ed8 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpuart_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpuart_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpuart_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpuart_edma.h
index b4f971a4f8..b4f971a4f8 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpuart_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpuart_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpuart_freertos.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpuart_freertos.c
index 502bca35f6..502bca35f6 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpuart_freertos.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpuart_freertos.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpuart_freertos.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpuart_freertos.h
index 9f47e0b216..9f47e0b216 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpuart_freertos.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_lpuart_freertos.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pit.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pit.c
index 60171732d3..60171732d3 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pit.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pit.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pit.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pit.h
index 667ce8df26..667ce8df26 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pit.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pit.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pmu.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pmu.c
index 82146998e7..82146998e7 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pmu.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pmu.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pmu.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pmu.h
index e8627a4440..e8627a4440 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pmu.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pmu.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pwm.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pwm.c
index f4cd415b39..f4cd415b39 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pwm.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pwm.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pwm.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pwm.h
index ae93c8cb63..ae93c8cb63 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pwm.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pwm.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pxp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pxp.c
index 250439c47f..250439c47f 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pxp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pxp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pxp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pxp.h
index f1ba8d410a..f1ba8d410a 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pxp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_pxp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_qtmr.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_qtmr.c
index 68e9140d9a..68e9140d9a 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_qtmr.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_qtmr.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_qtmr.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_qtmr.h
index 650449e5bf..650449e5bf 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_qtmr.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_qtmr.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_rtwdog.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_rtwdog.c
index a654dc33d6..a654dc33d6 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_rtwdog.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_rtwdog.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_rtwdog.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_rtwdog.h
index 75c7c46750..75c7c46750 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_rtwdog.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_rtwdog.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_sai.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_sai.c
index 9739f53779..9739f53779 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_sai.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_sai.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_sai.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_sai.h
index 45c0d4ce7b..45c0d4ce7b 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_sai.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_sai.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_sai_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_sai_edma.c
index 1600941708..1600941708 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_sai_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_sai_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_sai_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_sai_edma.h
index 7be59ea479..7be59ea479 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_sai_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_sai_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_semc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_semc.c
index 78c935e137..78c935e137 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_semc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_semc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_semc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_semc.h
index daca080442..daca080442 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_semc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_semc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_snvs_hp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_snvs_hp.c
index e4525c1d41..e4525c1d41 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_snvs_hp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_snvs_hp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_snvs_hp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_snvs_hp.h
index d5f72524eb..d5f72524eb 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_snvs_hp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_snvs_hp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_snvs_lp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_snvs_lp.c
index e1def79c51..e1def79c51 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_snvs_lp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_snvs_lp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_snvs_lp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_snvs_lp.h
index dc8e68ee19..dc8e68ee19 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_snvs_lp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_snvs_lp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_spdif.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_spdif.c
index c837c7d6c0..c837c7d6c0 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_spdif.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_spdif.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_spdif.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_spdif.h
index 65369a0607..65369a0607 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_spdif.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_spdif.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_spdif_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_spdif_edma.c
index 418393c957..418393c957 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_spdif_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_spdif_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_spdif_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_spdif_edma.h
index b39c202671..b39c202671 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_spdif_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_spdif_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_src.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_src.c
index 6b9707ad8f..6b9707ad8f 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_src.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_src.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_src.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_src.h
index f397c0fc48..f397c0fc48 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_src.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_src.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_tempmon.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_tempmon.c
index 6e176c13b3..6e176c13b3 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_tempmon.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_tempmon.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_tempmon.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_tempmon.h
index 729beb9df0..729beb9df0 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_tempmon.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_tempmon.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_trng.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_trng.c
index 5d83ac6eec..5d83ac6eec 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_trng.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_trng.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_trng.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_trng.h
index 0ffada368c..0ffada368c 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_trng.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_trng.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_tsc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_tsc.c
index 5ceae13b01..5ceae13b01 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_tsc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_tsc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_tsc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_tsc.h
index 89884e9e94..89884e9e94 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_tsc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_tsc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_usdhc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_usdhc.c
index 60f4cc6ab4..60f4cc6ab4 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_usdhc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_usdhc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_usdhc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_usdhc.h
index 41093084f1..41093084f1 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_usdhc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_usdhc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_wdog.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_wdog.c
index fb4e4994ba..fb4e4994ba 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_wdog.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_wdog.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_wdog.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_wdog.h
index d088e7b61a..d088e7b61a 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_wdog.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_wdog.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_xbara.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_xbara.c
index 140978828e..140978828e 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_xbara.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_xbara.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_xbara.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_xbara.h
index c60cc82b32..c60cc82b32 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_xbara.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_xbara.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_xbarb.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_xbarb.c
index ec91bf5227..ec91bf5227 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_xbarb.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_xbarb.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_xbarb.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_xbarb.h
index b459880605..b459880605 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_xbarb.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/drivers/fsl_xbarb.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/fsl_device_registers.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/fsl_device_registers.h
index e3d5b80e90..e3d5b80e90 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/fsl_device_registers.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/fsl_device_registers.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/gcc/MIMXRT1064xxxxx_flexspi_nor.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/gcc/MIMXRT1064xxxxx_flexspi_nor.ld
index 1376febbf2..1376febbf2 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/gcc/MIMXRT1064xxxxx_flexspi_nor.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/gcc/MIMXRT1064xxxxx_flexspi_nor.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/gcc/MIMXRT1064xxxxx_flexspi_nor_sdram.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/gcc/MIMXRT1064xxxxx_flexspi_nor_sdram.ld
index f911c60933..f911c60933 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/gcc/MIMXRT1064xxxxx_flexspi_nor_sdram.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/gcc/MIMXRT1064xxxxx_flexspi_nor_sdram.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/gcc/MIMXRT1064xxxxx_ram.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/gcc/MIMXRT1064xxxxx_ram.ld
index 63123bc006..63123bc006 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/gcc/MIMXRT1064xxxxx_ram.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/gcc/MIMXRT1064xxxxx_ram.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/gcc/MIMXRT1064xxxxx_sdram.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/gcc/MIMXRT1064xxxxx_sdram.ld
index d599bc1254..d599bc1254 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/gcc/MIMXRT1064xxxxx_sdram.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/gcc/MIMXRT1064xxxxx_sdram.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/gcc/MIMXRT1064xxxxx_sdram_txt.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/gcc/MIMXRT1064xxxxx_sdram_txt.ld
index 9094343deb..9094343deb 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/gcc/MIMXRT1064xxxxx_sdram_txt.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/gcc/MIMXRT1064xxxxx_sdram_txt.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/gcc/startup_MIMXRT1064.S b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/gcc/startup_MIMXRT1064.S
index db5711e040..db5711e040 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/gcc/startup_MIMXRT1064.S
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/gcc/startup_MIMXRT1064.S
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/iar/MIMXRT1064xxxxx_flexspi_nor.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/iar/MIMXRT1064xxxxx_flexspi_nor.icf
index 1b9cf91eda..1b9cf91eda 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/iar/MIMXRT1064xxxxx_flexspi_nor.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/iar/MIMXRT1064xxxxx_flexspi_nor.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/iar/MIMXRT1064xxxxx_flexspi_nor_sdram.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/iar/MIMXRT1064xxxxx_flexspi_nor_sdram.icf
index 69d5cb2ff6..69d5cb2ff6 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/iar/MIMXRT1064xxxxx_flexspi_nor_sdram.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/iar/MIMXRT1064xxxxx_flexspi_nor_sdram.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/iar/MIMXRT1064xxxxx_ram.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/iar/MIMXRT1064xxxxx_ram.icf
index 0c76c40550..0c76c40550 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/iar/MIMXRT1064xxxxx_ram.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/iar/MIMXRT1064xxxxx_ram.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/iar/MIMXRT1064xxxxx_sdram.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/iar/MIMXRT1064xxxxx_sdram.icf
index 878e1c6d6b..878e1c6d6b 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/iar/MIMXRT1064xxxxx_sdram.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/iar/MIMXRT1064xxxxx_sdram.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/iar/MIMXRT1064xxxxx_sdram_txt.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/iar/MIMXRT1064xxxxx_sdram_txt.icf
index 5a72fcfa7e..5a72fcfa7e 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/iar/MIMXRT1064xxxxx_sdram_txt.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/iar/MIMXRT1064xxxxx_sdram_txt.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/iar/startup_MIMXRT1064.s b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/iar/startup_MIMXRT1064.s
index f1f6ff0805..f1f6ff0805 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/iar/startup_MIMXRT1064.s
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/iar/startup_MIMXRT1064.s
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/mcuxpresso/MIMXRT1064.cfx b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/mcuxpresso/MIMXRT1064.cfx
index a114be4734..a114be4734 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/mcuxpresso/MIMXRT1064.cfx
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/mcuxpresso/MIMXRT1064.cfx
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/mcuxpresso/startup_mimxrt1064.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/mcuxpresso/startup_mimxrt1064.c
index dd4af7d72d..dd4af7d72d 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/mcuxpresso/startup_mimxrt1064.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/mcuxpresso/startup_mimxrt1064.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/mcuxpresso/startup_mimxrt1064.cpp b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/mcuxpresso/startup_mimxrt1064.cpp
index dd4af7d72d..dd4af7d72d 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/mcuxpresso/startup_mimxrt1064.cpp
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/mcuxpresso/startup_mimxrt1064.cpp
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/board.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/board.c
index 88da299e04..88da299e04 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/board.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/board.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/board.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/board.h
index 7b246313ce..7b246313ce 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/board.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/board.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/clock_config.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/clock_config.c
index c569c72ed5..c569c72ed5 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/clock_config.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/clock_config.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/clock_config.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/clock_config.h
index 6f7ae90629..6f7ae90629 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/clock_config.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/clock_config.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/peripherals.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/peripherals.c
index 06f6684626..06f6684626 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/peripherals.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/peripherals.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/peripherals.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/peripherals.h
index ca5e934dac..ca5e934dac 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/peripherals.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/peripherals.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/pin_mux.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/pin_mux.c
index 9f9761d184..9f9761d184 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/pin_mux.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/pin_mux.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/pin_mux.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/pin_mux.h
index 29232e0328..29232e0328 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/pin_mux.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/project_template/pin_mux.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/system_MIMXRT1064.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/system_MIMXRT1064.c
index b221ae44a9..b221ae44a9 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/system_MIMXRT1064.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/system_MIMXRT1064.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/system_MIMXRT1064.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/system_MIMXRT1064.h
index f56c18f26d..f56c18f26d 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/system_MIMXRT1064.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/system_MIMXRT1064.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/template/RTE_Device.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/template/RTE_Device.h
index 023aea7d8e..023aea7d8e 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/template/RTE_Device.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/template/RTE_Device.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_assert.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_assert.c
index ee5659c85d..ee5659c85d 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_assert.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_assert.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_debug_console.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_debug_console.c
index b4a86d9288..b4a86d9288 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_debug_console.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_debug_console.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_debug_console.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_debug_console.h
index e34cc92661..e34cc92661 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_debug_console.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_debug_console.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_debug_console_conf.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_debug_console_conf.h
index 4b2ede3ba5..4b2ede3ba5 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_debug_console_conf.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_debug_console_conf.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_notifier.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_notifier.c
index 4c16fdd6ae..4c16fdd6ae 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_notifier.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_notifier.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_notifier.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_notifier.h
index 3d0b6a8384..3d0b6a8384 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_notifier.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_notifier.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_sbrk.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_sbrk.c
index 9899c90b93..9899c90b93 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_sbrk.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_sbrk.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_shell.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_shell.c
index cc5d8720d7..cc5d8720d7 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_shell.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_shell.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_shell.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_shell.h
index 14c7fc2c17..14c7fc2c17 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_shell.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/fsl_shell.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/io/fsl_io.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/io/fsl_io.c
index 9c0caaa0af..9c0caaa0af 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/io/fsl_io.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/io/fsl_io.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/io/fsl_io.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/io/fsl_io.h
index 30b5dbfbd8..30b5dbfbd8 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/io/fsl_io.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/io/fsl_io.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/io/swo/fsl_swo.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/io/swo/fsl_swo.c
index 2166b2c799..2166b2c799 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/io/swo/fsl_swo.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/io/swo/fsl_swo.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/io/swo/fsl_swo.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/io/swo/fsl_swo.h
index 6fa9d6626d..6fa9d6626d 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/io/swo/fsl_swo.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/io/swo/fsl_swo.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/log/fsl_log.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/log/fsl_log.c
index 1efd1ca987..1efd1ca987 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/log/fsl_log.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/log/fsl_log.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/log/fsl_log.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/log/fsl_log.h
index 797277b520..797277b520 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/log/fsl_log.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/log/fsl_log.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/str/fsl_str.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/str/fsl_str.c
index c9203aeb04..c9203aeb04 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/str/fsl_str.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/str/fsl_str.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/str/fsl_str.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/str/fsl_str.h
index ca48cd5b74..ca48cd5b74 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/str/fsl_str.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/utilities/str/fsl_str.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/xip/evkmimxrt1064_flexspi_nor_config.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/xip/evkmimxrt1064_flexspi_nor_config.c
index b58414eba9..b58414eba9 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/xip/evkmimxrt1064_flexspi_nor_config.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/xip/evkmimxrt1064_flexspi_nor_config.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/xip/evkmimxrt1064_flexspi_nor_config.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/xip/evkmimxrt1064_flexspi_nor_config.h
index 81f22550ad..81f22550ad 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/xip/evkmimxrt1064_flexspi_nor_config.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/xip/evkmimxrt1064_flexspi_nor_config.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/xip/evkmimxrt1064_sdram_ini_dcd.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/xip/evkmimxrt1064_sdram_ini_dcd.c
index 475e2efcbe..475e2efcbe 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/xip/evkmimxrt1064_sdram_ini_dcd.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/xip/evkmimxrt1064_sdram_ini_dcd.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/xip/evkmimxrt1064_sdram_ini_dcd.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/xip/evkmimxrt1064_sdram_ini_dcd.h
index 154f8c14ec..154f8c14ec 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/xip/evkmimxrt1064_sdram_ini_dcd.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/xip/evkmimxrt1064_sdram_ini_dcd.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/xip/fsl_flexspi_nor_boot.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/xip/fsl_flexspi_nor_boot.c
index 2e05990395..2e05990395 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/xip/fsl_flexspi_nor_boot.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/xip/fsl_flexspi_nor_boot.c
diff --git a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/xip/fsl_flexspi_nor_boot.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/xip/fsl_flexspi_nor_boot.h
index b22ad21bc0..b22ad21bc0 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/MIMXRT1064/xip/fsl_flexspi_nor_boot.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/MIMXRT1064/xip/fsl_flexspi_nor_boot.h
diff --git a/bsp/imxrt/libraries/MIMXRT1064/SConscript b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/SConscript
index 2217b8c3cb..2217b8c3cb 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/SConscript
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1064/SConscript
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/arm_common_tables.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/arm_common_tables.h
index 0720240318..0720240318 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/arm_common_tables.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/arm_common_tables.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/arm_const_structs.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/arm_const_structs.h
index 80a3e8bbe7..80a3e8bbe7 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/arm_const_structs.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/arm_const_structs.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/arm_math.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/arm_math.h
index 99a38beb5e..99a38beb5e 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/arm_math.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/arm_math.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/cmsis_armcc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/cmsis_armcc.h
index 1c9674bc5b..1c9674bc5b 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/cmsis_armcc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/cmsis_armcc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/cmsis_armclang.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/cmsis_armclang.h
index 8224cdb37b..8224cdb37b 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/cmsis_armclang.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/cmsis_armclang.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/cmsis_armclang_ltm.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/cmsis_armclang_ltm.h
index d6b28d430a..d6b28d430a 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/cmsis_armclang_ltm.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/cmsis_armclang_ltm.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/cmsis_compiler.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/cmsis_compiler.h
index adbf296f15..adbf296f15 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/cmsis_compiler.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/cmsis_compiler.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/cmsis_gcc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/cmsis_gcc.h
index b111f6248c..b111f6248c 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/cmsis_gcc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/cmsis_gcc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/cmsis_iccarm.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/cmsis_iccarm.h
index 6580cce3ce..6580cce3ce 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/cmsis_iccarm.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/cmsis_iccarm.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/cmsis_version.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/cmsis_version.h
index f2e2746626..f2e2746626 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/cmsis_version.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/cmsis_version.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_armv81mml.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_armv81mml.h
index dfcdc4d12d..dfcdc4d12d 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_armv81mml.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_armv81mml.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_armv8mbl.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_armv8mbl.h
index 344dca5148..344dca5148 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_armv8mbl.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_armv8mbl.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_armv8mml.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_armv8mml.h
index 5ddb8aeda7..5ddb8aeda7 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_armv8mml.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_armv8mml.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm0.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm0.h
index 773e6edf59..773e6edf59 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm0.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm0.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm0plus.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm0plus.h
index 4c02ee9ad9..4c02ee9ad9 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm0plus.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm0plus.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm1.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm1.h
index 83b8fc6a0d..83b8fc6a0d 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm1.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm1.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm23.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm23.h
index c355f60379..c355f60379 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm23.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm23.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm3.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm3.h
index 8157ca782d..8157ca782d 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm3.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm3.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm33.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm33.h
index 20bf69b12f..20bf69b12f 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm33.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm33.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm35p.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm35p.h
index d811b2a315..d811b2a315 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm35p.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm35p.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm4.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm4.h
index 12c023b801..12c023b801 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm4.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm4.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm7.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm7.h
index cb823ffc0e..cb823ffc0e 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm7.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cm7.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cmFunc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cmFunc.h
index 652a48af07..652a48af07 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cmFunc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cmFunc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cmInstr.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cmInstr.h
index f474b0e6f3..f474b0e6f3 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cmInstr.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cmInstr.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cmSimd.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cmSimd.h
index 66bf5c2a72..66bf5c2a72 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cmSimd.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_cmSimd.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_dsp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_dsp.h
index 6c21a47d80..6c21a47d80 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_dsp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_dsp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_sc000.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_sc000.h
index cf92577b63..cf92577b63 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_sc000.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_sc000.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_sc300.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_sc300.h
index 40f3af81be..40f3af81be 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_sc300.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/core_sc300.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/mpu_armv7.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/mpu_armv7.h
index 4592d60879..4592d60879 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/mpu_armv7.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/mpu_armv7.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/mpu_armv8.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/mpu_armv8.h
index e2b7c28497..e2b7c28497 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/mpu_armv8.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/mpu_armv8.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/tz_context.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/tz_context.h
index facc2c9a47..facc2c9a47 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/Include/tz_context.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/Include/tz_context.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/LICENSE.txt b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/LICENSE.txt
index 8dada3edaf..8dada3edaf 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/CMSIS/LICENSE.txt
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/CMSIS/LICENSE.txt
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/MIMXRT1176_cm4.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/MIMXRT1176_cm4.h
index fc5b946152..fc5b946152 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/MIMXRT1176_cm4.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/MIMXRT1176_cm4.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/MIMXRT1176_cm4.xml b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/MIMXRT1176_cm4.xml
index 0999f894e0..0999f894e0 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/MIMXRT1176_cm4.xml
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/MIMXRT1176_cm4.xml
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/MIMXRT1176_cm4_features.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/MIMXRT1176_cm4_features.h
index 3b4f8197e5..3b4f8197e5 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/MIMXRT1176_cm4_features.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/MIMXRT1176_cm4_features.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/MIMXRT1176_cm7.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/MIMXRT1176_cm7.h
index 9bd2d0692e..9bd2d0692e 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/MIMXRT1176_cm7.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/MIMXRT1176_cm7.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/MIMXRT1176_cm7.xml b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/MIMXRT1176_cm7.xml
index 5be25e5d29..5be25e5d29 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/MIMXRT1176_cm7.xml
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/MIMXRT1176_cm7.xml
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/MIMXRT1176_cm7_features.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/MIMXRT1176_cm7_features.h
index 81f75b6f41..81f75b6f41 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/MIMXRT1176_cm7_features.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/MIMXRT1176_cm7_features.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm4_flexspi_nor.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm4_flexspi_nor.scf
index 859a00c4a1..26838f1fed 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm4_flexspi_nor.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm4_flexspi_nor.scf
@@ -1,136 +1,136 @@
-#!armclang --target=arm-arm-none-eabi -mcpu=cortex-m4 -E -x c

-/*

-** ###################################################################

-**     Processors:          MIMXRT1176AVM8A_cm4

-**                          MIMXRT1176CVM8A_cm4

-**                          MIMXRT1176DVMAA_cm4

-**

-**     Compiler:            Keil ARM C/C++ Compiler

-**     Reference manual:    IMXRT1170RM, Rev 1, 02/2021

-**     Version:             rev. 1.1, 2022-04-02

-**     Build:               b220402

-**

-**     Abstract:

-**         Linker file for the Keil ARM C/C++ Compiler

-**

-**     Copyright 2016 Freescale Semiconductor, Inc.

-**     Copyright 2016-2022 NXP

-**     All rights reserved.

-**

-**     SPDX-License-Identifier: BSD-3-Clause

-**

-**     http:                 www.nxp.com

-**     mail:                 [email protected]

-**

-** ###################################################################

-*/

-

-#if (defined(__ram_vector_table__))

-  #define __ram_vector_table_size__    0x00000400

-#else

-  #define __ram_vector_table_size__    0x00000000

-#endif

-

-#define m_flash_config_start           0x08000400

-#define m_flash_config_size            0x00000C00

-

-#define m_ivt_start                    0x08001000

-#define m_ivt_size                     0x00001000

-

-#define m_interrupts_start             0x08002000

-#define m_interrupts_size              0x00000400

-

-#define m_text_start                   0x08002400

-#define m_text_size                    0x00FFDC00

-

-#define m_qacode_start                 0x1FFE0000

-#define m_qacode_size                  0x00020000

-

-#define m_interrupts_ram_start         0x20000000

-#define m_interrupts_ram_size          __ram_vector_table_size__

-

-#define m_data_start                   (m_interrupts_ram_start + m_interrupts_ram_size)

-#define m_data_size                    (0x00020000 - m_interrupts_ram_size)

-

-#define m_ncache_start                 0x20280000

-#define m_ncache_size                  0x00040000

-

-#define m_data2_start                  0x20240000

-#define m_data2_size                   0x00040000

-

-/* Sizes */

-#if (defined(__stack_size__))

-  #define Stack_Size                   __stack_size__

-#else

-  #define Stack_Size                   0x0400

-#endif

-

-#if (defined(__heap_size__))

-  #define Heap_Size                    __heap_size__

-#else

-  #define Heap_Size                    0x0400

-#endif

-

-#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)

-LR_m_text m_flash_config_start m_text_start+m_text_size-m_flash_config_start {   ; load region size_region

-  RW_m_config_text m_flash_config_start FIXED m_flash_config_size { ; load address = execution address

-    * (.boot_hdr.conf, +FIRST)

-  }

-

-  RW_m_ivt_text m_ivt_start FIXED m_ivt_size { ; load address = execution address

-    * (.boot_hdr.ivt, +FIRST)

-    * (.boot_hdr.boot_data)

-    * (.boot_hdr.dcd_data)

-  }

-#else

-LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start {   ; load region size_region

-#endif

-  VECTOR_ROM m_interrupts_start FIXED m_interrupts_size { ; load address = execution address

-    * (.isr_vector,+FIRST)

-  }

-  ER_m_text m_text_start FIXED m_text_size { ; load address = execution address

-    * (InRoot$$Sections)

-    .ANY (+RO)

-  }

-#if (defined(__ram_vector_table__))

-  VECTOR_RAM m_interrupts_ram_start EMPTY m_interrupts_ram_size {

-  }

-#else

-  VECTOR_RAM m_interrupts_start EMPTY 0 {

-  }

-#endif

-#if (defined(__heap_noncacheable__))

-  RW_m_data m_data_start m_data_size-Stack_Size { ; RW data

-#else

-  RW_m_data m_data_start m_data_size-Stack_Size-Heap_Size { ; RW data

-#endif

-    .ANY (+RW +ZI)

-    * (RamFunction)

-    * (DataQuickAccess)

-  }

-#if (!defined(__heap_noncacheable__))

-  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up

-  }

-#endif

-  ARM_LIB_STACK m_data_start+m_data_size EMPTY -Stack_Size { ; Stack region growing down

-  }

-  RW_m_ram_text m_qacode_start m_qacode_size { ;

-    * (CodeQuickAccess)

-  }

-#if (defined(__heap_noncacheable__))

-  RW_m_ncache m_ncache_start m_ncache_size - Heap_Size { ; ncache data

-#else

-  RW_m_ncache m_ncache_start m_ncache_size { ; ncache data

-#endif

-    * (NonCacheable.init)

-    * (*NonCacheable)

-  }

-#if (defined(__heap_noncacheable__))

-  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up

-  }

-  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache)-Heap_Size { ; Empty region added for MPU configuration

-#else

-  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache) { ; Empty region added for MPU configuration

-#endif

-  }

-}

+#!armclang --target=arm-arm-none-eabi -mcpu=cortex-m4 -E -x c
+/*
+** ###################################################################
+**     Processors:          MIMXRT1176AVM8A_cm4
+**                          MIMXRT1176CVM8A_cm4
+**                          MIMXRT1176DVMAA_cm4
+**
+**     Compiler:            Keil ARM C/C++ Compiler
+**     Reference manual:    IMXRT1170RM, Rev 1, 02/2021
+**     Version:             rev. 1.1, 2022-04-02
+**     Build:               b220402
+**
+**     Abstract:
+**         Linker file for the Keil ARM C/C++ Compiler
+**
+**     Copyright 2016 Freescale Semiconductor, Inc.
+**     Copyright 2016-2022 NXP
+**     All rights reserved.
+**
+**     SPDX-License-Identifier: BSD-3-Clause
+**
+**     http:                 www.nxp.com
+**     mail:                 [email protected]
+**
+** ###################################################################
+*/
+
+#if (defined(__ram_vector_table__))
+  #define __ram_vector_table_size__    0x00000400
+#else
+  #define __ram_vector_table_size__    0x00000000
+#endif
+
+#define m_flash_config_start           0x08000400
+#define m_flash_config_size            0x00000C00
+
+#define m_ivt_start                    0x08001000
+#define m_ivt_size                     0x00001000
+
+#define m_interrupts_start             0x08002000
+#define m_interrupts_size              0x00000400
+
+#define m_text_start                   0x08002400
+#define m_text_size                    0x00FFDC00
+
+#define m_qacode_start                 0x1FFE0000
+#define m_qacode_size                  0x00020000
+
+#define m_interrupts_ram_start         0x20000000
+#define m_interrupts_ram_size          __ram_vector_table_size__
+
+#define m_data_start                   (m_interrupts_ram_start + m_interrupts_ram_size)
+#define m_data_size                    (0x00020000 - m_interrupts_ram_size)
+
+#define m_ncache_start                 0x20280000
+#define m_ncache_size                  0x00040000
+
+#define m_data2_start                  0x20240000
+#define m_data2_size                   0x00040000
+
+/* Sizes */
+#if (defined(__stack_size__))
+  #define Stack_Size                   __stack_size__
+#else
+  #define Stack_Size                   0x0400
+#endif
+
+#if (defined(__heap_size__))
+  #define Heap_Size                    __heap_size__
+#else
+  #define Heap_Size                    0x0400
+#endif
+
+#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
+LR_m_text m_flash_config_start m_text_start+m_text_size-m_flash_config_start {   ; load region size_region
+  RW_m_config_text m_flash_config_start FIXED m_flash_config_size { ; load address = execution address
+    * (.boot_hdr.conf, +FIRST)
+  }
+
+  RW_m_ivt_text m_ivt_start FIXED m_ivt_size { ; load address = execution address
+    * (.boot_hdr.ivt, +FIRST)
+    * (.boot_hdr.boot_data)
+    * (.boot_hdr.dcd_data)
+  }
+#else
+LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start {   ; load region size_region
+#endif
+  VECTOR_ROM m_interrupts_start FIXED m_interrupts_size { ; load address = execution address
+    * (.isr_vector,+FIRST)
+  }
+  ER_m_text m_text_start FIXED m_text_size { ; load address = execution address
+    * (InRoot$$Sections)
+    .ANY (+RO)
+  }
+#if (defined(__ram_vector_table__))
+  VECTOR_RAM m_interrupts_ram_start EMPTY m_interrupts_ram_size {
+  }
+#else
+  VECTOR_RAM m_interrupts_start EMPTY 0 {
+  }
+#endif
+#if (defined(__heap_noncacheable__))
+  RW_m_data m_data_start m_data_size-Stack_Size { ; RW data
+#else
+  RW_m_data m_data_start m_data_size-Stack_Size-Heap_Size { ; RW data
+#endif
+    .ANY (+RW +ZI)
+    * (RamFunction)
+    * (DataQuickAccess)
+  }
+#if (!defined(__heap_noncacheable__))
+  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up
+  }
+#endif
+  ARM_LIB_STACK m_data_start+m_data_size EMPTY -Stack_Size { ; Stack region growing down
+  }
+  RW_m_ram_text m_qacode_start m_qacode_size { ;
+    * (CodeQuickAccess)
+  }
+#if (defined(__heap_noncacheable__))
+  RW_m_ncache m_ncache_start m_ncache_size - Heap_Size { ; ncache data
+#else
+  RW_m_ncache m_ncache_start m_ncache_size { ; ncache data
+#endif
+    * (NonCacheable.init)
+    * (*NonCacheable)
+  }
+#if (defined(__heap_noncacheable__))
+  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up
+  }
+  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache)-Heap_Size { ; Empty region added for MPU configuration
+#else
+  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache) { ; Empty region added for MPU configuration
+#endif
+  }
+}
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm4_flexspi_nor_sdram.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm4_flexspi_nor_sdram.scf
index 3d06c2384a..d0b817a571 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm4_flexspi_nor_sdram.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm4_flexspi_nor_sdram.scf
@@ -1,164 +1,164 @@
-#!armclang --target=arm-arm-none-eabi -mcpu=cortex-m4 -E -x c

-/*

-** ###################################################################

-**     Processors:          MIMXRT1176AVM8A_cm4

-**                          MIMXRT1176CVM8A_cm4

-**                          MIMXRT1176DVMAA_cm4

-**

-**     Compiler:            Keil ARM C/C++ Compiler

-**     Reference manual:    IMXRT1170RM, Rev 1, 02/2021

-**     Version:             rev. 1.1, 2022-04-02

-**     Build:               b220402

-**

-**     Abstract:

-**         Linker file for the Keil ARM C/C++ Compiler

-**

-**     Copyright 2016 Freescale Semiconductor, Inc.

-**     Copyright 2016-2022 NXP

-**     All rights reserved.

-**

-**     SPDX-License-Identifier: BSD-3-Clause

-**

-**     http:                 www.nxp.com

-**     mail:                 [email protected]

-**

-** ###################################################################

-*/

-

-#if (defined(__ram_vector_table__))

-  #define __ram_vector_table_size__    0x00000400

-#else

-  #define __ram_vector_table_size__    0x00000000

-#endif

-

-#define m_flash_config_start           0x08000400

-#define m_flash_config_size            0x00000C00

-

-#define m_ivt_start                    0x08001000

-#define m_ivt_size                     0x00000020

-

-#define m_boot_data_start              0x08001020

-#define m_boot_data_size               0x00000010

-

-#define m_dcd_data_start               0x08001030

-#define m_dcd_data_size                0x000006E8

-

-#define m_xmcd_data_start              0x08001040

-#define m_xmcd_data_size               0x00000204

-

-#define m_interrupts_start             0x08002000

-#define m_interrupts_size              0x00000400

-

-#define m_text_start                   0x08002400

-#define m_text_size                    0x00FFDC00

-

-#define m_qacode_start                 0x1FFE0000

-#define m_qacode_size                  0x00020000

-

-#define m_interrupts_ram_start         0x80000000

-#define m_interrupts_ram_size          __ram_vector_table_size__

-

-#define  m_data_start                  (m_interrupts_ram_start + m_interrupts_ram_size)

-#define  m_data_size                   (0x03000000 - m_interrupts_ram_size)

-

-#define m_ncache_start                 0x83000000

-#define m_ncache_size                  0x01000000

-

-#define m_data2_start                  0x20000000

-#define m_data2_size                   0x00020000

-

-#define m_data3_start                  0x20240000

-#define m_data3_size                   0x00080000

-

-/* Sizes */

-#if (defined(__stack_size__))

-  #define Stack_Size                   __stack_size__

-#else

-  #define Stack_Size                   0x0400

-#endif

-

-#if (defined(__heap_size__))

-  #define Heap_Size                    __heap_size__

-#else

-  #define Heap_Size                    0x0400

-#endif

-

-#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)

-LR_m_text m_flash_config_start m_text_start+m_text_size-m_flash_config_start {   ; load region size_region

-  RW_m_config_text m_flash_config_start FIXED m_flash_config_size { ; load address = execution address

-    * (.boot_hdr.conf, +FIRST)

-  }

-

-  RW_m_ivt_text m_ivt_start FIXED m_ivt_size { ; load address = execution address

-    * (.boot_hdr.ivt, +FIRST)

-  }

-

-  RW_m_boot_data_text m_boot_data_start FIXED m_boot_data_size { ; load address = execution address

-    * (.boot_hdr.boot_data, +FIRST)

-  }

-

-#if defined(XIP_BOOT_HEADER_DCD_ENABLE) && (XIP_BOOT_HEADER_DCD_ENABLE == 1)

-  RW_m_dcd_data_text m_dcd_data_start FIXED m_dcd_data_size { ; load address = execution address

-    * (.boot_hdr.dcd_data, +FIRST)

-  }

-#elif defined(XIP_BOOT_HEADER_XMCD_ENABLE) && (XIP_BOOT_HEADER_XMCD_ENABLE == 1)

-  RW_m_xmcd_data_text m_xmcd_data_start FIXED m_xmcd_data_size { ; load address = execution address

-    * (.boot_hdr.xmcd_data, +FIRST)

-  }

-#endif

-#else

-LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start {   ; load region size_region

-#endif

-  VECTOR_ROM m_interrupts_start FIXED m_interrupts_size { ; load address = execution address

-    * (.isr_vector,+FIRST)

-  }

-  ER_m_text m_text_start FIXED m_text_size { ; load address = execution address

-    * (InRoot$$Sections)

-    .ANY (+RO)

-  }

-#if (defined(__ram_vector_table__))

-  VECTOR_RAM m_interrupts_ram_start EMPTY m_interrupts_ram_size {

-  }

-#else

-  VECTOR_RAM m_interrupts_start EMPTY 0 {

-  }

-#endif

-  RW_m_data2 m_data2_start m_data2_size {

-    * (RamFunction)

-    * (DataQuickAccess)

-  }

-#if (defined(__heap_noncacheable__))

-  RW_m_data m_data_start m_data_size-Stack_Size { ; RW data

-#else

-  RW_m_data m_data_start m_data_size-Stack_Size-Heap_Size { ; RW data

-#endif

-    .ANY (+RW +ZI)

-    *(*m_usb_dma_init_data)

-    *(*m_usb_dma_noninit_data)

-  }

-#if (!defined(__heap_noncacheable__))

-  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up

-  }

-#endif

-  ARM_LIB_STACK m_data_start+m_data_size EMPTY -Stack_Size { ; Stack region growing down

-  }

-  RW_m_ram_text m_qacode_start m_qacode_size { ;

-    * (CodeQuickAccess)

-  }

-#if (defined(__heap_noncacheable__))

-  RW_m_ncache m_ncache_start m_ncache_size - Heap_Size { ; ncache data

-#else

-  RW_m_ncache m_ncache_start m_ncache_size { ; ncache data

-#endif

-    * (NonCacheable.init)

-    * (*NonCacheable)

-  }

-#if (defined(__heap_noncacheable__))

-  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up

-  }

-  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache)-Heap_Size { ; Empty region added for MPU configuration

-#else

-  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache) { ; Empty region added for MPU configuration

-#endif

-  }

-}

+#!armclang --target=arm-arm-none-eabi -mcpu=cortex-m4 -E -x c
+/*
+** ###################################################################
+**     Processors:          MIMXRT1176AVM8A_cm4
+**                          MIMXRT1176CVM8A_cm4
+**                          MIMXRT1176DVMAA_cm4
+**
+**     Compiler:            Keil ARM C/C++ Compiler
+**     Reference manual:    IMXRT1170RM, Rev 1, 02/2021
+**     Version:             rev. 1.1, 2022-04-02
+**     Build:               b220402
+**
+**     Abstract:
+**         Linker file for the Keil ARM C/C++ Compiler
+**
+**     Copyright 2016 Freescale Semiconductor, Inc.
+**     Copyright 2016-2022 NXP
+**     All rights reserved.
+**
+**     SPDX-License-Identifier: BSD-3-Clause
+**
+**     http:                 www.nxp.com
+**     mail:                 [email protected]
+**
+** ###################################################################
+*/
+
+#if (defined(__ram_vector_table__))
+  #define __ram_vector_table_size__    0x00000400
+#else
+  #define __ram_vector_table_size__    0x00000000
+#endif
+
+#define m_flash_config_start           0x08000400
+#define m_flash_config_size            0x00000C00
+
+#define m_ivt_start                    0x08001000
+#define m_ivt_size                     0x00000020
+
+#define m_boot_data_start              0x08001020
+#define m_boot_data_size               0x00000010
+
+#define m_dcd_data_start               0x08001030
+#define m_dcd_data_size                0x000006E8
+
+#define m_xmcd_data_start              0x08001040
+#define m_xmcd_data_size               0x00000204
+
+#define m_interrupts_start             0x08002000
+#define m_interrupts_size              0x00000400
+
+#define m_text_start                   0x08002400
+#define m_text_size                    0x00FFDC00
+
+#define m_qacode_start                 0x1FFE0000
+#define m_qacode_size                  0x00020000
+
+#define m_interrupts_ram_start         0x80000000
+#define m_interrupts_ram_size          __ram_vector_table_size__
+
+#define  m_data_start                  (m_interrupts_ram_start + m_interrupts_ram_size)
+#define  m_data_size                   (0x03000000 - m_interrupts_ram_size)
+
+#define m_ncache_start                 0x83000000
+#define m_ncache_size                  0x01000000
+
+#define m_data2_start                  0x20000000
+#define m_data2_size                   0x00020000
+
+#define m_data3_start                  0x20240000
+#define m_data3_size                   0x00080000
+
+/* Sizes */
+#if (defined(__stack_size__))
+  #define Stack_Size                   __stack_size__
+#else
+  #define Stack_Size                   0x0400
+#endif
+
+#if (defined(__heap_size__))
+  #define Heap_Size                    __heap_size__
+#else
+  #define Heap_Size                    0x0400
+#endif
+
+#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
+LR_m_text m_flash_config_start m_text_start+m_text_size-m_flash_config_start {   ; load region size_region
+  RW_m_config_text m_flash_config_start FIXED m_flash_config_size { ; load address = execution address
+    * (.boot_hdr.conf, +FIRST)
+  }
+
+  RW_m_ivt_text m_ivt_start FIXED m_ivt_size { ; load address = execution address
+    * (.boot_hdr.ivt, +FIRST)
+  }
+
+  RW_m_boot_data_text m_boot_data_start FIXED m_boot_data_size { ; load address = execution address
+    * (.boot_hdr.boot_data, +FIRST)
+  }
+
+#if defined(XIP_BOOT_HEADER_DCD_ENABLE) && (XIP_BOOT_HEADER_DCD_ENABLE == 1)
+  RW_m_dcd_data_text m_dcd_data_start FIXED m_dcd_data_size { ; load address = execution address
+    * (.boot_hdr.dcd_data, +FIRST)
+  }
+#elif defined(XIP_BOOT_HEADER_XMCD_ENABLE) && (XIP_BOOT_HEADER_XMCD_ENABLE == 1)
+  RW_m_xmcd_data_text m_xmcd_data_start FIXED m_xmcd_data_size { ; load address = execution address
+    * (.boot_hdr.xmcd_data, +FIRST)
+  }
+#endif
+#else
+LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start {   ; load region size_region
+#endif
+  VECTOR_ROM m_interrupts_start FIXED m_interrupts_size { ; load address = execution address
+    * (.isr_vector,+FIRST)
+  }
+  ER_m_text m_text_start FIXED m_text_size { ; load address = execution address
+    * (InRoot$$Sections)
+    .ANY (+RO)
+  }
+#if (defined(__ram_vector_table__))
+  VECTOR_RAM m_interrupts_ram_start EMPTY m_interrupts_ram_size {
+  }
+#else
+  VECTOR_RAM m_interrupts_start EMPTY 0 {
+  }
+#endif
+  RW_m_data2 m_data2_start m_data2_size {
+    * (RamFunction)
+    * (DataQuickAccess)
+  }
+#if (defined(__heap_noncacheable__))
+  RW_m_data m_data_start m_data_size-Stack_Size { ; RW data
+#else
+  RW_m_data m_data_start m_data_size-Stack_Size-Heap_Size { ; RW data
+#endif
+    .ANY (+RW +ZI)
+    *(*m_usb_dma_init_data)
+    *(*m_usb_dma_noninit_data)
+  }
+#if (!defined(__heap_noncacheable__))
+  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up
+  }
+#endif
+  ARM_LIB_STACK m_data_start+m_data_size EMPTY -Stack_Size { ; Stack region growing down
+  }
+  RW_m_ram_text m_qacode_start m_qacode_size { ;
+    * (CodeQuickAccess)
+  }
+#if (defined(__heap_noncacheable__))
+  RW_m_ncache m_ncache_start m_ncache_size - Heap_Size { ; ncache data
+#else
+  RW_m_ncache m_ncache_start m_ncache_size { ; ncache data
+#endif
+    * (NonCacheable.init)
+    * (*NonCacheable)
+  }
+#if (defined(__heap_noncacheable__))
+  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up
+  }
+  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache)-Heap_Size { ; Empty region added for MPU configuration
+#else
+  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache) { ; Empty region added for MPU configuration
+#endif
+  }
+}
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm4_ocram.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm4_ocram.scf
index 729f56550f..6a525fd5af 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm4_ocram.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm4_ocram.scf
@@ -1,102 +1,102 @@
-#!armclang --target=arm-arm-none-eabi -mcpu=cortex-m4 -E -x c

-/*

-** ###################################################################

-**     Processors:          MIMXRT1176AVM8A_cm4

-**                          MIMXRT1176CVM8A_cm4

-**                          MIMXRT1176DVMAA_cm4

-**

-**     Compiler:            Keil ARM C/C++ Compiler

-**     Reference manual:    IMXRT1170RM, Rev 1, 02/2021

-**     Version:             rev. 1.1, 2022-04-02

-**     Build:               b220402

-**

-**     Abstract:

-**         Linker file for the Keil ARM C/C++ Compiler

-**

-**     Copyright 2016 Freescale Semiconductor, Inc.

-**     Copyright 2016-2022 NXP

-**     All rights reserved.

-**

-**     SPDX-License-Identifier: BSD-3-Clause

-**

-**     http:                 www.nxp.com

-**     mail:                 [email protected]

-**

-** ###################################################################

-*/

-

-#define m_interrupts_start             0x20200000

-#define m_interrupts_size              0x00000400

-

-#define m_text_start                   0x20200400

-#define m_text_size                    0x0001FC00

-

-#define m_qacode_start                 0x1FFE0000

-#define m_qacode_size                  0x00020000

-

-#define m_data_start                   0x20000000

-#define m_data_size                    0x00020000

-

-#define m_ncache_start                 0x20280000

-#define m_ncache_size                  0x00040000

-

-#define m_data2_start                  0x20240000

-#define m_data2_size                   0x00040000

-

-/* Sizes */

-#if (defined(__stack_size__))

-  #define Stack_Size                   __stack_size__

-#else

-  #define Stack_Size                   0x0400

-#endif

-

-#if (defined(__heap_size__))

-  #define Heap_Size                    __heap_size__

-#else

-  #define Heap_Size                    0x0400

-#endif

-

-LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start {   ; load region size_region

-  VECTOR_ROM m_interrupts_start FIXED m_interrupts_size { ; load address = execution address

-    * (.isr_vector,+FIRST)

-  }

-  ER_m_text m_text_start FIXED m_text_size { ; load address = execution address

-    * (InRoot$$Sections)

-    .ANY (+RO)

-  }

-  VECTOR_RAM m_interrupts_start EMPTY 0 {

-  }

-#if (defined(__heap_noncacheable__))

-  RW_m_data m_data_start m_data_size-Stack_Size { ; RW data

-#else

-  RW_m_data m_data_start m_data_size-Stack_Size-Heap_Size { ; RW data

-#endif

-    .ANY (+RW +ZI)

-    * (DataQuickAccess)

-  }

-#if (!defined(__heap_noncacheable__))

-  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up

-  }

-#endif

-  ARM_LIB_STACK m_data_start+m_data_size EMPTY -Stack_Size { ; Stack region growing down

-  }

-  RW_m_ram_text m_qacode_start m_qacode_size { ;

-    * (CodeQuickAccess)

-  }

-#if (defined(__heap_noncacheable__))

-  RW_m_ncache m_ncache_start m_ncache_size - Heap_Size { ; ncache data

-#else

-  RW_m_ncache m_ncache_start m_ncache_size { ; ncache data

-#endif

-    * (NonCacheable.init)

-    * (*NonCacheable)

-  }

-#if (defined(__heap_noncacheable__))

-  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up

-  }

-  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache)-Heap_Size { ; Empty region added for MPU configuration

-#else

-  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache) { ; Empty region added for MPU configuration

-#endif

-  }

-}

+#!armclang --target=arm-arm-none-eabi -mcpu=cortex-m4 -E -x c
+/*
+** ###################################################################
+**     Processors:          MIMXRT1176AVM8A_cm4
+**                          MIMXRT1176CVM8A_cm4
+**                          MIMXRT1176DVMAA_cm4
+**
+**     Compiler:            Keil ARM C/C++ Compiler
+**     Reference manual:    IMXRT1170RM, Rev 1, 02/2021
+**     Version:             rev. 1.1, 2022-04-02
+**     Build:               b220402
+**
+**     Abstract:
+**         Linker file for the Keil ARM C/C++ Compiler
+**
+**     Copyright 2016 Freescale Semiconductor, Inc.
+**     Copyright 2016-2022 NXP
+**     All rights reserved.
+**
+**     SPDX-License-Identifier: BSD-3-Clause
+**
+**     http:                 www.nxp.com
+**     mail:                 [email protected]
+**
+** ###################################################################
+*/
+
+#define m_interrupts_start             0x20200000
+#define m_interrupts_size              0x00000400
+
+#define m_text_start                   0x20200400
+#define m_text_size                    0x0001FC00
+
+#define m_qacode_start                 0x1FFE0000
+#define m_qacode_size                  0x00020000
+
+#define m_data_start                   0x20000000
+#define m_data_size                    0x00020000
+
+#define m_ncache_start                 0x20280000
+#define m_ncache_size                  0x00040000
+
+#define m_data2_start                  0x20240000
+#define m_data2_size                   0x00040000
+
+/* Sizes */
+#if (defined(__stack_size__))
+  #define Stack_Size                   __stack_size__
+#else
+  #define Stack_Size                   0x0400
+#endif
+
+#if (defined(__heap_size__))
+  #define Heap_Size                    __heap_size__
+#else
+  #define Heap_Size                    0x0400
+#endif
+
+LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start {   ; load region size_region
+  VECTOR_ROM m_interrupts_start FIXED m_interrupts_size { ; load address = execution address
+    * (.isr_vector,+FIRST)
+  }
+  ER_m_text m_text_start FIXED m_text_size { ; load address = execution address
+    * (InRoot$$Sections)
+    .ANY (+RO)
+  }
+  VECTOR_RAM m_interrupts_start EMPTY 0 {
+  }
+#if (defined(__heap_noncacheable__))
+  RW_m_data m_data_start m_data_size-Stack_Size { ; RW data
+#else
+  RW_m_data m_data_start m_data_size-Stack_Size-Heap_Size { ; RW data
+#endif
+    .ANY (+RW +ZI)
+    * (DataQuickAccess)
+  }
+#if (!defined(__heap_noncacheable__))
+  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up
+  }
+#endif
+  ARM_LIB_STACK m_data_start+m_data_size EMPTY -Stack_Size { ; Stack region growing down
+  }
+  RW_m_ram_text m_qacode_start m_qacode_size { ;
+    * (CodeQuickAccess)
+  }
+#if (defined(__heap_noncacheable__))
+  RW_m_ncache m_ncache_start m_ncache_size - Heap_Size { ; ncache data
+#else
+  RW_m_ncache m_ncache_start m_ncache_size { ; ncache data
+#endif
+    * (NonCacheable.init)
+    * (*NonCacheable)
+  }
+#if (defined(__heap_noncacheable__))
+  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up
+  }
+  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache)-Heap_Size { ; Empty region added for MPU configuration
+#else
+  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache) { ; Empty region added for MPU configuration
+#endif
+  }
+}
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm4_ram.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm4_ram.scf
index bc49dcd557..4420cc8a0d 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm4_ram.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm4_ram.scf
@@ -1,109 +1,109 @@
-#!armclang --target=arm-arm-none-eabi -mcpu=cortex-m4 -E -x c

-/*

-** ###################################################################

-**     Processors:          MIMXRT1176AVM8A_cm4

-**                          MIMXRT1176CVM8A_cm4

-**                          MIMXRT1176DVMAA_cm4

-**

-**     Compiler:            Keil ARM C/C++ Compiler

-**     Reference manual:    IMXRT1170RM, Rev 1, 02/2021

-**     Version:             rev. 1.1, 2022-04-02

-**     Build:               b220402

-**

-**     Abstract:

-**         Linker file for the Keil ARM C/C++ Compiler

-**

-**     Copyright 2016 Freescale Semiconductor, Inc.

-**     Copyright 2016-2022 NXP

-**     All rights reserved.

-**

-**     SPDX-License-Identifier: BSD-3-Clause

-**

-**     http:                 www.nxp.com

-**     mail:                 [email protected]

-**

-** ###################################################################

-*/

-

-#define m_interrupts_start             0x1FFE0000

-#define m_interrupts_size              0x00000400

-

-#define m_text_start                   0x1FFE0400

-#define m_text_size                    0x0001FC00

-

-#define m_data_start                   0x20000000

-#define m_data_size                    0x00020000

-

-#define m_ncache_start                 0x20280000

-#define m_ncache_size                  0x00040000

-

-#define m_data2_start                  0x20240000

-#define m_data2_size                   0x00040000

-

-#if (defined(__use_shmem__))

-  #define m_rpmsg_sh_mem_start         0x202C0000

-  #define m_rpmsg_sh_mem_size          0x00002000

-#endif

-

-/* Sizes */

-#if (defined(__stack_size__))

-  #define Stack_Size                   __stack_size__

-#else

-  #define Stack_Size                   0x0400

-#endif

-

-#if (defined(__heap_size__))

-  #define Heap_Size                    __heap_size__

-#else

-  #define Heap_Size                    0x0400

-#endif

-

-LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start {   ; load region size_region

-  VECTOR_ROM m_interrupts_start FIXED m_interrupts_size { ; load address = execution address

-    * (.isr_vector,+FIRST)

-  }

-  ER_m_text m_text_start FIXED m_text_size { ; load address = execution address

-    * (InRoot$$Sections)

-    * (CodeQuickAccess)

-    .ANY (+RO)

-  }

-  VECTOR_RAM m_interrupts_start EMPTY 0 {

-  }

-#if (defined(__heap_noncacheable__))

-  RW_m_data m_data_start m_data_size-Stack_Size { ; RW data

-#else

-  RW_m_data m_data_start m_data_size-Stack_Size-Heap_Size { ; RW data

-#endif

-    .ANY (+RW +ZI)

-    * (DataQuickAccess)

-  }

-#if (!defined(__heap_noncacheable__))

-  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up

-  }

-#endif

-  ARM_LIB_STACK m_data_start+m_data_size EMPTY -Stack_Size { ; Stack region growing down

-  }

-#if (defined(__heap_noncacheable__))

-  RW_m_ncache m_ncache_start m_ncache_size - Heap_Size { ; ncache data

-#else

-  RW_m_ncache m_ncache_start m_ncache_size { ; ncache data

-#endif

-    * (NonCacheable.init)

-    * (*NonCacheable)

-  }

-#if (defined(__heap_noncacheable__))

-  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up

-  }

-  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache)-Heap_Size { ; Empty region added for MPU configuration

-#else

-  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache) { ; Empty region added for MPU configuration

-#endif

-  }

-#if (defined(__use_shmem__))

-  RPMSG_SH_MEM m_rpmsg_sh_mem_start UNINIT m_rpmsg_sh_mem_size { ; Shared memory used by RPMSG

-  * (rpmsg_sh_mem_section)

-  }

-  RPMSG_SH_MEM_unused +0 EMPTY m_rpmsg_sh_mem_size-ImageLength(RPMSG_SH_MEM) { ; Empty region added for MPU configuration

-  }

-#endif

-}

+#!armclang --target=arm-arm-none-eabi -mcpu=cortex-m4 -E -x c
+/*
+** ###################################################################
+**     Processors:          MIMXRT1176AVM8A_cm4
+**                          MIMXRT1176CVM8A_cm4
+**                          MIMXRT1176DVMAA_cm4
+**
+**     Compiler:            Keil ARM C/C++ Compiler
+**     Reference manual:    IMXRT1170RM, Rev 1, 02/2021
+**     Version:             rev. 1.1, 2022-04-02
+**     Build:               b220402
+**
+**     Abstract:
+**         Linker file for the Keil ARM C/C++ Compiler
+**
+**     Copyright 2016 Freescale Semiconductor, Inc.
+**     Copyright 2016-2022 NXP
+**     All rights reserved.
+**
+**     SPDX-License-Identifier: BSD-3-Clause
+**
+**     http:                 www.nxp.com
+**     mail:                 [email protected]
+**
+** ###################################################################
+*/
+
+#define m_interrupts_start             0x1FFE0000
+#define m_interrupts_size              0x00000400
+
+#define m_text_start                   0x1FFE0400
+#define m_text_size                    0x0001FC00
+
+#define m_data_start                   0x20000000
+#define m_data_size                    0x00020000
+
+#define m_ncache_start                 0x20280000
+#define m_ncache_size                  0x00040000
+
+#define m_data2_start                  0x20240000
+#define m_data2_size                   0x00040000
+
+#if (defined(__use_shmem__))
+  #define m_rpmsg_sh_mem_start         0x202C0000
+  #define m_rpmsg_sh_mem_size          0x00002000
+#endif
+
+/* Sizes */
+#if (defined(__stack_size__))
+  #define Stack_Size                   __stack_size__
+#else
+  #define Stack_Size                   0x0400
+#endif
+
+#if (defined(__heap_size__))
+  #define Heap_Size                    __heap_size__
+#else
+  #define Heap_Size                    0x0400
+#endif
+
+LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start {   ; load region size_region
+  VECTOR_ROM m_interrupts_start FIXED m_interrupts_size { ; load address = execution address
+    * (.isr_vector,+FIRST)
+  }
+  ER_m_text m_text_start FIXED m_text_size { ; load address = execution address
+    * (InRoot$$Sections)
+    * (CodeQuickAccess)
+    .ANY (+RO)
+  }
+  VECTOR_RAM m_interrupts_start EMPTY 0 {
+  }
+#if (defined(__heap_noncacheable__))
+  RW_m_data m_data_start m_data_size-Stack_Size { ; RW data
+#else
+  RW_m_data m_data_start m_data_size-Stack_Size-Heap_Size { ; RW data
+#endif
+    .ANY (+RW +ZI)
+    * (DataQuickAccess)
+  }
+#if (!defined(__heap_noncacheable__))
+  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up
+  }
+#endif
+  ARM_LIB_STACK m_data_start+m_data_size EMPTY -Stack_Size { ; Stack region growing down
+  }
+#if (defined(__heap_noncacheable__))
+  RW_m_ncache m_ncache_start m_ncache_size - Heap_Size { ; ncache data
+#else
+  RW_m_ncache m_ncache_start m_ncache_size { ; ncache data
+#endif
+    * (NonCacheable.init)
+    * (*NonCacheable)
+  }
+#if (defined(__heap_noncacheable__))
+  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up
+  }
+  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache)-Heap_Size { ; Empty region added for MPU configuration
+#else
+  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache) { ; Empty region added for MPU configuration
+#endif
+  }
+#if (defined(__use_shmem__))
+  RPMSG_SH_MEM m_rpmsg_sh_mem_start UNINIT m_rpmsg_sh_mem_size { ; Shared memory used by RPMSG
+  * (rpmsg_sh_mem_section)
+  }
+  RPMSG_SH_MEM_unused +0 EMPTY m_rpmsg_sh_mem_size-ImageLength(RPMSG_SH_MEM) { ; Empty region added for MPU configuration
+  }
+#endif
+}
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm4_sdram.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm4_sdram.scf
index 50dae96beb..c41f709e79 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm4_sdram.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm4_sdram.scf
@@ -1,104 +1,104 @@
-#!armclang --target=arm-arm-none-eabi -mcpu=cortex-m4 -E -x c

-/*

-** ###################################################################

-**     Processors:          MIMXRT1176AVM8A_cm4

-**                          MIMXRT1176CVM8A_cm4

-**                          MIMXRT1176DVMAA_cm4

-**

-**     Compiler:            Keil ARM C/C++ Compiler

-**     Reference manual:    IMXRT1170RM, Rev 1, 02/2021

-**     Version:             rev. 1.1, 2022-04-02

-**     Build:               b220402

-**

-**     Abstract:

-**         Linker file for the Keil ARM C/C++ Compiler

-**

-**     Copyright 2016 Freescale Semiconductor, Inc.

-**     Copyright 2016-2022 NXP

-**     All rights reserved.

-**

-**     SPDX-License-Identifier: BSD-3-Clause

-**

-**     http:                 www.nxp.com

-**     mail:                 [email protected]

-**

-** ###################################################################

-*/

-

-#define m_interrupts_start             0x1FFE0000

-#define m_interrupts_size              0x00000400

-

-#define m_text_start                   0x1FFE0400

-#define m_text_size                    0x0001FC00

-

-#define m_data_start                   0x80000000

-#define m_data_size                    0x03000000

-

-#define m_ncache_start                 0x83000000

-#define m_ncache_size                  0x01000000

-

-#define m_data2_start                  0x20000000

-#define m_data2_size                   0x00020000

-

-#define m_data3_start                  0x20240000

-#define m_data3_size                   0x00080000

-

-/* Sizes */

-#if (defined(__stack_size__))

-  #define Stack_Size                   __stack_size__

-#else

-  #define Stack_Size                   0x0400

-#endif

-

-#if (defined(__heap_size__))

-  #define Heap_Size                    __heap_size__

-#else

-  #define Heap_Size                    0x0400

-#endif

-

-LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start {   ; load region size_region

-  VECTOR_ROM m_interrupts_start FIXED m_interrupts_size { ; load address = execution address

-    * (.isr_vector,+FIRST)

-  }

-  ER_m_text m_text_start FIXED m_text_size { ; load address = execution address

-    * (InRoot$$Sections)

-    * (CodeQuickAccess)

-    .ANY (+RO)

-  }

-  VECTOR_RAM m_interrupts_start EMPTY 0 {

-  }

-#if (defined(__heap_noncacheable__))

-  RW_m_data m_data_start m_data_size-Stack_Size { ; RW data

-#else

-  RW_m_data m_data_start m_data_size-Stack_Size-Heap_Size { ; RW data

-#endif

-    .ANY (+RW +ZI)

-    *(*m_usb_dma_init_data)

-    *(*m_usb_dma_noninit_data)

-  }

-#if (!defined(__heap_noncacheable__))

-  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up

-  }

-#endif

-  ARM_LIB_STACK m_data_start+m_data_size EMPTY -Stack_Size { ; Stack region growing down

-  }

-  RW_m_data2 m_data2_start m_data2_size { ;

-    * (DataQuickAccess)

-  }

-#if (defined(__heap_noncacheable__))

-  RW_m_ncache m_ncache_start m_ncache_size - Heap_Size { ; ncache data

-#else

-  RW_m_ncache m_ncache_start m_ncache_size { ; ncache data

-#endif

-    * (NonCacheable.init)

-    * (*NonCacheable)

-  }

-#if (defined(__heap_noncacheable__))

-  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up

-  }

-  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache)-Heap_Size { ; Empty region added for MPU configuration

-#else

-  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache) { ; Empty region added for MPU configuration

-#endif

-  }

-}

+#!armclang --target=arm-arm-none-eabi -mcpu=cortex-m4 -E -x c
+/*
+** ###################################################################
+**     Processors:          MIMXRT1176AVM8A_cm4
+**                          MIMXRT1176CVM8A_cm4
+**                          MIMXRT1176DVMAA_cm4
+**
+**     Compiler:            Keil ARM C/C++ Compiler
+**     Reference manual:    IMXRT1170RM, Rev 1, 02/2021
+**     Version:             rev. 1.1, 2022-04-02
+**     Build:               b220402
+**
+**     Abstract:
+**         Linker file for the Keil ARM C/C++ Compiler
+**
+**     Copyright 2016 Freescale Semiconductor, Inc.
+**     Copyright 2016-2022 NXP
+**     All rights reserved.
+**
+**     SPDX-License-Identifier: BSD-3-Clause
+**
+**     http:                 www.nxp.com
+**     mail:                 [email protected]
+**
+** ###################################################################
+*/
+
+#define m_interrupts_start             0x1FFE0000
+#define m_interrupts_size              0x00000400
+
+#define m_text_start                   0x1FFE0400
+#define m_text_size                    0x0001FC00
+
+#define m_data_start                   0x80000000
+#define m_data_size                    0x03000000
+
+#define m_ncache_start                 0x83000000
+#define m_ncache_size                  0x01000000
+
+#define m_data2_start                  0x20000000
+#define m_data2_size                   0x00020000
+
+#define m_data3_start                  0x20240000
+#define m_data3_size                   0x00080000
+
+/* Sizes */
+#if (defined(__stack_size__))
+  #define Stack_Size                   __stack_size__
+#else
+  #define Stack_Size                   0x0400
+#endif
+
+#if (defined(__heap_size__))
+  #define Heap_Size                    __heap_size__
+#else
+  #define Heap_Size                    0x0400
+#endif
+
+LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start {   ; load region size_region
+  VECTOR_ROM m_interrupts_start FIXED m_interrupts_size { ; load address = execution address
+    * (.isr_vector,+FIRST)
+  }
+  ER_m_text m_text_start FIXED m_text_size { ; load address = execution address
+    * (InRoot$$Sections)
+    * (CodeQuickAccess)
+    .ANY (+RO)
+  }
+  VECTOR_RAM m_interrupts_start EMPTY 0 {
+  }
+#if (defined(__heap_noncacheable__))
+  RW_m_data m_data_start m_data_size-Stack_Size { ; RW data
+#else
+  RW_m_data m_data_start m_data_size-Stack_Size-Heap_Size { ; RW data
+#endif
+    .ANY (+RW +ZI)
+    *(*m_usb_dma_init_data)
+    *(*m_usb_dma_noninit_data)
+  }
+#if (!defined(__heap_noncacheable__))
+  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up
+  }
+#endif
+  ARM_LIB_STACK m_data_start+m_data_size EMPTY -Stack_Size { ; Stack region growing down
+  }
+  RW_m_data2 m_data2_start m_data2_size { ;
+    * (DataQuickAccess)
+  }
+#if (defined(__heap_noncacheable__))
+  RW_m_ncache m_ncache_start m_ncache_size - Heap_Size { ; ncache data
+#else
+  RW_m_ncache m_ncache_start m_ncache_size { ; ncache data
+#endif
+    * (NonCacheable.init)
+    * (*NonCacheable)
+  }
+#if (defined(__heap_noncacheable__))
+  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up
+  }
+  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache)-Heap_Size { ; Empty region added for MPU configuration
+#else
+  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache) { ; Empty region added for MPU configuration
+#endif
+  }
+}
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm4_sdram_txt.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm4_sdram_txt.scf
index c5f72636dd..6d9e809129 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm4_sdram_txt.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm4_sdram_txt.scf
@@ -1,109 +1,109 @@
-#!armclang --target=arm-arm-none-eabi -mcpu=cortex-m4 -E -x c

-/*

-** ###################################################################

-**     Processors:          MIMXRT1176AVM8A_cm4

-**                          MIMXRT1176CVM8A_cm4

-**                          MIMXRT1176DVMAA_cm4

-**

-**     Compiler:            Keil ARM C/C++ Compiler

-**     Reference manual:    IMXRT1170RM, Rev 1, 02/2021

-**     Version:             rev. 1.1, 2022-04-02

-**     Build:               b220402

-**

-**     Abstract:

-**         Linker file for the Keil ARM C/C++ Compiler

-**

-**     Copyright 2016 Freescale Semiconductor, Inc.

-**     Copyright 2016-2022 NXP

-**     All rights reserved.

-**

-**     SPDX-License-Identifier: BSD-3-Clause

-**

-**     http:                 www.nxp.com

-**     mail:                 [email protected]

-**

-** ###################################################################

-*/

-

-#define m_interrupts_start             0x80000000

-#define m_interrupts_size              0x00000400

-

-#define m_text_start                   0x80000400

-#define m_text_size                    0x001FFC00

-

-#define m_qacode_start                 0x1FFE0000

-#define m_qacode_size                  0x00020000

-

-#define m_data_start                   0x20240000

-#define m_data_size                    0x00080000

-

-#define m_data2_start                  0x20000000

-#define m_data2_size                   0x00020000

-

-#define m_data3_start                  0x80200000

-#define m_data3_size                   0x02E00000

-

-#define m_ncache_start                 0x83000000

-#define m_ncache_size                  0x01000000

-

-/* Sizes */

-#if (defined(__stack_size__))

-  #define Stack_Size                   __stack_size__

-#else

-  #define Stack_Size                   0x0400

-#endif

-

-#if (defined(__heap_size__))

-  #define Heap_Size                    __heap_size__

-#else

-  #define Heap_Size                    0x0400

-#endif

-

-LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start {   ; load region size_region

-  VECTOR_ROM m_interrupts_start FIXED m_interrupts_size { ; load address = execution address

-    * (.isr_vector,+FIRST)

-  }

-  ER_m_text m_text_start FIXED m_text_size { ; load address = execution address

-    * (InRoot$$Sections)

-    .ANY (+RO)

-  }

-  VECTOR_RAM m_interrupts_start EMPTY 0 {

-  }

-#if (defined(__heap_noncacheable__))

-  RW_m_data m_data_start m_data_size-Stack_Size { ; RW data

-#else

-  RW_m_data m_data_start m_data_size-Stack_Size-Heap_Size { ; RW data

-#endif

-    .ANY (+RW +ZI)

-    *(*m_usb_dma_init_data)

-    *(*m_usb_dma_noninit_data)

-  }

-#if (!defined(__heap_noncacheable__))

-  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up

-  }

-#endif

-  ARM_LIB_STACK m_data_start+m_data_size EMPTY -Stack_Size { ; Stack region growing down

-  }

-  RW_m_ram_text m_qacode_start m_qacode_size { ;

-    * (CodeQuickAccess)

-  }

-  RW_m_data2 m_data2_start m_data2_size { ;

-    * (DataQuickAccess)

-  }

-#if (defined(__heap_noncacheable__))

-  RW_m_ncache m_ncache_start m_ncache_size - Heap_Size { ; ncache data

-#else

-  RW_m_ncache m_ncache_start m_ncache_size { ; ncache data

-#endif

-    * (NonCacheable.init)

-    * (*NonCacheable)

-  }

-#if (defined(__heap_noncacheable__))

-  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up

-  }

-  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache)-Heap_Size { ; Empty region added for MPU configuration

-#else

-  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache) { ; Empty region added for MPU configuration

-#endif

-  }

-}

+#!armclang --target=arm-arm-none-eabi -mcpu=cortex-m4 -E -x c
+/*
+** ###################################################################
+**     Processors:          MIMXRT1176AVM8A_cm4
+**                          MIMXRT1176CVM8A_cm4
+**                          MIMXRT1176DVMAA_cm4
+**
+**     Compiler:            Keil ARM C/C++ Compiler
+**     Reference manual:    IMXRT1170RM, Rev 1, 02/2021
+**     Version:             rev. 1.1, 2022-04-02
+**     Build:               b220402
+**
+**     Abstract:
+**         Linker file for the Keil ARM C/C++ Compiler
+**
+**     Copyright 2016 Freescale Semiconductor, Inc.
+**     Copyright 2016-2022 NXP
+**     All rights reserved.
+**
+**     SPDX-License-Identifier: BSD-3-Clause
+**
+**     http:                 www.nxp.com
+**     mail:                 [email protected]
+**
+** ###################################################################
+*/
+
+#define m_interrupts_start             0x80000000
+#define m_interrupts_size              0x00000400
+
+#define m_text_start                   0x80000400
+#define m_text_size                    0x001FFC00
+
+#define m_qacode_start                 0x1FFE0000
+#define m_qacode_size                  0x00020000
+
+#define m_data_start                   0x20240000
+#define m_data_size                    0x00080000
+
+#define m_data2_start                  0x20000000
+#define m_data2_size                   0x00020000
+
+#define m_data3_start                  0x80200000
+#define m_data3_size                   0x02E00000
+
+#define m_ncache_start                 0x83000000
+#define m_ncache_size                  0x01000000
+
+/* Sizes */
+#if (defined(__stack_size__))
+  #define Stack_Size                   __stack_size__
+#else
+  #define Stack_Size                   0x0400
+#endif
+
+#if (defined(__heap_size__))
+  #define Heap_Size                    __heap_size__
+#else
+  #define Heap_Size                    0x0400
+#endif
+
+LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start {   ; load region size_region
+  VECTOR_ROM m_interrupts_start FIXED m_interrupts_size { ; load address = execution address
+    * (.isr_vector,+FIRST)
+  }
+  ER_m_text m_text_start FIXED m_text_size { ; load address = execution address
+    * (InRoot$$Sections)
+    .ANY (+RO)
+  }
+  VECTOR_RAM m_interrupts_start EMPTY 0 {
+  }
+#if (defined(__heap_noncacheable__))
+  RW_m_data m_data_start m_data_size-Stack_Size { ; RW data
+#else
+  RW_m_data m_data_start m_data_size-Stack_Size-Heap_Size { ; RW data
+#endif
+    .ANY (+RW +ZI)
+    *(*m_usb_dma_init_data)
+    *(*m_usb_dma_noninit_data)
+  }
+#if (!defined(__heap_noncacheable__))
+  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up
+  }
+#endif
+  ARM_LIB_STACK m_data_start+m_data_size EMPTY -Stack_Size { ; Stack region growing down
+  }
+  RW_m_ram_text m_qacode_start m_qacode_size { ;
+    * (CodeQuickAccess)
+  }
+  RW_m_data2 m_data2_start m_data2_size { ;
+    * (DataQuickAccess)
+  }
+#if (defined(__heap_noncacheable__))
+  RW_m_ncache m_ncache_start m_ncache_size - Heap_Size { ; ncache data
+#else
+  RW_m_ncache m_ncache_start m_ncache_size { ; ncache data
+#endif
+    * (NonCacheable.init)
+    * (*NonCacheable)
+  }
+#if (defined(__heap_noncacheable__))
+  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up
+  }
+  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache)-Heap_Size { ; Empty region added for MPU configuration
+#else
+  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache) { ; Empty region added for MPU configuration
+#endif
+  }
+}
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm7_flexspi_nor.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm7_flexspi_nor.scf
index 5270835cdf..950bc9b555 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm7_flexspi_nor.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm7_flexspi_nor.scf
@@ -1,144 +1,144 @@
-#!armclang --target=arm-arm-none-eabi -mcpu=cortex-m7 -E -x c

-/*

-** ###################################################################

-**     Processors:          MIMXRT1176AVM8A_cm7

-**                          MIMXRT1176CVM8A_cm7

-**                          MIMXRT1176DVMAA_cm7

-**

-**     Compiler:            Keil ARM C/C++ Compiler

-**     Reference manual:    IMXRT1170RM, Rev 1, 02/2021

-**     Version:             rev. 1.1, 2022-04-02

-**     Build:               b220402

-**

-**     Abstract:

-**         Linker file for the Keil ARM C/C++ Compiler

-**

-**     Copyright 2016 Freescale Semiconductor, Inc.

-**     Copyright 2016-2022 NXP

-**     All rights reserved.

-**

-**     SPDX-License-Identifier: BSD-3-Clause

-**

-**     http:                 www.nxp.com

-**     mail:                 [email protected]

-**

-** ###################################################################

-*/

-

-#if (defined(__ram_vector_table__))

-  #define __ram_vector_table_size__    0x00000400

-#else

-  #define __ram_vector_table_size__    0x00000000

-#endif

-

-#define m_flash_config_start           0x30000400

-#define m_flash_config_size            0x00000C00

-

-#define m_ivt_start                    0x30001000

-#define m_ivt_size                     0x00001000

-

-#define m_interrupts_start             0x30002000

-#define m_interrupts_size              0x00000400

-

-#define m_text_start                   0x30002400

-#define m_text_size                    0x00FBDC00

-

-#define m_qacode_start                 0x00000000

-#define m_qacode_size                  0x00040000

-

-#define m_interrupts_ram_start         0x20000000

-#define m_interrupts_ram_size          __ram_vector_table_size__

-

-#define m_data_start                   (m_interrupts_ram_start + m_interrupts_ram_size)

-#define m_data_size                    (0x00040000 - m_interrupts_ram_size)

-

-#if (defined(__use_shmem__))

-  #define m_rpmsg_sh_mem_start         0x202C0000

-  #define m_rpmsg_sh_mem_size          0x00002000

-

-  #define m_data2_start                0x202C2000

-  #define m_data2_size                 0x0007E000

-#else

-  #define m_data2_start                0x202C0000

-  #define m_data2_size                 0x00080000

-#endif

-

-#define m_core1_image_start            0x30FC0000

-#define m_core1_image_size             0x00040000

-

-/* Sizes */

-#if (defined(__stack_size__))

-  #define Stack_Size                   __stack_size__

-#else

-  #define Stack_Size                   0x0400

-#endif

-

-#if (defined(__heap_size__))

-  #define Heap_Size                    __heap_size__

-#else

-  #define Heap_Size                    0x0400

-#endif

-

-#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)

-LR_m_text m_flash_config_start m_text_start+m_text_size-m_flash_config_start {   ; load region size_region

-  RW_m_config_text m_flash_config_start FIXED m_flash_config_size { ; load address = execution address

-    * (.boot_hdr.conf, +FIRST)

-  }

-

-  RW_m_ivt_text m_ivt_start FIXED m_ivt_size { ; load address = execution address

-    * (.boot_hdr.ivt, +FIRST)

-    * (.boot_hdr.boot_data)

-    * (.boot_hdr.dcd_data)

-  }

-#else

-LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start {   ; load region size_region

-#endif

-  VECTOR_ROM m_interrupts_start FIXED m_interrupts_size { ; load address = execution address

-    * (.isr_vector,+FIRST)

-  }

-  ER_m_text m_text_start FIXED m_text_size { ; load address = execution address

-    * (InRoot$$Sections)

-    .ANY (+RO)

-  }

-#if (defined(__ram_vector_table__))

-  VECTOR_RAM m_interrupts_ram_start EMPTY m_interrupts_ram_size {

-  }

-#else

-  VECTOR_RAM m_interrupts_start EMPTY 0 {

-  }

-#endif

-  RW_m_data m_data_start m_data_size-Stack_Size-Heap_Size { ; RW data

-    .ANY (+RW +ZI)

-    * (RamFunction)

-    * (NonCacheable.init)

-    * (*NonCacheable)

-    * (DataQuickAccess)

-  }

-  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up

-  }

-  ARM_LIB_STACK m_data_start+m_data_size EMPTY -Stack_Size { ; Stack region growing down

-  }

-#if (defined(__use_shmem__))

-  RW_m_ncache m_rpmsg_sh_mem_start EMPTY 0 {

-  }

-  RPMSG_SH_MEM m_rpmsg_sh_mem_start UNINIT m_rpmsg_sh_mem_size { ; Shared memory used by RPMSG

-    * (rpmsg_sh_mem_section)

-  }

-  RW_m_ncache_unused m_rpmsg_sh_mem_start+m_rpmsg_sh_mem_size EMPTY 0 { ; Empty region added for MPU configuration

-  }

-#else

-  RW_m_ram_text m_qacode_start m_qacode_size { ;

-    * (CodeQuickAccess)

-  }

-  RW_m_ncache m_data2_start EMPTY 0 {

-  }

-  RW_m_ncache_unused +0 EMPTY m_data2_size-ImageLength(RW_m_ncache) { ; Empty region added for MPU configuration

-  }

-#endif

-}

-

-LR_CORE1_IMAGE m_core1_image_start {

-  CORE1_REGION m_core1_image_start m_core1_image_size {

-    *(*core1_code)

-  }

-}

+#!armclang --target=arm-arm-none-eabi -mcpu=cortex-m7 -E -x c
+/*
+** ###################################################################
+**     Processors:          MIMXRT1176AVM8A_cm7
+**                          MIMXRT1176CVM8A_cm7
+**                          MIMXRT1176DVMAA_cm7
+**
+**     Compiler:            Keil ARM C/C++ Compiler
+**     Reference manual:    IMXRT1170RM, Rev 1, 02/2021
+**     Version:             rev. 1.1, 2022-04-02
+**     Build:               b220402
+**
+**     Abstract:
+**         Linker file for the Keil ARM C/C++ Compiler
+**
+**     Copyright 2016 Freescale Semiconductor, Inc.
+**     Copyright 2016-2022 NXP
+**     All rights reserved.
+**
+**     SPDX-License-Identifier: BSD-3-Clause
+**
+**     http:                 www.nxp.com
+**     mail:                 [email protected]
+**
+** ###################################################################
+*/
+
+#if (defined(__ram_vector_table__))
+  #define __ram_vector_table_size__    0x00000400
+#else
+  #define __ram_vector_table_size__    0x00000000
+#endif
+
+#define m_flash_config_start           0x30000400
+#define m_flash_config_size            0x00000C00
+
+#define m_ivt_start                    0x30001000
+#define m_ivt_size                     0x00001000
+
+#define m_interrupts_start             0x30002000
+#define m_interrupts_size              0x00000400
+
+#define m_text_start                   0x30002400
+#define m_text_size                    0x00FBDC00
+
+#define m_qacode_start                 0x00000000
+#define m_qacode_size                  0x00040000
+
+#define m_interrupts_ram_start         0x20000000
+#define m_interrupts_ram_size          __ram_vector_table_size__
+
+#define m_data_start                   (m_interrupts_ram_start + m_interrupts_ram_size)
+#define m_data_size                    (0x00040000 - m_interrupts_ram_size)
+
+#if (defined(__use_shmem__))
+  #define m_rpmsg_sh_mem_start         0x202C0000
+  #define m_rpmsg_sh_mem_size          0x00002000
+
+  #define m_data2_start                0x202C2000
+  #define m_data2_size                 0x0007E000
+#else
+  #define m_data2_start                0x202C0000
+  #define m_data2_size                 0x00080000
+#endif
+
+#define m_core1_image_start            0x30FC0000
+#define m_core1_image_size             0x00040000
+
+/* Sizes */
+#if (defined(__stack_size__))
+  #define Stack_Size                   __stack_size__
+#else
+  #define Stack_Size                   0x0400
+#endif
+
+#if (defined(__heap_size__))
+  #define Heap_Size                    __heap_size__
+#else
+  #define Heap_Size                    0x0400
+#endif
+
+#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
+LR_m_text m_flash_config_start m_text_start+m_text_size-m_flash_config_start {   ; load region size_region
+  RW_m_config_text m_flash_config_start FIXED m_flash_config_size { ; load address = execution address
+    * (.boot_hdr.conf, +FIRST)
+  }
+
+  RW_m_ivt_text m_ivt_start FIXED m_ivt_size { ; load address = execution address
+    * (.boot_hdr.ivt, +FIRST)
+    * (.boot_hdr.boot_data)
+    * (.boot_hdr.dcd_data)
+  }
+#else
+LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start {   ; load region size_region
+#endif
+  VECTOR_ROM m_interrupts_start FIXED m_interrupts_size { ; load address = execution address
+    * (.isr_vector,+FIRST)
+  }
+  ER_m_text m_text_start FIXED m_text_size { ; load address = execution address
+    * (InRoot$$Sections)
+    .ANY (+RO)
+  }
+#if (defined(__ram_vector_table__))
+  VECTOR_RAM m_interrupts_ram_start EMPTY m_interrupts_ram_size {
+  }
+#else
+  VECTOR_RAM m_interrupts_start EMPTY 0 {
+  }
+#endif
+  RW_m_data m_data_start m_data_size-Stack_Size-Heap_Size { ; RW data
+    .ANY (+RW +ZI)
+    * (RamFunction)
+    * (NonCacheable.init)
+    * (*NonCacheable)
+    * (DataQuickAccess)
+  }
+  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up
+  }
+  ARM_LIB_STACK m_data_start+m_data_size EMPTY -Stack_Size { ; Stack region growing down
+  }
+#if (defined(__use_shmem__))
+  RW_m_ncache m_rpmsg_sh_mem_start EMPTY 0 {
+  }
+  RPMSG_SH_MEM m_rpmsg_sh_mem_start UNINIT m_rpmsg_sh_mem_size { ; Shared memory used by RPMSG
+    * (rpmsg_sh_mem_section)
+  }
+  RW_m_ncache_unused m_rpmsg_sh_mem_start+m_rpmsg_sh_mem_size EMPTY 0 { ; Empty region added for MPU configuration
+  }
+#else
+  RW_m_ram_text m_qacode_start m_qacode_size { ;
+    * (CodeQuickAccess)
+  }
+  RW_m_ncache m_data2_start EMPTY 0 {
+  }
+  RW_m_ncache_unused +0 EMPTY m_data2_size-ImageLength(RW_m_ncache) { ; Empty region added for MPU configuration
+  }
+#endif
+}
+
+LR_CORE1_IMAGE m_core1_image_start {
+  CORE1_REGION m_core1_image_start m_core1_image_size {
+    *(*core1_code)
+  }
+}
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm7_flexspi_nor_sdram.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm7_flexspi_nor_sdram.scf
index ef54e7fe22..00993f543d 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm7_flexspi_nor_sdram.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm7_flexspi_nor_sdram.scf
@@ -1,164 +1,164 @@
-#!armclang --target=arm-arm-none-eabi -mcpu=cortex-m7 -E -x c

-/*

-** ###################################################################

-**     Processors:          MIMXRT1176AVM8A_cm7

-**                          MIMXRT1176CVM8A_cm7

-**                          MIMXRT1176DVMAA_cm7

-**

-**     Compiler:            Keil ARM C/C++ Compiler

-**     Reference manual:    IMXRT1170RM, Rev 1, 02/2021

-**     Version:             rev. 1.1, 2022-04-02

-**     Build:               b220402

-**

-**     Abstract:

-**         Linker file for the Keil ARM C/C++ Compiler

-**

-**     Copyright 2016 Freescale Semiconductor, Inc.

-**     Copyright 2016-2022 NXP

-**     All rights reserved.

-**

-**     SPDX-License-Identifier: BSD-3-Clause

-**

-**     http:                 www.nxp.com

-**     mail:                 [email protected]

-**

-** ###################################################################

-*/

-

-#if (defined(__ram_vector_table__))

-  #define __ram_vector_table_size__    0x00000400

-#else

-  #define __ram_vector_table_size__    0x00000000

-#endif

-

-#define m_flash_config_start           0x30000400

-#define m_flash_config_size            0x00000C00

-

-#define m_ivt_start                    0x30001000

-#define m_ivt_size                     0x00000020

-

-#define m_boot_data_start              0x30001020

-#define m_boot_data_size               0x00000010

-

-#define m_dcd_data_start               0x30001030

-#define m_dcd_data_size                0x000006E8

-

-#define m_xmcd_data_start              0x30001040

-#define m_xmcd_data_size               0x00000204

-

-#define m_interrupts_start             0x30002000

-#define m_interrupts_size              0x00000400

-

-#define m_text_start                   0x30002400

-#define m_text_size                    0x00FFDC00

-

-#define m_qacode_start                 0x00000000

-#define m_qacode_size                  0x00040000

-

-#define m_interrupts_ram_start         0x80000000

-#define m_interrupts_ram_size          __ram_vector_table_size__

-

-#define  m_data_start                  (m_interrupts_ram_start + m_interrupts_ram_size)

-#define  m_data_size                   (0x03000000 - m_interrupts_ram_size)

-

-#define m_data2_start                  0x20000000

-#define m_data2_size                   0x00040000

-

-#define m_data3_start                  0x202C0000

-#define m_data3_size                   0x00080000

-

-#define m_ncache_start                 0x83000000

-#define m_ncache_size                  0x01000000

-

-/* Sizes */

-#if (defined(__stack_size__))

-  #define Stack_Size                   __stack_size__

-#else

-  #define Stack_Size                   0x0400

-#endif

-

-#if (defined(__heap_size__))

-  #define Heap_Size                    __heap_size__

-#else

-  #define Heap_Size                    0x0400

-#endif

-

-#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)

-LR_m_text m_flash_config_start m_text_start+m_text_size-m_flash_config_start {   ; load region size_region

-  RW_m_config_text m_flash_config_start FIXED m_flash_config_size { ; load address = execution address

-    * (.boot_hdr.conf, +FIRST)

-  }

-

-  RW_m_ivt_text m_ivt_start FIXED m_ivt_size { ; load address = execution address

-    * (.boot_hdr.ivt, +FIRST)

-  }

-

-  RW_m_boot_data_text m_boot_data_start FIXED m_boot_data_size { ; load address = execution address

-    * (.boot_hdr.boot_data, +FIRST)

-  }

-

-#if defined(XIP_BOOT_HEADER_DCD_ENABLE) && (XIP_BOOT_HEADER_DCD_ENABLE == 1)

-  RW_m_dcd_data_text m_dcd_data_start FIXED m_dcd_data_size { ; load address = execution address

-    * (.boot_hdr.dcd_data, +FIRST)

-  }

-#elif defined(XIP_BOOT_HEADER_XMCD_ENABLE) && (XIP_BOOT_HEADER_XMCD_ENABLE == 1)

-  RW_m_xmcd_data_text m_xmcd_data_start FIXED m_xmcd_data_size { ; load address = execution address

-    * (.boot_hdr.xmcd_data, +FIRST)

-  }

-#endif

-#else

-LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start {   ; load region size_region

-#endif

-  VECTOR_ROM m_interrupts_start FIXED m_interrupts_size { ; load address = execution address

-    * (.isr_vector,+FIRST)

-  }

-  ER_m_text m_text_start FIXED m_text_size { ; load address = execution address

-    * (InRoot$$Sections)

-    .ANY (+RO)

-  }

-#if (defined(__ram_vector_table__))

-  VECTOR_RAM m_interrupts_ram_start EMPTY m_interrupts_ram_size {

-  }

-#else

-  VECTOR_RAM m_interrupts_start EMPTY 0 {

-  }

-#endif

-  RW_m_data2 m_data2_start m_data2_size {

-    * (RamFunction)

-    * (DataQuickAccess)

-  }

-#if (defined(__heap_noncacheable__))

-  RW_m_data m_data_start m_data_size-Stack_Size { ; RW data

-#else

-  RW_m_data m_data_start m_data_size-Stack_Size-Heap_Size { ; RW data

-#endif

-    .ANY (+RW +ZI)

-    *(*m_usb_dma_init_data)

-    *(*m_usb_dma_noninit_data)

-  }

-#if (!defined(__heap_noncacheable__))

-  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up

-  }

-#endif

-  ARM_LIB_STACK m_data_start+m_data_size EMPTY -Stack_Size { ; Stack region growing down

-  }

-  RW_m_ram_text m_qacode_start m_qacode_size { ;

-    * (CodeQuickAccess)

-  }

-#if (defined(__heap_noncacheable__))

-  RW_m_ncache m_ncache_start m_ncache_size - Heap_Size { ; ncache data

-#else

-  RW_m_ncache m_ncache_start m_ncache_size { ; ncache data

-#endif

-    * (NonCacheable.init)

-    * (*NonCacheable)

-  }

-#if (defined(__heap_noncacheable__))

-  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up

-  }

-  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache)-Heap_Size { ; Empty region added for MPU configuration

-#else

-  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache) { ; Empty region added for MPU configuration

-#endif

-  }

-}

+#!armclang --target=arm-arm-none-eabi -mcpu=cortex-m7 -E -x c
+/*
+** ###################################################################
+**     Processors:          MIMXRT1176AVM8A_cm7
+**                          MIMXRT1176CVM8A_cm7
+**                          MIMXRT1176DVMAA_cm7
+**
+**     Compiler:            Keil ARM C/C++ Compiler
+**     Reference manual:    IMXRT1170RM, Rev 1, 02/2021
+**     Version:             rev. 1.1, 2022-04-02
+**     Build:               b220402
+**
+**     Abstract:
+**         Linker file for the Keil ARM C/C++ Compiler
+**
+**     Copyright 2016 Freescale Semiconductor, Inc.
+**     Copyright 2016-2022 NXP
+**     All rights reserved.
+**
+**     SPDX-License-Identifier: BSD-3-Clause
+**
+**     http:                 www.nxp.com
+**     mail:                 [email protected]
+**
+** ###################################################################
+*/
+
+#if (defined(__ram_vector_table__))
+  #define __ram_vector_table_size__    0x00000400
+#else
+  #define __ram_vector_table_size__    0x00000000
+#endif
+
+#define m_flash_config_start           0x30000400
+#define m_flash_config_size            0x00000C00
+
+#define m_ivt_start                    0x30001000
+#define m_ivt_size                     0x00000020
+
+#define m_boot_data_start              0x30001020
+#define m_boot_data_size               0x00000010
+
+#define m_dcd_data_start               0x30001030
+#define m_dcd_data_size                0x000006E8
+
+#define m_xmcd_data_start              0x30001040
+#define m_xmcd_data_size               0x00000204
+
+#define m_interrupts_start             0x30002000
+#define m_interrupts_size              0x00000400
+
+#define m_text_start                   0x30002400
+#define m_text_size                    0x00FFDC00
+
+#define m_qacode_start                 0x00000000
+#define m_qacode_size                  0x00040000
+
+#define m_interrupts_ram_start         0x80000000
+#define m_interrupts_ram_size          __ram_vector_table_size__
+
+#define  m_data_start                  (m_interrupts_ram_start + m_interrupts_ram_size)
+#define  m_data_size                   (0x03000000 - m_interrupts_ram_size)
+
+#define m_data2_start                  0x20000000
+#define m_data2_size                   0x00040000
+
+#define m_data3_start                  0x202C0000
+#define m_data3_size                   0x00080000
+
+#define m_ncache_start                 0x83000000
+#define m_ncache_size                  0x01000000
+
+/* Sizes */
+#if (defined(__stack_size__))
+  #define Stack_Size                   __stack_size__
+#else
+  #define Stack_Size                   0x0400
+#endif
+
+#if (defined(__heap_size__))
+  #define Heap_Size                    __heap_size__
+#else
+  #define Heap_Size                    0x0400
+#endif
+
+#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
+LR_m_text m_flash_config_start m_text_start+m_text_size-m_flash_config_start {   ; load region size_region
+  RW_m_config_text m_flash_config_start FIXED m_flash_config_size { ; load address = execution address
+    * (.boot_hdr.conf, +FIRST)
+  }
+
+  RW_m_ivt_text m_ivt_start FIXED m_ivt_size { ; load address = execution address
+    * (.boot_hdr.ivt, +FIRST)
+  }
+
+  RW_m_boot_data_text m_boot_data_start FIXED m_boot_data_size { ; load address = execution address
+    * (.boot_hdr.boot_data, +FIRST)
+  }
+
+#if defined(XIP_BOOT_HEADER_DCD_ENABLE) && (XIP_BOOT_HEADER_DCD_ENABLE == 1)
+  RW_m_dcd_data_text m_dcd_data_start FIXED m_dcd_data_size { ; load address = execution address
+    * (.boot_hdr.dcd_data, +FIRST)
+  }
+#elif defined(XIP_BOOT_HEADER_XMCD_ENABLE) && (XIP_BOOT_HEADER_XMCD_ENABLE == 1)
+  RW_m_xmcd_data_text m_xmcd_data_start FIXED m_xmcd_data_size { ; load address = execution address
+    * (.boot_hdr.xmcd_data, +FIRST)
+  }
+#endif
+#else
+LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start {   ; load region size_region
+#endif
+  VECTOR_ROM m_interrupts_start FIXED m_interrupts_size { ; load address = execution address
+    * (.isr_vector,+FIRST)
+  }
+  ER_m_text m_text_start FIXED m_text_size { ; load address = execution address
+    * (InRoot$$Sections)
+    .ANY (+RO)
+  }
+#if (defined(__ram_vector_table__))
+  VECTOR_RAM m_interrupts_ram_start EMPTY m_interrupts_ram_size {
+  }
+#else
+  VECTOR_RAM m_interrupts_start EMPTY 0 {
+  }
+#endif
+  RW_m_data2 m_data2_start m_data2_size {
+    * (RamFunction)
+    * (DataQuickAccess)
+  }
+#if (defined(__heap_noncacheable__))
+  RW_m_data m_data_start m_data_size-Stack_Size { ; RW data
+#else
+  RW_m_data m_data_start m_data_size-Stack_Size-Heap_Size { ; RW data
+#endif
+    .ANY (+RW +ZI)
+    *(*m_usb_dma_init_data)
+    *(*m_usb_dma_noninit_data)
+  }
+#if (!defined(__heap_noncacheable__))
+  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up
+  }
+#endif
+  ARM_LIB_STACK m_data_start+m_data_size EMPTY -Stack_Size { ; Stack region growing down
+  }
+  RW_m_ram_text m_qacode_start m_qacode_size { ;
+    * (CodeQuickAccess)
+  }
+#if (defined(__heap_noncacheable__))
+  RW_m_ncache m_ncache_start m_ncache_size - Heap_Size { ; ncache data
+#else
+  RW_m_ncache m_ncache_start m_ncache_size { ; ncache data
+#endif
+    * (NonCacheable.init)
+    * (*NonCacheable)
+  }
+#if (defined(__heap_noncacheable__))
+  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up
+  }
+  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache)-Heap_Size { ; Empty region added for MPU configuration
+#else
+  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache) { ; Empty region added for MPU configuration
+#endif
+  }
+}
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm7_ram.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm7_ram.scf
index 06065c47a7..ded7241e50 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm7_ram.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm7_ram.scf
@@ -1,78 +1,78 @@
-#!armclang --target=arm-arm-none-eabi -mcpu=cortex-m7 -E -x c

-/*

-** ###################################################################

-**     Processors:          MIMXRT1176AVM8A_cm7

-**                          MIMXRT1176CVM8A_cm7

-**                          MIMXRT1176DVMAA_cm7

-**

-**     Compiler:            Keil ARM C/C++ Compiler

-**     Reference manual:    IMXRT1170RM, Rev 1, 02/2021

-**     Version:             rev. 1.1, 2022-04-02

-**     Build:               b220402

-**

-**     Abstract:

-**         Linker file for the Keil ARM C/C++ Compiler

-**

-**     Copyright 2016 Freescale Semiconductor, Inc.

-**     Copyright 2016-2022 NXP

-**     All rights reserved.

-**

-**     SPDX-License-Identifier: BSD-3-Clause

-**

-**     http:                 www.nxp.com

-**     mail:                 [email protected]

-**

-** ###################################################################

-*/

-

-#define m_interrupts_start             0x00000000

-#define m_interrupts_size              0x00000400

-

-#define m_text_start                   0x00000400

-#define m_text_size                    0x0003FC00

-

-#define m_data_start                   0x20000000

-#define m_data_size                    0x00040000

-

-#define m_data2_start                  0x202C0000

-#define m_data2_size                   0x00080000

-

-/* Sizes */

-#if (defined(__stack_size__))

-  #define Stack_Size                   __stack_size__

-#else

-  #define Stack_Size                   0x0400

-#endif

-

-#if (defined(__heap_size__))

-  #define Heap_Size                    __heap_size__

-#else

-  #define Heap_Size                    0x0400

-#endif

-

-LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start {   ; load region size_region

-  VECTOR_ROM m_interrupts_start FIXED m_interrupts_size { ; load address = execution address

-    * (.isr_vector,+FIRST)

-  }

-  ER_m_text m_text_start FIXED m_text_size { ; load address = execution address

-    * (InRoot$$Sections)

-    * (CodeQuickAccess)

-    .ANY (+RO)

-  }

-  VECTOR_RAM m_interrupts_start EMPTY 0 {

-  }

-  RW_m_data m_data_start m_data_size-Stack_Size-Heap_Size { ; RW data

-    .ANY (+RW +ZI)

-    * (NonCacheable.init)

-    * (*NonCacheable)

-    * (DataQuickAccess)

-  }

-  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up

-  }

-  ARM_LIB_STACK m_data_start+m_data_size EMPTY -Stack_Size { ; Stack region growing down

-  }

-  RW_m_ncache m_data2_start EMPTY 0 {

-  }

-  RW_m_ncache_unused +0 EMPTY m_data2_size-ImageLength(RW_m_ncache) { ; Empty region added for MPU configuration

-  }

-}

+#!armclang --target=arm-arm-none-eabi -mcpu=cortex-m7 -E -x c
+/*
+** ###################################################################
+**     Processors:          MIMXRT1176AVM8A_cm7
+**                          MIMXRT1176CVM8A_cm7
+**                          MIMXRT1176DVMAA_cm7
+**
+**     Compiler:            Keil ARM C/C++ Compiler
+**     Reference manual:    IMXRT1170RM, Rev 1, 02/2021
+**     Version:             rev. 1.1, 2022-04-02
+**     Build:               b220402
+**
+**     Abstract:
+**         Linker file for the Keil ARM C/C++ Compiler
+**
+**     Copyright 2016 Freescale Semiconductor, Inc.
+**     Copyright 2016-2022 NXP
+**     All rights reserved.
+**
+**     SPDX-License-Identifier: BSD-3-Clause
+**
+**     http:                 www.nxp.com
+**     mail:                 [email protected]
+**
+** ###################################################################
+*/
+
+#define m_interrupts_start             0x00000000
+#define m_interrupts_size              0x00000400
+
+#define m_text_start                   0x00000400
+#define m_text_size                    0x0003FC00
+
+#define m_data_start                   0x20000000
+#define m_data_size                    0x00040000
+
+#define m_data2_start                  0x202C0000
+#define m_data2_size                   0x00080000
+
+/* Sizes */
+#if (defined(__stack_size__))
+  #define Stack_Size                   __stack_size__
+#else
+  #define Stack_Size                   0x0400
+#endif
+
+#if (defined(__heap_size__))
+  #define Heap_Size                    __heap_size__
+#else
+  #define Heap_Size                    0x0400
+#endif
+
+LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start {   ; load region size_region
+  VECTOR_ROM m_interrupts_start FIXED m_interrupts_size { ; load address = execution address
+    * (.isr_vector,+FIRST)
+  }
+  ER_m_text m_text_start FIXED m_text_size { ; load address = execution address
+    * (InRoot$$Sections)
+    * (CodeQuickAccess)
+    .ANY (+RO)
+  }
+  VECTOR_RAM m_interrupts_start EMPTY 0 {
+  }
+  RW_m_data m_data_start m_data_size-Stack_Size-Heap_Size { ; RW data
+    .ANY (+RW +ZI)
+    * (NonCacheable.init)
+    * (*NonCacheable)
+    * (DataQuickAccess)
+  }
+  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up
+  }
+  ARM_LIB_STACK m_data_start+m_data_size EMPTY -Stack_Size { ; Stack region growing down
+  }
+  RW_m_ncache m_data2_start EMPTY 0 {
+  }
+  RW_m_ncache_unused +0 EMPTY m_data2_size-ImageLength(RW_m_ncache) { ; Empty region added for MPU configuration
+  }
+}
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm7_sdram.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm7_sdram.scf
index c0a3c8d3c6..24e95fa646 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm7_sdram.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm7_sdram.scf
@@ -1,104 +1,104 @@
-#!armclang --target=arm-arm-none-eabi -mcpu=cortex-m7 -E -x c

-/*

-** ###################################################################

-**     Processors:          MIMXRT1176AVM8A_cm7

-**                          MIMXRT1176CVM8A_cm7

-**                          MIMXRT1176DVMAA_cm7

-**

-**     Compiler:            Keil ARM C/C++ Compiler

-**     Reference manual:    IMXRT1170RM, Rev 1, 02/2021

-**     Version:             rev. 1.1, 2022-04-02

-**     Build:               b220402

-**

-**     Abstract:

-**         Linker file for the Keil ARM C/C++ Compiler

-**

-**     Copyright 2016 Freescale Semiconductor, Inc.

-**     Copyright 2016-2022 NXP

-**     All rights reserved.

-**

-**     SPDX-License-Identifier: BSD-3-Clause

-**

-**     http:                 www.nxp.com

-**     mail:                 [email protected]

-**

-** ###################################################################

-*/

-

-#define m_interrupts_start             0x00000000

-#define m_interrupts_size              0x00000400

-

-#define m_text_start                   0x00000400

-#define m_text_size                    0x0003FC00

-

-#define m_data_start                   0x80000000

-#define m_data_size                    0x03000000

-

-#define m_data2_start                  0x20000000

-#define m_data2_size                   0x00040000

-

-#define m_data3_start                  0x202C0000

-#define m_data3_size                   0x00080000

-

-#define m_ncache_start                 0x83000000

-#define m_ncache_size                  0x01000000

-

-/* Sizes */

-#if (defined(__stack_size__))

-  #define Stack_Size                   __stack_size__

-#else

-  #define Stack_Size                   0x0400

-#endif

-

-#if (defined(__heap_size__))

-  #define Heap_Size                    __heap_size__

-#else

-  #define Heap_Size                    0x0400

-#endif

-

-LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start {   ; load region size_region

-  VECTOR_ROM m_interrupts_start FIXED m_interrupts_size { ; load address = execution address

-    * (.isr_vector,+FIRST)

-  }

-  ER_m_text m_text_start FIXED m_text_size { ; load address = execution address

-    * (InRoot$$Sections)

-    * (CodeQuickAccess)

-    .ANY (+RO)

-  }

-  VECTOR_RAM m_interrupts_start EMPTY 0 {

-  }

-#if (defined(__heap_noncacheable__))

-  RW_m_data m_data_start m_data_size-Stack_Size { ; RW data

-#else

-  RW_m_data m_data_start m_data_size-Stack_Size-Heap_Size { ; RW data

-#endif

-    .ANY (+RW +ZI)

-    *(*m_usb_dma_init_data)

-    *(*m_usb_dma_noninit_data)

-  }

-#if (!defined(__heap_noncacheable__))

-  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up

-  }

-#endif

-  ARM_LIB_STACK m_data_start+m_data_size EMPTY -Stack_Size { ; Stack region growing down

-  }

-  RW_m_data2 m_data2_start m_data2_size { ;

-    * (DataQuickAccess)

-  }

-#if (defined(__heap_noncacheable__))

-  RW_m_ncache m_ncache_start m_ncache_size - Heap_Size { ; ncache data

-#else

-  RW_m_ncache m_ncache_start m_ncache_size { ; ncache data

-#endif

-    * (NonCacheable.init)

-    * (*NonCacheable)

-  }

-#if (defined(__heap_noncacheable__))

-  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up

-  }

-  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache)-Heap_Size { ; Empty region added for MPU configuration

-#else

-  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache) { ; Empty region added for MPU configuration

-#endif

-  }

-}

+#!armclang --target=arm-arm-none-eabi -mcpu=cortex-m7 -E -x c
+/*
+** ###################################################################
+**     Processors:          MIMXRT1176AVM8A_cm7
+**                          MIMXRT1176CVM8A_cm7
+**                          MIMXRT1176DVMAA_cm7
+**
+**     Compiler:            Keil ARM C/C++ Compiler
+**     Reference manual:    IMXRT1170RM, Rev 1, 02/2021
+**     Version:             rev. 1.1, 2022-04-02
+**     Build:               b220402
+**
+**     Abstract:
+**         Linker file for the Keil ARM C/C++ Compiler
+**
+**     Copyright 2016 Freescale Semiconductor, Inc.
+**     Copyright 2016-2022 NXP
+**     All rights reserved.
+**
+**     SPDX-License-Identifier: BSD-3-Clause
+**
+**     http:                 www.nxp.com
+**     mail:                 [email protected]
+**
+** ###################################################################
+*/
+
+#define m_interrupts_start             0x00000000
+#define m_interrupts_size              0x00000400
+
+#define m_text_start                   0x00000400
+#define m_text_size                    0x0003FC00
+
+#define m_data_start                   0x80000000
+#define m_data_size                    0x03000000
+
+#define m_data2_start                  0x20000000
+#define m_data2_size                   0x00040000
+
+#define m_data3_start                  0x202C0000
+#define m_data3_size                   0x00080000
+
+#define m_ncache_start                 0x83000000
+#define m_ncache_size                  0x01000000
+
+/* Sizes */
+#if (defined(__stack_size__))
+  #define Stack_Size                   __stack_size__
+#else
+  #define Stack_Size                   0x0400
+#endif
+
+#if (defined(__heap_size__))
+  #define Heap_Size                    __heap_size__
+#else
+  #define Heap_Size                    0x0400
+#endif
+
+LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start {   ; load region size_region
+  VECTOR_ROM m_interrupts_start FIXED m_interrupts_size { ; load address = execution address
+    * (.isr_vector,+FIRST)
+  }
+  ER_m_text m_text_start FIXED m_text_size { ; load address = execution address
+    * (InRoot$$Sections)
+    * (CodeQuickAccess)
+    .ANY (+RO)
+  }
+  VECTOR_RAM m_interrupts_start EMPTY 0 {
+  }
+#if (defined(__heap_noncacheable__))
+  RW_m_data m_data_start m_data_size-Stack_Size { ; RW data
+#else
+  RW_m_data m_data_start m_data_size-Stack_Size-Heap_Size { ; RW data
+#endif
+    .ANY (+RW +ZI)
+    *(*m_usb_dma_init_data)
+    *(*m_usb_dma_noninit_data)
+  }
+#if (!defined(__heap_noncacheable__))
+  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up
+  }
+#endif
+  ARM_LIB_STACK m_data_start+m_data_size EMPTY -Stack_Size { ; Stack region growing down
+  }
+  RW_m_data2 m_data2_start m_data2_size { ;
+    * (DataQuickAccess)
+  }
+#if (defined(__heap_noncacheable__))
+  RW_m_ncache m_ncache_start m_ncache_size - Heap_Size { ; ncache data
+#else
+  RW_m_ncache m_ncache_start m_ncache_size { ; ncache data
+#endif
+    * (NonCacheable.init)
+    * (*NonCacheable)
+  }
+#if (defined(__heap_noncacheable__))
+  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up
+  }
+  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache)-Heap_Size { ; Empty region added for MPU configuration
+#else
+  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache) { ; Empty region added for MPU configuration
+#endif
+  }
+}
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm7_sdram_txt.scf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm7_sdram_txt.scf
index 3d521dcea7..8c81626698 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm7_sdram_txt.scf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT1176xxxxx_cm7_sdram_txt.scf
@@ -1,109 +1,109 @@
-#!armclang --target=arm-arm-none-eabi -mcpu=cortex-m7 -E -x c

-/*

-** ###################################################################

-**     Processors:          MIMXRT1176AVM8A_cm7

-**                          MIMXRT1176CVM8A_cm7

-**                          MIMXRT1176DVMAA_cm7

-**

-**     Compiler:            Keil ARM C/C++ Compiler

-**     Reference manual:    IMXRT1170RM, Rev 1, 02/2021

-**     Version:             rev. 1.1, 2022-04-02

-**     Build:               b220402

-**

-**     Abstract:

-**         Linker file for the Keil ARM C/C++ Compiler

-**

-**     Copyright 2016 Freescale Semiconductor, Inc.

-**     Copyright 2016-2022 NXP

-**     All rights reserved.

-**

-**     SPDX-License-Identifier: BSD-3-Clause

-**

-**     http:                 www.nxp.com

-**     mail:                 [email protected]

-**

-** ###################################################################

-*/

-

-#define m_interrupts_start             0x80000000

-#define m_interrupts_size              0x00000400

-

-#define m_text_start                   0x80000400

-#define m_text_size                    0x001FFC00

-

-#define m_qacode_start                 0x00000000

-#define m_qacode_size                  0x00040000

-

-#define m_data_start                   0x202C0000

-#define m_data_size                    0x00080000

-

-#define m_data2_start                  0x20000000

-#define m_data2_size                   0x00040000

-

-#define m_data3_start                  0x80200000

-#define m_data3_size                   0x02E00000

-

-#define m_ncache_start                 0x83000000

-#define m_ncache_size                  0x01000000

-

-/* Sizes */

-#if (defined(__stack_size__))

-  #define Stack_Size                   __stack_size__

-#else

-  #define Stack_Size                   0x0400

-#endif

-

-#if (defined(__heap_size__))

-  #define Heap_Size                    __heap_size__

-#else

-  #define Heap_Size                    0x0400

-#endif

-

-LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start {   ; load region size_region

-  VECTOR_ROM m_interrupts_start FIXED m_interrupts_size { ; load address = execution address

-    * (.isr_vector,+FIRST)

-  }

-  ER_m_text m_text_start FIXED m_text_size { ; load address = execution address

-    * (InRoot$$Sections)

-    .ANY (+RO)

-  }

-  VECTOR_RAM m_interrupts_start EMPTY 0 {

-  }

-#if (defined(__heap_noncacheable__))

-  RW_m_data m_data_start m_data_size-Stack_Size { ; RW data

-#else

-  RW_m_data m_data_start m_data_size-Stack_Size-Heap_Size { ; RW data

-#endif

-    .ANY (+RW +ZI)

-    *(*m_usb_dma_init_data)

-    *(*m_usb_dma_noninit_data)

-  }

-#if (!defined(__heap_noncacheable__))

-  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up

-  }

-#endif

-  ARM_LIB_STACK m_data_start+m_data_size EMPTY -Stack_Size { ; Stack region growing down

-  }

-  RW_m_ram_text m_qacode_start m_qacode_size { ;

-    * (CodeQuickAccess)

-  }

-  RW_m_data2 m_data2_start m_data2_size { ;

-    * (DataQuickAccess)

-  }

-#if (defined(__heap_noncacheable__))

-  RW_m_ncache m_ncache_start m_ncache_size - Heap_Size { ; ncache data

-#else

-  RW_m_ncache m_ncache_start m_ncache_size { ; ncache data

-#endif

-    * (NonCacheable.init)

-    * (*NonCacheable)

-  }

-#if (defined(__heap_noncacheable__))

-  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up

-  }

-  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache)-Heap_Size { ; Empty region added for MPU configuration

-#else

-  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache) { ; Empty region added for MPU configuration

-#endif

-  }

-}

+#!armclang --target=arm-arm-none-eabi -mcpu=cortex-m7 -E -x c
+/*
+** ###################################################################
+**     Processors:          MIMXRT1176AVM8A_cm7
+**                          MIMXRT1176CVM8A_cm7
+**                          MIMXRT1176DVMAA_cm7
+**
+**     Compiler:            Keil ARM C/C++ Compiler
+**     Reference manual:    IMXRT1170RM, Rev 1, 02/2021
+**     Version:             rev. 1.1, 2022-04-02
+**     Build:               b220402
+**
+**     Abstract:
+**         Linker file for the Keil ARM C/C++ Compiler
+**
+**     Copyright 2016 Freescale Semiconductor, Inc.
+**     Copyright 2016-2022 NXP
+**     All rights reserved.
+**
+**     SPDX-License-Identifier: BSD-3-Clause
+**
+**     http:                 www.nxp.com
+**     mail:                 [email protected]
+**
+** ###################################################################
+*/
+
+#define m_interrupts_start             0x80000000
+#define m_interrupts_size              0x00000400
+
+#define m_text_start                   0x80000400
+#define m_text_size                    0x001FFC00
+
+#define m_qacode_start                 0x00000000
+#define m_qacode_size                  0x00040000
+
+#define m_data_start                   0x202C0000
+#define m_data_size                    0x00080000
+
+#define m_data2_start                  0x20000000
+#define m_data2_size                   0x00040000
+
+#define m_data3_start                  0x80200000
+#define m_data3_size                   0x02E00000
+
+#define m_ncache_start                 0x83000000
+#define m_ncache_size                  0x01000000
+
+/* Sizes */
+#if (defined(__stack_size__))
+  #define Stack_Size                   __stack_size__
+#else
+  #define Stack_Size                   0x0400
+#endif
+
+#if (defined(__heap_size__))
+  #define Heap_Size                    __heap_size__
+#else
+  #define Heap_Size                    0x0400
+#endif
+
+LR_m_text m_interrupts_start m_text_start+m_text_size-m_interrupts_start {   ; load region size_region
+  VECTOR_ROM m_interrupts_start FIXED m_interrupts_size { ; load address = execution address
+    * (.isr_vector,+FIRST)
+  }
+  ER_m_text m_text_start FIXED m_text_size { ; load address = execution address
+    * (InRoot$$Sections)
+    .ANY (+RO)
+  }
+  VECTOR_RAM m_interrupts_start EMPTY 0 {
+  }
+#if (defined(__heap_noncacheable__))
+  RW_m_data m_data_start m_data_size-Stack_Size { ; RW data
+#else
+  RW_m_data m_data_start m_data_size-Stack_Size-Heap_Size { ; RW data
+#endif
+    .ANY (+RW +ZI)
+    *(*m_usb_dma_init_data)
+    *(*m_usb_dma_noninit_data)
+  }
+#if (!defined(__heap_noncacheable__))
+  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up
+  }
+#endif
+  ARM_LIB_STACK m_data_start+m_data_size EMPTY -Stack_Size { ; Stack region growing down
+  }
+  RW_m_ram_text m_qacode_start m_qacode_size { ;
+    * (CodeQuickAccess)
+  }
+  RW_m_data2 m_data2_start m_data2_size { ;
+    * (DataQuickAccess)
+  }
+#if (defined(__heap_noncacheable__))
+  RW_m_ncache m_ncache_start m_ncache_size - Heap_Size { ; ncache data
+#else
+  RW_m_ncache m_ncache_start m_ncache_size { ; ncache data
+#endif
+    * (NonCacheable.init)
+    * (*NonCacheable)
+  }
+#if (defined(__heap_noncacheable__))
+  ARM_LIB_HEAP +0 EMPTY Heap_Size {    ; Heap region growing up
+  }
+  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache)-Heap_Size { ; Empty region added for MPU configuration
+#else
+  RW_m_ncache_unused +0 EMPTY m_ncache_size-ImageLength(RW_m_ncache) { ; Empty region added for MPU configuration
+#endif
+  }
+}
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT117x_QuadSPI_4KB_SEC.FLM b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT117x_QuadSPI_4KB_SEC.FLM
index f7816757b1..f7816757b1 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT117x_QuadSPI_4KB_SEC.FLM
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT117x_QuadSPI_4KB_SEC.FLM
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT117x_QuadSPI_4KB_SEC_Alias.FLM b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT117x_QuadSPI_4KB_SEC_Alias.FLM
index ce87cbe6ce..ce87cbe6ce 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT117x_QuadSPI_4KB_SEC_Alias.FLM
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/MIMXRT117x_QuadSPI_4KB_SEC_Alias.FLM
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/startup_MIMXRT1176_cm4.S b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/startup_MIMXRT1176_cm4.S
index 3a9399672a..3a9399672a 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/startup_MIMXRT1176_cm4.S
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/startup_MIMXRT1176_cm4.S
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/startup_MIMXRT1176_cm7.S b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/startup_MIMXRT1176_cm7.S
index 3a41d7c989..3a41d7c989 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/startup_MIMXRT1176_cm7.S
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/arm/startup_MIMXRT1176_cm7.S
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_enet_cmsis.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_enet_cmsis.c
index e2ce2505bf..e2ce2505bf 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_enet_cmsis.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_enet_cmsis.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_enet_cmsis.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_enet_cmsis.h
index 7ef6f64add..7ef6f64add 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_enet_cmsis.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_enet_cmsis.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_enet_phy_cmsis.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_enet_phy_cmsis.c
index 9c5e49681c..9c5e49681c 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_enet_phy_cmsis.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_enet_phy_cmsis.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_enet_phy_cmsis.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_enet_phy_cmsis.h
index 6b33bf9ecd..6b33bf9ecd 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_enet_phy_cmsis.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_enet_phy_cmsis.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_lpi2c_cmsis.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_lpi2c_cmsis.c
index 832db8e0b8..832db8e0b8 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_lpi2c_cmsis.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_lpi2c_cmsis.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_lpi2c_cmsis.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_lpi2c_cmsis.h
index 385daa89a4..385daa89a4 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_lpi2c_cmsis.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_lpi2c_cmsis.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_lpspi_cmsis.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_lpspi_cmsis.c
index ed512afb86..ed512afb86 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_lpspi_cmsis.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_lpspi_cmsis.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_lpspi_cmsis.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_lpspi_cmsis.h
index 534d399973..534d399973 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_lpspi_cmsis.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_lpspi_cmsis.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_lpuart_cmsis.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_lpuart_cmsis.c
index 70c622bb28..70c622bb28 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_lpuart_cmsis.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_lpuart_cmsis.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_lpuart_cmsis.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_lpuart_cmsis.h
index 53a8d654fc..53a8d654fc 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_lpuart_cmsis.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/cmsis_drivers/fsl_lpuart_cmsis.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/cm4/fsl_cache.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/cm4/fsl_cache.c
index 616cde33bd..616cde33bd 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/cm4/fsl_cache.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/cm4/fsl_cache.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/cm4/fsl_cache.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/cm4/fsl_cache.h
index 0f32bb0c61..0f32bb0c61 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/cm4/fsl_cache.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/cm4/fsl_cache.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/cm7/fsl_cache.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/cm7/fsl_cache.c
index 721a3fb04e..721a3fb04e 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/cm7/fsl_cache.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/cm7/fsl_cache.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/cm7/fsl_cache.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/cm7/fsl_cache.h
index 9708edd999..9708edd999 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/cm7/fsl_cache.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/cm7/fsl_cache.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_acmp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_acmp.c
index 80ae4320f3..80ae4320f3 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_acmp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_acmp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_acmp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_acmp.h
index d24051de9a..d24051de9a 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_acmp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_acmp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_adc_etc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_adc_etc.c
index e98ed23e28..e98ed23e28 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_adc_etc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_adc_etc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_adc_etc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_adc_etc.h
index e34e19b00a..e34e19b00a 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_adc_etc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_adc_etc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_anatop_ai.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_anatop_ai.c
index c78ded8d50..c78ded8d50 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_anatop_ai.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_anatop_ai.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_anatop_ai.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_anatop_ai.h
index f498672a04..f498672a04 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_anatop_ai.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_anatop_ai.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_aoi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_aoi.c
index a8f1f29ddb..a8f1f29ddb 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_aoi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_aoi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_aoi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_aoi.h
index 6d905b9d64..6d905b9d64 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_aoi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_aoi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_asrc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_asrc.c
index be4f6c1b4d..be4f6c1b4d 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_asrc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_asrc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_asrc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_asrc.h
index e4f8ce384a..e4f8ce384a 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_asrc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_asrc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_asrc_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_asrc_edma.c
index 8731a8e8fe..8731a8e8fe 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_asrc_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_asrc_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_asrc_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_asrc_edma.h
index 89053232c8..89053232c8 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_asrc_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_asrc_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_caam.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_caam.c
index 72d5b68b25..72d5b68b25 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_caam.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_caam.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_caam.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_caam.h
index 17b87f2cc3..17b87f2cc3 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_caam.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_caam.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_cdog.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_cdog.c
index 9b985e1cbd..9b985e1cbd 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_cdog.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_cdog.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_cdog.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_cdog.h
index b93c8dbdfe..b93c8dbdfe 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_cdog.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_cdog.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_clock.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_clock.c
index 892b54b26a..892b54b26a 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_clock.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_clock.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_clock.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_clock.h
index bb48c8b1fb..bb48c8b1fb 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_clock.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_clock.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_common.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_common.c
index d3af9fdfc6..d3af9fdfc6 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_common.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_common.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_common.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_common.h
index d9cb304f2f..d9cb304f2f 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_common.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_common.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_common_arm.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_common_arm.c
index e77a265ce4..e77a265ce4 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_common_arm.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_common_arm.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_common_arm.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_common_arm.h
index 2678ff625c..2678ff625c 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_common_arm.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_common_arm.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_csi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_csi.c
index e23fba521b..e23fba521b 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_csi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_csi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_csi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_csi.h
index dd6f5c08d8..dd6f5c08d8 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_csi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_csi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dac12.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dac12.c
index 1381faa047..1381faa047 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dac12.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dac12.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dac12.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dac12.h
index f467ec038c..f467ec038c 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dac12.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dac12.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dcdc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dcdc.c
index 350c327afc..350c327afc 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dcdc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dcdc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dcdc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dcdc.h
index e81d76d2d0..e81d76d2d0 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dcdc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dcdc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dcic.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dcic.c
index 54f418d916..54f418d916 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dcic.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dcic.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dcic.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dcic.h
index c88df5d5dd..c88df5d5dd 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dcic.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dcic.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dmamux.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dmamux.c
index 8bfbe6c367..8bfbe6c367 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dmamux.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dmamux.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dmamux.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dmamux.h
index 2f627c2451..2f627c2451 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dmamux.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_dmamux.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_edma.c
index 269d62c7ff..269d62c7ff 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_edma.h
index 3d31f88365..3d31f88365 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_elcdif.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_elcdif.c
index 39cb72607f..39cb72607f 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_elcdif.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_elcdif.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_elcdif.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_elcdif.h
index a9d56a1dad..a9d56a1dad 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_elcdif.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_elcdif.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_enc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_enc.c
index aab9a505d8..aab9a505d8 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_enc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_enc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_enc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_enc.h
index 28ce466ce3..28ce466ce3 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_enc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_enc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_enet.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_enet.c
index 0e9e9a1a85..0e9e9a1a85 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_enet.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_enet.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_enet.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_enet.h
index 30b339356a..30b339356a 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_enet.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_enet.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_enet_qos.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_enet_qos.c
index 37c09c764a..37c09c764a 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_enet_qos.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_enet_qos.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_enet_qos.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_enet_qos.h
index f29a233ec1..f29a233ec1 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_enet_qos.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_enet_qos.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_ewm.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_ewm.c
index 593cf87a50..593cf87a50 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_ewm.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_ewm.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_ewm.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_ewm.h
index dbef1b3d07..dbef1b3d07 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_ewm.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_ewm.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexcan.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexcan.c
index 2d2ce4f78a..2d2ce4f78a 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexcan.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexcan.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexcan.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexcan.h
index 6c34277a0d..6c34277a0d 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexcan.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexcan.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio.c
index 18531f7743..18531f7743 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio.h
index 9382738696..9382738696 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_camera.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_camera.c
index 812605626f..812605626f 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_camera.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_camera.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_camera.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_camera.h
index 93612a7188..93612a7188 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_camera.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_camera.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_camera_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_camera_edma.c
index 12bb77b020..12bb77b020 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_camera_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_camera_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_camera_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_camera_edma.h
index ff71a44cfe..ff71a44cfe 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_camera_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_camera_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_i2c_master.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_i2c_master.c
index 9158236bb2..9158236bb2 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_i2c_master.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_i2c_master.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_i2c_master.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_i2c_master.h
index 7855f954c5..7855f954c5 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_i2c_master.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_i2c_master.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_i2s.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_i2s.c
index 087e0d691d..087e0d691d 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_i2s.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_i2s.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_i2s.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_i2s.h
index 3497d7c7ac..3497d7c7ac 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_i2s.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_i2s.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_i2s_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_i2s_edma.c
index faa1541530..faa1541530 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_i2s_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_i2s_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_i2s_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_i2s_edma.h
index a3a0ef1264..a3a0ef1264 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_i2s_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_i2s_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_mculcd.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_mculcd.c
index 5db3141200..5db3141200 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_mculcd.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_mculcd.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_mculcd.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_mculcd.h
index 046b98c37a..046b98c37a 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_mculcd.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_mculcd.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_mculcd_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_mculcd_edma.c
index 458ad8e72b..458ad8e72b 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_mculcd_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_mculcd_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_mculcd_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_mculcd_edma.h
index 200440baae..200440baae 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_mculcd_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_mculcd_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_spi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_spi.c
index 06542d9120..06542d9120 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_spi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_spi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_spi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_spi.h
index 61c1034fc2..61c1034fc2 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_spi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_spi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_spi_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_spi_edma.c
index c1feba0f00..c1feba0f00 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_spi_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_spi_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_spi_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_spi_edma.h
index c71a1b1fda..c71a1b1fda 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_spi_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_spi_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_uart.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_uart.c
index 0d308b16a7..0d308b16a7 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_uart.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_uart.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_uart.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_uart.h
index 783c31885e..783c31885e 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_uart.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_uart.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_uart_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_uart_edma.c
index f2502c9df2..f2502c9df2 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_uart_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_uart_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_uart_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_uart_edma.h
index 3f145ea6a4..3f145ea6a4 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_uart_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexio_uart_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexram.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexram.c
index 65e7318301..65e7318301 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexram.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexram.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexram.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexram.h
index 3c9a9c2db3..3c9a9c2db3 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexram.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexram.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexram_allocate.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexram_allocate.c
index 8de9c76320..8de9c76320 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexram_allocate.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexram_allocate.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexram_allocate.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexram_allocate.h
index 6ba4152bcb..6ba4152bcb 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexram_allocate.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexram_allocate.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexspi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexspi.c
index 7964163917..7964163917 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexspi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexspi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexspi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexspi.h
index 5269d439da..5269d439da 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexspi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexspi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexspi_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexspi_edma.c
index 6947e21c77..6947e21c77 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexspi_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexspi_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexspi_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexspi_edma.h
index 6a57d27332..6a57d27332 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexspi_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_flexspi_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_gpc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_gpc.c
index 4002aeb980..4002aeb980 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_gpc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_gpc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_gpc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_gpc.h
index d1066e0831..d1066e0831 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_gpc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_gpc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_gpio.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_gpio.c
index 68ccade87d..68ccade87d 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_gpio.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_gpio.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_gpio.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_gpio.h
index bd0e7f20bb..bd0e7f20bb 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_gpio.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_gpio.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_gpt.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_gpt.c
index 691cdf590e..691cdf590e 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_gpt.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_gpt.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_gpt.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_gpt.h
index ec274588bf..ec274588bf 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_gpt.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_gpt.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_iee.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_iee.c
index 43ae8f16ea..43ae8f16ea 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_iee.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_iee.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_iee.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_iee.h
index 7400ec932f..7400ec932f 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_iee.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_iee.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_iee_apc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_iee_apc.c
index afc6af6f87..afc6af6f87 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_iee_apc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_iee_apc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_iee_apc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_iee_apc.h
index e179ac0ecc..e179ac0ecc 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_iee_apc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_iee_apc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_iomuxc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_iomuxc.h
index fcc5e539a4..fcc5e539a4 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_iomuxc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_iomuxc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_key_manager.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_key_manager.c
index b7b0c03d45..b7b0c03d45 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_key_manager.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_key_manager.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_key_manager.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_key_manager.h
index 03e3af3f46..03e3af3f46 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_key_manager.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_key_manager.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_kpp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_kpp.c
index 8c0b1958be..8c0b1958be 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_kpp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_kpp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_kpp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_kpp.h
index dc65aaf8d7..dc65aaf8d7 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_kpp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_kpp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lcdifv2.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lcdifv2.c
index a1db8d91a4..a1db8d91a4 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lcdifv2.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lcdifv2.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lcdifv2.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lcdifv2.h
index 1df99ece9a..1df99ece9a 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lcdifv2.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lcdifv2.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpadc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpadc.c
index 7835e6fc45..7835e6fc45 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpadc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpadc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpadc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpadc.h
index d3e5a9ec30..d3e5a9ec30 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpadc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpadc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpi2c.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpi2c.c
index d4b8f9a82a..d4b8f9a82a 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpi2c.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpi2c.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpi2c.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpi2c.h
index 825a11f217..825a11f217 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpi2c.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpi2c.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpi2c_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpi2c_edma.c
index 82c77b8c2d..82c77b8c2d 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpi2c_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpi2c_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpi2c_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpi2c_edma.h
index 1d48fdf296..1d48fdf296 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpi2c_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpi2c_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpi2c_freertos.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpi2c_freertos.c
index efb2d40333..efb2d40333 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpi2c_freertos.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpi2c_freertos.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpi2c_freertos.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpi2c_freertos.h
index 90bc78e934..90bc78e934 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpi2c_freertos.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpi2c_freertos.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpspi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpspi.c
index e9436d2a36..e9436d2a36 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpspi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpspi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpspi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpspi.h
index dffcad8ddc..dffcad8ddc 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpspi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpspi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpspi_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpspi_edma.c
index cd46d73e8d..cd46d73e8d 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpspi_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpspi_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpspi_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpspi_edma.h
index adfc4e51e2..adfc4e51e2 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpspi_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpspi_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpspi_freertos.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpspi_freertos.c
index 58305df266..58305df266 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpspi_freertos.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpspi_freertos.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpspi_freertos.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpspi_freertos.h
index 2c6bc1e1d5..2c6bc1e1d5 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpspi_freertos.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpspi_freertos.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpuart.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpuart.c
index 7da69430af..7da69430af 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpuart.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpuart.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpuart.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpuart.h
index cbe43ddf6a..cbe43ddf6a 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpuart.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpuart.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpuart_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpuart_edma.c
index f812f570cd..f812f570cd 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpuart_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpuart_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpuart_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpuart_edma.h
index f237efcc61..f237efcc61 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpuart_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpuart_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpuart_freertos.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpuart_freertos.c
index 8b137b55f6..8b137b55f6 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpuart_freertos.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpuart_freertos.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpuart_freertos.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpuart_freertos.h
index 624dc6f3b1..624dc6f3b1 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpuart_freertos.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_lpuart_freertos.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mecc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mecc.c
index 04ee5b7de5..04ee5b7de5 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mecc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mecc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mecc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mecc.h
index 472bac08d4..472bac08d4 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mecc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mecc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_memory.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_memory.h
index a325513859..a325513859 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_memory.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_memory.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mipi_csi2rx.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mipi_csi2rx.c
index c4e4eaa961..c4e4eaa961 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mipi_csi2rx.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mipi_csi2rx.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mipi_csi2rx.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mipi_csi2rx.h
index ce1d14d490..ce1d14d490 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mipi_csi2rx.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mipi_csi2rx.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mipi_dsi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mipi_dsi.c
index 25e35384f7..25e35384f7 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mipi_dsi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mipi_dsi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mipi_dsi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mipi_dsi.h
index daf2af2f67..daf2af2f67 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mipi_dsi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mipi_dsi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mu.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mu.c
index 40b8dfd0f1..40b8dfd0f1 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mu.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mu.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mu.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mu.h
index 92a6b4d521..92a6b4d521 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mu.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_mu.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_nic301.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_nic301.h
index cbdb107d07..cbdb107d07 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_nic301.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_nic301.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_ocotp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_ocotp.c
index 4c15d6974d..4c15d6974d 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_ocotp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_ocotp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_ocotp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_ocotp.h
index 73a405a12a..73a405a12a 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_ocotp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_ocotp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_os_abstraction.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_os_abstraction.h
index 379bde9c2c..379bde9c2c 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_os_abstraction.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_os_abstraction.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_os_abstraction_config.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_os_abstraction_config.h
index 234cf972bc..234cf972bc 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_os_abstraction_config.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_os_abstraction_config.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_os_abstraction_rtthread.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_os_abstraction_rtthread.c
index 6b8fc6ca16..6b8fc6ca16 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_os_abstraction_rtthread.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_os_abstraction_rtthread.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_os_abstraction_rtthread.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_os_abstraction_rtthread.h
index 40bd24271a..40bd24271a 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_os_abstraction_rtthread.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_os_abstraction_rtthread.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pdm.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pdm.c
index bf31c17b3b..bf31c17b3b 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pdm.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pdm.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pdm.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pdm.h
index 26a31d62dd..26a31d62dd 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pdm.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pdm.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pdm_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pdm_edma.c
index bf60e21970..bf60e21970 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pdm_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pdm_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pdm_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pdm_edma.h
index 37acd94603..37acd94603 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pdm_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pdm_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pgmc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pgmc.c
index 03488ee4b1..03488ee4b1 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pgmc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pgmc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pgmc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pgmc.h
index 47fb2f8d42..47fb2f8d42 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pgmc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pgmc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pit.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pit.c
index 659de24999..659de24999 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pit.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pit.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pit.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pit.h
index 2b035d41ad..2b035d41ad 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pit.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pit.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pmu.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pmu.c
index 3cf953f294..3cf953f294 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pmu.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pmu.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pmu.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pmu.h
index cd22e42d4f..cd22e42d4f 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pmu.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pmu.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_puf.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_puf.c
index d82299ed24..d82299ed24 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_puf.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_puf.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_puf.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_puf.h
index b8a5c51c85..b8a5c51c85 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_puf.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_puf.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pwm.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pwm.c
index d16fe3a139..d16fe3a139 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pwm.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pwm.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pwm.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pwm.h
index 081abf1521..081abf1521 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pwm.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pwm.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pxp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pxp.c
index 2e55f5d7b8..2e55f5d7b8 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pxp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pxp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pxp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pxp.h
index a29aace158..a29aace158 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pxp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_pxp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_qtmr.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_qtmr.c
index 24b9becec7..24b9becec7 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_qtmr.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_qtmr.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_qtmr.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_qtmr.h
index ad214b2117..ad214b2117 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_qtmr.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_qtmr.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_rdc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_rdc.c
index 816770dbd7..816770dbd7 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_rdc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_rdc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_rdc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_rdc.h
index 41d3f5aca1..41d3f5aca1 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_rdc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_rdc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_rdc_sema42.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_rdc_sema42.c
index 00189e49a8..00189e49a8 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_rdc_sema42.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_rdc_sema42.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_rdc_sema42.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_rdc_sema42.h
index ddd9e4bbc2..ddd9e4bbc2 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_rdc_sema42.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_rdc_sema42.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_romapi.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_romapi.c
index db8fb0672b..db8fb0672b 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_romapi.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_romapi.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_romapi.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_romapi.h
index 0e95c5cb84..0e95c5cb84 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_romapi.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_romapi.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_rtwdog.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_rtwdog.c
index 4b49280bf8..4b49280bf8 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_rtwdog.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_rtwdog.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_rtwdog.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_rtwdog.h
index 5eecb5a23b..5eecb5a23b 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_rtwdog.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_rtwdog.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_sai.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_sai.c
index b77e482dac..b77e482dac 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_sai.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_sai.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_sai.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_sai.h
index d69e13ac9d..d69e13ac9d 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_sai.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_sai.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_sai_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_sai_edma.c
index 0b62c40d14..0b62c40d14 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_sai_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_sai_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_sai_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_sai_edma.h
index e457271986..e457271986 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_sai_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_sai_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_sema4.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_sema4.c
index 847769009c..847769009c 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_sema4.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_sema4.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_sema4.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_sema4.h
index 512cc90346..512cc90346 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_sema4.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_sema4.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_semc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_semc.c
index 84b54317b8..84b54317b8 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_semc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_semc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_semc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_semc.h
index e6efec0d8e..e6efec0d8e 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_semc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_semc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_smartcard.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_smartcard.h
index 2c7f81609b..2c7f81609b 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_smartcard.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_smartcard.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_smartcard_emvsim.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_smartcard_emvsim.c
index 61bca20b49..61bca20b49 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_smartcard_emvsim.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_smartcard_emvsim.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_smartcard_emvsim.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_smartcard_emvsim.h
index 397966bc02..397966bc02 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_smartcard_emvsim.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_smartcard_emvsim.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_smartcard_phy.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_smartcard_phy.h
index 21408bef76..21408bef76 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_smartcard_phy.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_smartcard_phy.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_smartcard_phy_emvsim.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_smartcard_phy_emvsim.c
index 1be83f8101..1be83f8101 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_smartcard_phy_emvsim.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_smartcard_phy_emvsim.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_snvs_hp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_snvs_hp.c
index 485ba01b58..485ba01b58 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_snvs_hp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_snvs_hp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_snvs_hp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_snvs_hp.h
index 713f16b037..713f16b037 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_snvs_hp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_snvs_hp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_snvs_lp.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_snvs_lp.c
index c9a703eebe..c9a703eebe 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_snvs_lp.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_snvs_lp.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_snvs_lp.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_snvs_lp.h
index 44b9aa02d6..44b9aa02d6 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_snvs_lp.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_snvs_lp.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_soc_mipi_csi2rx.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_soc_mipi_csi2rx.c
index f945b28e4a..f945b28e4a 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_soc_mipi_csi2rx.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_soc_mipi_csi2rx.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_soc_mipi_csi2rx.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_soc_mipi_csi2rx.h
index d82023802d..d82023802d 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_soc_mipi_csi2rx.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_soc_mipi_csi2rx.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_soc_src.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_soc_src.c
index 36fe004d3d..36fe004d3d 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_soc_src.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_soc_src.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_soc_src.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_soc_src.h
index 1a8a85c8c4..1a8a85c8c4 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_soc_src.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_soc_src.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_spdif.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_spdif.c
index 72f1c60563..72f1c60563 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_spdif.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_spdif.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_spdif.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_spdif.h
index c1656c10a8..c1656c10a8 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_spdif.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_spdif.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_spdif_edma.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_spdif_edma.c
index 88b95bd195..88b95bd195 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_spdif_edma.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_spdif_edma.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_spdif_edma.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_spdif_edma.h
index 964bf1e7ab..964bf1e7ab 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_spdif_edma.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_spdif_edma.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_ssarc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_ssarc.c
index fce7c4d458..fce7c4d458 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_ssarc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_ssarc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_ssarc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_ssarc.h
index 02f49efa43..02f49efa43 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_ssarc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_ssarc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_tempsensor.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_tempsensor.c
index 494e14f7c8..494e14f7c8 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_tempsensor.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_tempsensor.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_tempsensor.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_tempsensor.h
index fe00db546b..fe00db546b 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_tempsensor.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_tempsensor.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_usdhc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_usdhc.c
index f2c82d8cde..f2c82d8cde 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_usdhc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_usdhc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_usdhc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_usdhc.h
index bf4d35cfe6..bf4d35cfe6 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_usdhc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_usdhc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_wdog.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_wdog.c
index ea6c970b33..ea6c970b33 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_wdog.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_wdog.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_wdog.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_wdog.h
index c49b39abe9..c49b39abe9 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_wdog.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_wdog.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xbara.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xbara.c
index cc6307bbb6..cc6307bbb6 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xbara.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xbara.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xbara.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xbara.h
index 71756e4769..71756e4769 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xbara.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xbara.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xbarb.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xbarb.c
index c1878a2ae4..c1878a2ae4 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xbarb.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xbarb.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xbarb.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xbarb.h
index def13c31ad..def13c31ad 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xbarb.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xbarb.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xecc.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xecc.c
index fa6b7984c7..fa6b7984c7 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xecc.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xecc.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xecc.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xecc.h
index 21b2226596..21b2226596 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xecc.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xecc.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xrdc2.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xrdc2.c
index 9aaf8fb156..9aaf8fb156 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xrdc2.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xrdc2.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xrdc2.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xrdc2.h
index bb0f1a884b..bb0f1a884b 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xrdc2.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/fsl_xrdc2.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/generic_list.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/generic_list.c
index 80dd21425d..80dd21425d 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/generic_list.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/generic_list.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/generic_list.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/generic_list.h
index def00efe8e..def00efe8e 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/generic_list.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/drivers/generic_list.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/fsl_device_registers.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/fsl_device_registers.h
index 6a3a07bd83..6a3a07bd83 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/fsl_device_registers.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/fsl_device_registers.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm4_flexspi_nor.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm4_flexspi_nor.ld
index fd11d3237e..fd11d3237e 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm4_flexspi_nor.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm4_flexspi_nor.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm4_flexspi_nor_sdram.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm4_flexspi_nor_sdram.ld
index 991c70d3cc..991c70d3cc 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm4_flexspi_nor_sdram.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm4_flexspi_nor_sdram.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm4_ocram.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm4_ocram.ld
index 9a0819dbd1..9a0819dbd1 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm4_ocram.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm4_ocram.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm4_ram.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm4_ram.ld
index c55a2cedc3..c55a2cedc3 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm4_ram.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm4_ram.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm4_sdram.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm4_sdram.ld
index 3ea3b7c484..3ea3b7c484 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm4_sdram.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm4_sdram.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm4_sdram_txt.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm4_sdram_txt.ld
index 70c0c066b3..70c0c066b3 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm4_sdram_txt.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm4_sdram_txt.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm7_flexspi_nor.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm7_flexspi_nor.ld
index feb4198455..feb4198455 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm7_flexspi_nor.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm7_flexspi_nor.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm7_flexspi_nor_sdram.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm7_flexspi_nor_sdram.ld
index 3795082dd6..3795082dd6 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm7_flexspi_nor_sdram.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm7_flexspi_nor_sdram.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm7_ram.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm7_ram.ld
index 465668f5bc..465668f5bc 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm7_ram.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm7_ram.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm7_sdram.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm7_sdram.ld
index 44eb090840..44eb090840 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm7_sdram.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm7_sdram.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm7_sdram_txt.ld b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm7_sdram_txt.ld
index 6d4980b416..6d4980b416 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm7_sdram_txt.ld
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/MIMXRT1176xxxxx_cm7_sdram_txt.ld
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/startup_MIMXRT1176_cm4.S b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/startup_MIMXRT1176_cm4.S
index 48c57d0085..48c57d0085 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/startup_MIMXRT1176_cm4.S
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/startup_MIMXRT1176_cm4.S
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/startup_MIMXRT1176_cm7.S b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/startup_MIMXRT1176_cm7.S
index 25fca7fedb..25fca7fedb 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/startup_MIMXRT1176_cm7.S
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/gcc/startup_MIMXRT1176_cm7.S
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm4_flexspi_nor.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm4_flexspi_nor.icf
index 541dbd394a..541dbd394a 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm4_flexspi_nor.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm4_flexspi_nor.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm4_flexspi_nor_sdram.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm4_flexspi_nor_sdram.icf
index a7c55ec240..a7c55ec240 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm4_flexspi_nor_sdram.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm4_flexspi_nor_sdram.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm4_ocram.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm4_ocram.icf
index eae0100eaa..eae0100eaa 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm4_ocram.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm4_ocram.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm4_ram.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm4_ram.icf
index d8870a2242..d8870a2242 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm4_ram.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm4_ram.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm4_sdram.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm4_sdram.icf
index e4e8a520e8..e4e8a520e8 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm4_sdram.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm4_sdram.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm4_sdram_txt.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm4_sdram_txt.icf
index f0c9e48e23..f0c9e48e23 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm4_sdram_txt.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm4_sdram_txt.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm7_flexspi_nor.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm7_flexspi_nor.icf
index 884bc7cf74..884bc7cf74 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm7_flexspi_nor.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm7_flexspi_nor.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm7_flexspi_nor_sdram.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm7_flexspi_nor_sdram.icf
index 0df1c858de..0df1c858de 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm7_flexspi_nor_sdram.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm7_flexspi_nor_sdram.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm7_ram.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm7_ram.icf
index 63ef363851..63ef363851 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm7_ram.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm7_ram.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm7_sdram.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm7_sdram.icf
index 6d707881c1..6d707881c1 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm7_sdram.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm7_sdram.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm7_sdram_txt.icf b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm7_sdram_txt.icf
index da7623fe4f..da7623fe4f 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm7_sdram_txt.icf
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/MIMXRT1176xxxxx_cm7_sdram_txt.icf
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/startup_MIMXRT1176_cm4.s b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/startup_MIMXRT1176_cm4.s
index 047d864939..047d864939 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/startup_MIMXRT1176_cm4.s
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/startup_MIMXRT1176_cm4.s
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/startup_MIMXRT1176_cm7.s b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/startup_MIMXRT1176_cm7.s
index 0b8cb38c7d..0b8cb38c7d 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/startup_MIMXRT1176_cm7.s
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/iar/startup_MIMXRT1176_cm7.s
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/mcuxpresso/boot_multicore_slave.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/mcuxpresso/boot_multicore_slave.c
index 63572646aa..63572646aa 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/mcuxpresso/boot_multicore_slave.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/mcuxpresso/boot_multicore_slave.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/mcuxpresso/boot_multicore_slave.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/mcuxpresso/boot_multicore_slave.h
index 485907c398..485907c398 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/mcuxpresso/boot_multicore_slave.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/mcuxpresso/boot_multicore_slave.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/mcuxpresso/startup_mimxrt1176_cm4.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/mcuxpresso/startup_mimxrt1176_cm4.c
index 9499c8b035..9499c8b035 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/mcuxpresso/startup_mimxrt1176_cm4.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/mcuxpresso/startup_mimxrt1176_cm4.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/mcuxpresso/startup_mimxrt1176_cm4.cpp b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/mcuxpresso/startup_mimxrt1176_cm4.cpp
index 9499c8b035..9499c8b035 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/mcuxpresso/startup_mimxrt1176_cm4.cpp
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/mcuxpresso/startup_mimxrt1176_cm4.cpp
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/mcuxpresso/startup_mimxrt1176_cm7.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/mcuxpresso/startup_mimxrt1176_cm7.c
index 7af7e7eaab..7af7e7eaab 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/mcuxpresso/startup_mimxrt1176_cm7.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/mcuxpresso/startup_mimxrt1176_cm7.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/mcuxpresso/startup_mimxrt1176_cm7.cpp b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/mcuxpresso/startup_mimxrt1176_cm7.cpp
index 7af7e7eaab..7af7e7eaab 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/mcuxpresso/startup_mimxrt1176_cm7.cpp
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/mcuxpresso/startup_mimxrt1176_cm7.cpp
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/board.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/board.c
index 7d70354535..7d70354535 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/board.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/board.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/board.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/board.h
index 214cbd05d0..214cbd05d0 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/board.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/board.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/clock_config.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/clock_config.c
index 33394b7176..33394b7176 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/clock_config.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/clock_config.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/clock_config.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/clock_config.h
index 49d1976462..49d1976462 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/clock_config.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/clock_config.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/peripherals.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/peripherals.c
index e7864d7011..e7864d7011 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/peripherals.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/peripherals.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/peripherals.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/peripherals.h
index dab359b28e..dab359b28e 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/peripherals.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/peripherals.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/pin_mux.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/pin_mux.c
index f8be220ad3..f8be220ad3 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/pin_mux.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/pin_mux.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/pin_mux.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/pin_mux.h
index ea4727153a..ea4727153a 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/pin_mux.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/project_template/pin_mux.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/system_MIMXRT1176_cm4.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/system_MIMXRT1176_cm4.c
index 1d0ec4950d..1d0ec4950d 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/system_MIMXRT1176_cm4.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/system_MIMXRT1176_cm4.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/system_MIMXRT1176_cm4.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/system_MIMXRT1176_cm4.h
index 780a9b9ead..780a9b9ead 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/system_MIMXRT1176_cm4.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/system_MIMXRT1176_cm4.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/system_MIMXRT1176_cm7.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/system_MIMXRT1176_cm7.c
index 8ab45d94bd..8ab45d94bd 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/system_MIMXRT1176_cm7.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/system_MIMXRT1176_cm7.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/system_MIMXRT1176_cm7.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/system_MIMXRT1176_cm7.h
index e3857f3b6f..e3857f3b6f 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/system_MIMXRT1176_cm7.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/system_MIMXRT1176_cm7.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/RTE_Device.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/RTE_Device.h
index 01faa59e2c..01faa59e2c 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/RTE_Device.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/RTE_Device.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/board.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/board.c
index 091b6afd9c..091b6afd9c 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/board.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/board.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/board.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/board.h
index 214cbd05d0..214cbd05d0 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/board.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/board.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/clock_config.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/clock_config.c
index c7632161aa..c7632161aa 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/clock_config.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/clock_config.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/clock_config.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/clock_config.h
index 49d1976462..49d1976462 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/clock_config.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/clock_config.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/peripherals.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/peripherals.c
index e7864d7011..e7864d7011 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/peripherals.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/peripherals.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/peripherals.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/peripherals.h
index dab359b28e..dab359b28e 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/peripherals.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/peripherals.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/pin_mux.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/pin_mux.c
index f8be220ad3..f8be220ad3 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/pin_mux.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/pin_mux.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/pin_mux.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/pin_mux.h
index ea4727153a..ea4727153a 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/pin_mux.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/template/pin_mux.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/debug_console/fsl_debug_console.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/debug_console/fsl_debug_console.c
index 1efdbbbbdf..1efdbbbbdf 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/debug_console/fsl_debug_console.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/debug_console/fsl_debug_console.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/debug_console/fsl_debug_console.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/debug_console/fsl_debug_console.h
index 374148ff85..374148ff85 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/debug_console/fsl_debug_console.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/debug_console/fsl_debug_console.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/debug_console/fsl_debug_console_conf.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/debug_console/fsl_debug_console_conf.h
index fd235b1e54..fd235b1e54 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/debug_console/fsl_debug_console_conf.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/debug_console/fsl_debug_console_conf.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/debug_console_lite/fsl_assert.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/debug_console_lite/fsl_assert.c
index bb9127acdf..bb9127acdf 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/debug_console_lite/fsl_assert.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/debug_console_lite/fsl_assert.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/debug_console_lite/fsl_debug_console.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/debug_console_lite/fsl_debug_console.c
index 5550f7f47e..5550f7f47e 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/debug_console_lite/fsl_debug_console.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/debug_console_lite/fsl_debug_console.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/debug_console_lite/fsl_debug_console.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/debug_console_lite/fsl_debug_console.h
index bd4bb51de5..bd4bb51de5 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/debug_console_lite/fsl_debug_console.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/debug_console_lite/fsl_debug_console.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/fsl_assert.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/fsl_assert.c
index bb9127acdf..bb9127acdf 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/fsl_assert.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/fsl_assert.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/fsl_memcpy.S b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/fsl_memcpy.S
index de2b4d674d..de2b4d674d 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/fsl_memcpy.S
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/fsl_memcpy.S
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/fsl_notifier.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/fsl_notifier.c
index 7b7c02dc3d..7b7c02dc3d 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/fsl_notifier.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/fsl_notifier.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/fsl_notifier.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/fsl_notifier.h
index d93578c13f..d93578c13f 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/fsl_notifier.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/fsl_notifier.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/fsl_sbrk.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/fsl_sbrk.c
index 55363fd59e..55363fd59e 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/fsl_sbrk.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/fsl_sbrk.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/fsl_shell.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/fsl_shell.c
index 5057050a29..5057050a29 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/fsl_shell.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/fsl_shell.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/fsl_shell.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/fsl_shell.h
index 313df41311..313df41311 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/fsl_shell.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/fsl_shell.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/incbin/fsl_incbin.S b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/incbin/fsl_incbin.S
index 99114bcb6d..99114bcb6d 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/incbin/fsl_incbin.S
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/incbin/fsl_incbin.S
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/str/fsl_str.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/str/fsl_str.c
index 1c0dccf905..1c0dccf905 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/str/fsl_str.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/str/fsl_str.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/str/fsl_str.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/str/fsl_str.h
index bf7adcc52a..bf7adcc52a 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/str/fsl_str.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/utilities/str/fsl_str.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/xip/fsl_flexspi_nor_boot.c b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/xip/fsl_flexspi_nor_boot.c
index 77489f6725..77489f6725 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/xip/fsl_flexspi_nor_boot.c
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/xip/fsl_flexspi_nor_boot.c
diff --git a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/xip/fsl_flexspi_nor_boot.h b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/xip/fsl_flexspi_nor_boot.h
index 6aeb096486..6aeb096486 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/MIMXRT1176/xip/fsl_flexspi_nor_boot.h
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/MIMXRT1176/xip/fsl_flexspi_nor_boot.h
diff --git a/bsp/imxrt/libraries/MIMXRT1170/SConscript b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/SConscript
index 2379610cc1..2379610cc1 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/SConscript
+++ b/bsp/nxp/imx/imxrt/libraries/MIMXRT1170/SConscript
diff --git a/bsp/imxrt/libraries/drivers/SConscript b/bsp/nxp/imx/imxrt/libraries/drivers/SConscript
index 233837fc36..233837fc36 100644
--- a/bsp/imxrt/libraries/drivers/SConscript
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/SConscript
diff --git a/bsp/imxrt/libraries/drivers/bsp_wm8960.c b/bsp/nxp/imx/imxrt/libraries/drivers/bsp_wm8960.c
index 54498870e6..54498870e6 100644
--- a/bsp/imxrt/libraries/drivers/bsp_wm8960.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/bsp_wm8960.c
diff --git a/bsp/imxrt/libraries/drivers/bsp_wm8960.h b/bsp/nxp/imx/imxrt/libraries/drivers/bsp_wm8960.h
index 53d217fd66..53d217fd66 100644
--- a/bsp/imxrt/libraries/drivers/bsp_wm8960.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/bsp_wm8960.h
diff --git a/bsp/imxrt/libraries/drivers/drv_adc.c b/bsp/nxp/imx/imxrt/libraries/drivers/drv_adc.c
index 519f21bfa1..519f21bfa1 100644
--- a/bsp/imxrt/libraries/drivers/drv_adc.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_adc.c
diff --git a/bsp/imxrt/libraries/drivers/drv_adc.h b/bsp/nxp/imx/imxrt/libraries/drivers/drv_adc.h
index 2aca3ca8d8..2aca3ca8d8 100644
--- a/bsp/imxrt/libraries/drivers/drv_adc.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_adc.h
diff --git a/bsp/imxrt/libraries/drivers/drv_can.c b/bsp/nxp/imx/imxrt/libraries/drivers/drv_can.c
index dc4840a22f..dc4840a22f 100644
--- a/bsp/imxrt/libraries/drivers/drv_can.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_can.c
diff --git a/bsp/imxrt/libraries/drivers/drv_can.h b/bsp/nxp/imx/imxrt/libraries/drivers/drv_can.h
index a151c8136f..a151c8136f 100644
--- a/bsp/imxrt/libraries/drivers/drv_can.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_can.h
diff --git a/bsp/imxrt/libraries/drivers/drv_common.c b/bsp/nxp/imx/imxrt/libraries/drivers/drv_common.c
index 87112ff3ae..87112ff3ae 100644
--- a/bsp/imxrt/libraries/drivers/drv_common.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_common.c
diff --git a/bsp/imxrt/libraries/drivers/drv_eth.c b/bsp/nxp/imx/imxrt/libraries/drivers/drv_eth.c
index e240b5b969..e240b5b969 100644
--- a/bsp/imxrt/libraries/drivers/drv_eth.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_eth.c
diff --git a/bsp/imxrt/libraries/drivers/drv_flexspi.c b/bsp/nxp/imx/imxrt/libraries/drivers/drv_flexspi.c
index 0cacdc75f0..0cacdc75f0 100644
--- a/bsp/imxrt/libraries/drivers/drv_flexspi.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_flexspi.c
diff --git a/bsp/imxrt/libraries/drivers/drv_gpio.c b/bsp/nxp/imx/imxrt/libraries/drivers/drv_gpio.c
index 96d1dbb118..96d1dbb118 100644
--- a/bsp/imxrt/libraries/drivers/drv_gpio.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_gpio.c
diff --git a/bsp/imxrt/libraries/drivers/drv_gpio.h b/bsp/nxp/imx/imxrt/libraries/drivers/drv_gpio.h
index 0ea8ead068..0ea8ead068 100644
--- a/bsp/imxrt/libraries/drivers/drv_gpio.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_gpio.h
diff --git a/bsp/imxrt/libraries/drivers/drv_hwtimer.c b/bsp/nxp/imx/imxrt/libraries/drivers/drv_hwtimer.c
index aae7fa7a18..aae7fa7a18 100644
--- a/bsp/imxrt/libraries/drivers/drv_hwtimer.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_hwtimer.c
diff --git a/bsp/imxrt/libraries/drivers/drv_hwtimer.h b/bsp/nxp/imx/imxrt/libraries/drivers/drv_hwtimer.h
index 22dd018347..22dd018347 100644
--- a/bsp/imxrt/libraries/drivers/drv_hwtimer.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_hwtimer.h
diff --git a/bsp/imxrt/libraries/drivers/drv_i2c.c b/bsp/nxp/imx/imxrt/libraries/drivers/drv_i2c.c
index 7210421c31..7210421c31 100644
--- a/bsp/imxrt/libraries/drivers/drv_i2c.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_i2c.c
diff --git a/bsp/imxrt/libraries/drivers/drv_i2c.h b/bsp/nxp/imx/imxrt/libraries/drivers/drv_i2c.h
index 4ed7546e79..4ed7546e79 100644
--- a/bsp/imxrt/libraries/drivers/drv_i2c.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_i2c.h
diff --git a/bsp/imxrt/libraries/drivers/drv_ksz8081.c b/bsp/nxp/imx/imxrt/libraries/drivers/drv_ksz8081.c
index 5ed5fa3b84..5ed5fa3b84 100644
--- a/bsp/imxrt/libraries/drivers/drv_ksz8081.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_ksz8081.c
diff --git a/bsp/imxrt/libraries/drivers/drv_lcd.c b/bsp/nxp/imx/imxrt/libraries/drivers/drv_lcd.c
index 3a6d7459b7..3a6d7459b7 100644
--- a/bsp/imxrt/libraries/drivers/drv_lcd.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_lcd.c
diff --git a/bsp/imxrt/libraries/drivers/drv_lcd.h b/bsp/nxp/imx/imxrt/libraries/drivers/drv_lcd.h
index b5a5c37f28..b5a5c37f28 100644
--- a/bsp/imxrt/libraries/drivers/drv_lcd.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_lcd.h
diff --git a/bsp/imxrt/libraries/drivers/drv_lcd_mipi.c b/bsp/nxp/imx/imxrt/libraries/drivers/drv_lcd_mipi.c
index 22eef69024..22eef69024 100644
--- a/bsp/imxrt/libraries/drivers/drv_lcd_mipi.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_lcd_mipi.c
diff --git a/bsp/imxrt/libraries/drivers/drv_lcd_mipi.h b/bsp/nxp/imx/imxrt/libraries/drivers/drv_lcd_mipi.h
index b5a5c37f28..b5a5c37f28 100644
--- a/bsp/imxrt/libraries/drivers/drv_lcd_mipi.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_lcd_mipi.h
diff --git a/bsp/imxrt/libraries/drivers/drv_log.h b/bsp/nxp/imx/imxrt/libraries/drivers/drv_log.h
index 2d44d4e901..2d44d4e901 100644
--- a/bsp/imxrt/libraries/drivers/drv_log.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_log.h
diff --git a/bsp/imxrt/libraries/drivers/drv_lpadc.c b/bsp/nxp/imx/imxrt/libraries/drivers/drv_lpadc.c
index 8f4f9b10be..8f4f9b10be 100644
--- a/bsp/imxrt/libraries/drivers/drv_lpadc.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_lpadc.c
diff --git a/bsp/imxrt/libraries/drivers/drv_lpadc.h b/bsp/nxp/imx/imxrt/libraries/drivers/drv_lpadc.h
index 2aca3ca8d8..2aca3ca8d8 100644
--- a/bsp/imxrt/libraries/drivers/drv_lpadc.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_lpadc.h
diff --git a/bsp/imxrt/libraries/drivers/drv_mdio.c b/bsp/nxp/imx/imxrt/libraries/drivers/drv_mdio.c
index 0c8076f237..0c8076f237 100644
--- a/bsp/imxrt/libraries/drivers/drv_mdio.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_mdio.c
diff --git a/bsp/imxrt/libraries/drivers/drv_mdio.h b/bsp/nxp/imx/imxrt/libraries/drivers/drv_mdio.h
index 5b5c8c1884..5b5c8c1884 100644
--- a/bsp/imxrt/libraries/drivers/drv_mdio.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_mdio.h
diff --git a/bsp/imxrt/libraries/drivers/drv_pulse_encoder.c b/bsp/nxp/imx/imxrt/libraries/drivers/drv_pulse_encoder.c
index 8d0e43013d..8d0e43013d 100644
--- a/bsp/imxrt/libraries/drivers/drv_pulse_encoder.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_pulse_encoder.c
diff --git a/bsp/imxrt/libraries/drivers/drv_pwm.c b/bsp/nxp/imx/imxrt/libraries/drivers/drv_pwm.c
index c73044af26..c73044af26 100644
--- a/bsp/imxrt/libraries/drivers/drv_pwm.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_pwm.c
diff --git a/bsp/imxrt/libraries/drivers/drv_pwm.h b/bsp/nxp/imx/imxrt/libraries/drivers/drv_pwm.h
index 264d464e76..264d464e76 100644
--- a/bsp/imxrt/libraries/drivers/drv_pwm.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_pwm.h
diff --git a/bsp/imxrt/libraries/drivers/drv_rtc.c b/bsp/nxp/imx/imxrt/libraries/drivers/drv_rtc.c
index e958c363e1..e958c363e1 100644
--- a/bsp/imxrt/libraries/drivers/drv_rtc.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_rtc.c
diff --git a/bsp/imxrt/libraries/drivers/drv_rtc.h b/bsp/nxp/imx/imxrt/libraries/drivers/drv_rtc.h
index 7a3b2aaadf..7a3b2aaadf 100644
--- a/bsp/imxrt/libraries/drivers/drv_rtc.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_rtc.h
diff --git a/bsp/imxrt/libraries/drivers/drv_rtl8211f.c b/bsp/nxp/imx/imxrt/libraries/drivers/drv_rtl8211f.c
index 43e50c7eb9..43e50c7eb9 100644
--- a/bsp/imxrt/libraries/drivers/drv_rtl8211f.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_rtl8211f.c
diff --git a/bsp/imxrt/libraries/drivers/drv_sai.c b/bsp/nxp/imx/imxrt/libraries/drivers/drv_sai.c
index 98c8a99bc7..98c8a99bc7 100644
--- a/bsp/imxrt/libraries/drivers/drv_sai.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_sai.c
diff --git a/bsp/imxrt/libraries/drivers/drv_sai.h b/bsp/nxp/imx/imxrt/libraries/drivers/drv_sai.h
index 6033fd6684..6033fd6684 100644
--- a/bsp/imxrt/libraries/drivers/drv_sai.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_sai.h
diff --git a/bsp/imxrt/libraries/drivers/drv_sdio.c b/bsp/nxp/imx/imxrt/libraries/drivers/drv_sdio.c
index 2a900f3892..2a900f3892 100644
--- a/bsp/imxrt/libraries/drivers/drv_sdio.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_sdio.c
diff --git a/bsp/imxrt/libraries/drivers/drv_sdram.c b/bsp/nxp/imx/imxrt/libraries/drivers/drv_sdram.c
index 25b7169dbc..25b7169dbc 100644
--- a/bsp/imxrt/libraries/drivers/drv_sdram.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_sdram.c
diff --git a/bsp/imxrt/libraries/drivers/drv_sdram.h b/bsp/nxp/imx/imxrt/libraries/drivers/drv_sdram.h
index 49a111bd76..49a111bd76 100644
--- a/bsp/imxrt/libraries/drivers/drv_sdram.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_sdram.h
diff --git a/bsp/imxrt/libraries/drivers/drv_spi.c b/bsp/nxp/imx/imxrt/libraries/drivers/drv_spi.c
index b53e45a0b5..b53e45a0b5 100644
--- a/bsp/imxrt/libraries/drivers/drv_spi.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_spi.c
diff --git a/bsp/imxrt/libraries/drivers/drv_spi.h b/bsp/nxp/imx/imxrt/libraries/drivers/drv_spi.h
index c0667709ac..c0667709ac 100644
--- a/bsp/imxrt/libraries/drivers/drv_spi.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_spi.h
diff --git a/bsp/imxrt/libraries/drivers/drv_uart.c b/bsp/nxp/imx/imxrt/libraries/drivers/drv_uart.c
index 3160e870b4..3160e870b4 100644
--- a/bsp/imxrt/libraries/drivers/drv_uart.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_uart.c
diff --git a/bsp/imxrt/libraries/drivers/drv_uart.h b/bsp/nxp/imx/imxrt/libraries/drivers/drv_uart.h
index f4ca385e69..f4ca385e69 100644
--- a/bsp/imxrt/libraries/drivers/drv_uart.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_uart.h
diff --git a/bsp/imxrt/libraries/drivers/drv_usbd.c b/bsp/nxp/imx/imxrt/libraries/drivers/drv_usbd.c
index d14c1a2548..d14c1a2548 100644
--- a/bsp/imxrt/libraries/drivers/drv_usbd.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_usbd.c
diff --git a/bsp/imxrt/libraries/drivers/drv_usbh.c b/bsp/nxp/imx/imxrt/libraries/drivers/drv_usbh.c
index 7175a62dff..7175a62dff 100644
--- a/bsp/imxrt/libraries/drivers/drv_usbh.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_usbh.c
diff --git a/bsp/imxrt/libraries/drivers/drv_usbh.h b/bsp/nxp/imx/imxrt/libraries/drivers/drv_usbh.h
index ab2801e904..ab2801e904 100644
--- a/bsp/imxrt/libraries/drivers/drv_usbh.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_usbh.h
diff --git a/bsp/imxrt/libraries/drivers/drv_wdt.c b/bsp/nxp/imx/imxrt/libraries/drivers/drv_wdt.c
index 9c5b46313c..9c5b46313c 100644
--- a/bsp/imxrt/libraries/drivers/drv_wdt.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_wdt.c
diff --git a/bsp/imxrt/libraries/drivers/drv_wdt.h b/bsp/nxp/imx/imxrt/libraries/drivers/drv_wdt.h
index 7f4a5fd31f..7f4a5fd31f 100644
--- a/bsp/imxrt/libraries/drivers/drv_wdt.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/drv_wdt.h
diff --git a/bsp/imxrt/libraries/drivers/usb/device/usb_device.h b/bsp/nxp/imx/imxrt/libraries/drivers/usb/device/usb_device.h
index dc12f0249a..dc12f0249a 100644
--- a/bsp/imxrt/libraries/drivers/usb/device/usb_device.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/usb/device/usb_device.h
diff --git a/bsp/imxrt/libraries/drivers/usb/device/usb_device_dci.c b/bsp/nxp/imx/imxrt/libraries/drivers/usb/device/usb_device_dci.c
index 7a9e0d305f..7a9e0d305f 100644
--- a/bsp/imxrt/libraries/drivers/usb/device/usb_device_dci.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/usb/device/usb_device_dci.c
diff --git a/bsp/imxrt/libraries/drivers/usb/device/usb_device_dci.h b/bsp/nxp/imx/imxrt/libraries/drivers/usb/device/usb_device_dci.h
index fd4fdceb04..fd4fdceb04 100644
--- a/bsp/imxrt/libraries/drivers/usb/device/usb_device_dci.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/usb/device/usb_device_dci.h
diff --git a/bsp/imxrt/libraries/drivers/usb/device/usb_device_ehci.c b/bsp/nxp/imx/imxrt/libraries/drivers/usb/device/usb_device_ehci.c
index dd7780c772..dd7780c772 100644
--- a/bsp/imxrt/libraries/drivers/usb/device/usb_device_ehci.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/usb/device/usb_device_ehci.c
diff --git a/bsp/imxrt/libraries/drivers/usb/device/usb_device_ehci.h b/bsp/nxp/imx/imxrt/libraries/drivers/usb/device/usb_device_ehci.h
index 869e063263..869e063263 100644
--- a/bsp/imxrt/libraries/drivers/usb/device/usb_device_ehci.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/usb/device/usb_device_ehci.h
diff --git a/bsp/imxrt/libraries/drivers/usb/host/usb_host.h b/bsp/nxp/imx/imxrt/libraries/drivers/usb/host/usb_host.h
index 3f9a5a4b20..3f9a5a4b20 100644
--- a/bsp/imxrt/libraries/drivers/usb/host/usb_host.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/usb/host/usb_host.h
diff --git a/bsp/imxrt/libraries/drivers/usb/host/usb_host_devices.c b/bsp/nxp/imx/imxrt/libraries/drivers/usb/host/usb_host_devices.c
index 4692f10ed1..4692f10ed1 100644
--- a/bsp/imxrt/libraries/drivers/usb/host/usb_host_devices.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/usb/host/usb_host_devices.c
diff --git a/bsp/imxrt/libraries/drivers/usb/host/usb_host_devices.h b/bsp/nxp/imx/imxrt/libraries/drivers/usb/host/usb_host_devices.h
index 84d5497c9f..84d5497c9f 100644
--- a/bsp/imxrt/libraries/drivers/usb/host/usb_host_devices.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/usb/host/usb_host_devices.h
diff --git a/bsp/imxrt/libraries/drivers/usb/host/usb_host_ehci.c b/bsp/nxp/imx/imxrt/libraries/drivers/usb/host/usb_host_ehci.c
index 6696f54cf6..6696f54cf6 100644
--- a/bsp/imxrt/libraries/drivers/usb/host/usb_host_ehci.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/usb/host/usb_host_ehci.c
diff --git a/bsp/imxrt/libraries/drivers/usb/host/usb_host_ehci.h b/bsp/nxp/imx/imxrt/libraries/drivers/usb/host/usb_host_ehci.h
index f45ca9eb71..f45ca9eb71 100644
--- a/bsp/imxrt/libraries/drivers/usb/host/usb_host_ehci.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/usb/host/usb_host_ehci.h
diff --git a/bsp/imxrt/libraries/drivers/usb/host/usb_host_framework.c b/bsp/nxp/imx/imxrt/libraries/drivers/usb/host/usb_host_framework.c
index b45612289d..b45612289d 100644
--- a/bsp/imxrt/libraries/drivers/usb/host/usb_host_framework.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/usb/host/usb_host_framework.c
diff --git a/bsp/imxrt/libraries/drivers/usb/host/usb_host_framework.h b/bsp/nxp/imx/imxrt/libraries/drivers/usb/host/usb_host_framework.h
index 53f618fdc3..53f618fdc3 100644
--- a/bsp/imxrt/libraries/drivers/usb/host/usb_host_framework.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/usb/host/usb_host_framework.h
diff --git a/bsp/imxrt/libraries/drivers/usb/host/usb_host_hci.c b/bsp/nxp/imx/imxrt/libraries/drivers/usb/host/usb_host_hci.c
index e7dd0e2bae..e7dd0e2bae 100644
--- a/bsp/imxrt/libraries/drivers/usb/host/usb_host_hci.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/usb/host/usb_host_hci.c
diff --git a/bsp/imxrt/libraries/drivers/usb/host/usb_host_hci.h b/bsp/nxp/imx/imxrt/libraries/drivers/usb/host/usb_host_hci.h
index c1450dde38..c1450dde38 100644
--- a/bsp/imxrt/libraries/drivers/usb/host/usb_host_hci.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/usb/host/usb_host_hci.h
diff --git a/bsp/imxrt/libraries/drivers/usb/include/usb.h b/bsp/nxp/imx/imxrt/libraries/drivers/usb/include/usb.h
index be3c91f0b5..be3c91f0b5 100644
--- a/bsp/imxrt/libraries/drivers/usb/include/usb.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/usb/include/usb.h
diff --git a/bsp/imxrt/libraries/drivers/usb/include/usb_device_config.h b/bsp/nxp/imx/imxrt/libraries/drivers/usb/include/usb_device_config.h
index 551d92edc7..551d92edc7 100644
--- a/bsp/imxrt/libraries/drivers/usb/include/usb_device_config.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/usb/include/usb_device_config.h
diff --git a/bsp/imxrt/libraries/drivers/usb/include/usb_ehci.h b/bsp/nxp/imx/imxrt/libraries/drivers/usb/include/usb_ehci.h
index edc3496643..edc3496643 100644
--- a/bsp/imxrt/libraries/drivers/usb/include/usb_ehci.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/usb/include/usb_ehci.h
diff --git a/bsp/imxrt/libraries/drivers/usb/include/usb_host_config.h b/bsp/nxp/imx/imxrt/libraries/drivers/usb/include/usb_host_config.h
index 60c8a6cce5..60c8a6cce5 100644
--- a/bsp/imxrt/libraries/drivers/usb/include/usb_host_config.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/usb/include/usb_host_config.h
diff --git a/bsp/imxrt/libraries/drivers/usb/include/usb_misc.h b/bsp/nxp/imx/imxrt/libraries/drivers/usb/include/usb_misc.h
index df12d6cd1d..df12d6cd1d 100644
--- a/bsp/imxrt/libraries/drivers/usb/include/usb_misc.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/usb/include/usb_misc.h
diff --git a/bsp/imxrt/libraries/drivers/usb/include/usb_spec.h b/bsp/nxp/imx/imxrt/libraries/drivers/usb/include/usb_spec.h
index 7b93e1c6d7..7b93e1c6d7 100644
--- a/bsp/imxrt/libraries/drivers/usb/include/usb_spec.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/usb/include/usb_spec.h
diff --git a/bsp/imxrt/libraries/drivers/usb/phy/usb_phy.c b/bsp/nxp/imx/imxrt/libraries/drivers/usb/phy/usb_phy.c
index aa3fb98c11..aa3fb98c11 100644
--- a/bsp/imxrt/libraries/drivers/usb/phy/usb_phy.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/usb/phy/usb_phy.c
diff --git a/bsp/imxrt/libraries/drivers/usb/phy/usb_phy.h b/bsp/nxp/imx/imxrt/libraries/drivers/usb/phy/usb_phy.h
index 8487e9f4ee..8487e9f4ee 100644
--- a/bsp/imxrt/libraries/drivers/usb/phy/usb_phy.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/usb/phy/usb_phy.h
diff --git a/bsp/imxrt/libraries/drivers/vglite/VGLite/rtos/vg_lite_os.c b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/VGLite/rtos/vg_lite_os.c
index fc91185b60..fc91185b60 100644
--- a/bsp/imxrt/libraries/drivers/vglite/VGLite/rtos/vg_lite_os.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/VGLite/rtos/vg_lite_os.c
diff --git a/bsp/imxrt/libraries/drivers/vglite/VGLite/rtos/vg_lite_os.h b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/VGLite/rtos/vg_lite_os.h
index aef7d0f66f..aef7d0f66f 100644
--- a/bsp/imxrt/libraries/drivers/vglite/VGLite/rtos/vg_lite_os.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/VGLite/rtos/vg_lite_os.h
diff --git a/bsp/imxrt/libraries/drivers/vglite/VGLite/vg_lite.c b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/VGLite/vg_lite.c
index e51b0edb3d..e51b0edb3d 100644
--- a/bsp/imxrt/libraries/drivers/vglite/VGLite/vg_lite.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/VGLite/vg_lite.c
diff --git a/bsp/imxrt/libraries/drivers/vglite/VGLite/vg_lite_flat.c b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/VGLite/vg_lite_flat.c
index 1ebfd0a189..1ebfd0a189 100644
--- a/bsp/imxrt/libraries/drivers/vglite/VGLite/vg_lite_flat.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/VGLite/vg_lite_flat.c
diff --git a/bsp/imxrt/libraries/drivers/vglite/VGLite/vg_lite_flat.h b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/VGLite/vg_lite_flat.h
index e0b4024756..e0b4024756 100644
--- a/bsp/imxrt/libraries/drivers/vglite/VGLite/vg_lite_flat.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/VGLite/vg_lite_flat.h
diff --git a/bsp/imxrt/libraries/drivers/vglite/VGLite/vg_lite_image.c b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/VGLite/vg_lite_image.c
index 136524336b..136524336b 100644
--- a/bsp/imxrt/libraries/drivers/vglite/VGLite/vg_lite_image.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/VGLite/vg_lite_image.c
diff --git a/bsp/imxrt/libraries/drivers/vglite/VGLite/vg_lite_matrix.c b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/VGLite/vg_lite_matrix.c
index 2411ab0ed0..2411ab0ed0 100644
--- a/bsp/imxrt/libraries/drivers/vglite/VGLite/vg_lite_matrix.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/VGLite/vg_lite_matrix.c
diff --git a/bsp/imxrt/libraries/drivers/vglite/VGLite/vg_lite_path.c b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/VGLite/vg_lite_path.c
index c69c6bc05b..c69c6bc05b 100644
--- a/bsp/imxrt/libraries/drivers/vglite/VGLite/vg_lite_path.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/VGLite/vg_lite_path.c
diff --git a/bsp/imxrt/libraries/drivers/vglite/VGLiteKernel/rtos/vg_lite_hal.c b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/VGLiteKernel/rtos/vg_lite_hal.c
index 729f11282f..729f11282f 100644
--- a/bsp/imxrt/libraries/drivers/vglite/VGLiteKernel/rtos/vg_lite_hal.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/VGLiteKernel/rtos/vg_lite_hal.c
diff --git a/bsp/imxrt/libraries/drivers/vglite/VGLiteKernel/rtos/vg_lite_platform.h b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/VGLiteKernel/rtos/vg_lite_platform.h
index 03bf2484e6..03bf2484e6 100644
--- a/bsp/imxrt/libraries/drivers/vglite/VGLiteKernel/rtos/vg_lite_platform.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/VGLiteKernel/rtos/vg_lite_platform.h
diff --git a/bsp/imxrt/libraries/drivers/vglite/VGLiteKernel/vg_lite_hw.h b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/VGLiteKernel/vg_lite_hw.h
index 2603119d99..2603119d99 100644
--- a/bsp/imxrt/libraries/drivers/vglite/VGLiteKernel/vg_lite_hw.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/VGLiteKernel/vg_lite_hw.h
diff --git a/bsp/imxrt/libraries/drivers/vglite/VGLiteKernel/vg_lite_kernel.c b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/VGLiteKernel/vg_lite_kernel.c
index a0d5d7e816..a0d5d7e816 100644
--- a/bsp/imxrt/libraries/drivers/vglite/VGLiteKernel/vg_lite_kernel.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/VGLiteKernel/vg_lite_kernel.c
diff --git a/bsp/imxrt/libraries/drivers/vglite/VGLiteKernel/vg_lite_kernel.h b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/VGLiteKernel/vg_lite_kernel.h
index 39a9c14ffb..39a9c14ffb 100644
--- a/bsp/imxrt/libraries/drivers/vglite/VGLiteKernel/vg_lite_kernel.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/VGLiteKernel/vg_lite_kernel.h
diff --git a/bsp/imxrt/libraries/drivers/vglite/elementary/inc/Elm.h b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/elementary/inc/Elm.h
index cb8c91f435..cb8c91f435 100644
--- a/bsp/imxrt/libraries/drivers/vglite/elementary/inc/Elm.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/elementary/inc/Elm.h
diff --git a/bsp/imxrt/libraries/drivers/vglite/elementary/src/elm_buffer.c b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/elementary/src/elm_buffer.c
index 4759b5ec64..4759b5ec64 100644
--- a/bsp/imxrt/libraries/drivers/vglite/elementary/src/elm_buffer.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/elementary/src/elm_buffer.c
diff --git a/bsp/imxrt/libraries/drivers/vglite/elementary/src/elm_draw.c b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/elementary/src/elm_draw.c
index a0ce85f096..a0ce85f096 100644
--- a/bsp/imxrt/libraries/drivers/vglite/elementary/src/elm_draw.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/elementary/src/elm_draw.c
diff --git a/bsp/imxrt/libraries/drivers/vglite/elementary/src/elm_headers.h b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/elementary/src/elm_headers.h
index 70937c8ad0..70937c8ad0 100644
--- a/bsp/imxrt/libraries/drivers/vglite/elementary/src/elm_headers.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/elementary/src/elm_headers.h
diff --git a/bsp/imxrt/libraries/drivers/vglite/elementary/src/elm_init.c b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/elementary/src/elm_init.c
index 3c5f1688b8..3c5f1688b8 100644
--- a/bsp/imxrt/libraries/drivers/vglite/elementary/src/elm_init.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/elementary/src/elm_init.c
diff --git a/bsp/imxrt/libraries/drivers/vglite/elementary/src/elm_object.c b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/elementary/src/elm_object.c
index 742bc14c76..742bc14c76 100644
--- a/bsp/imxrt/libraries/drivers/vglite/elementary/src/elm_object.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/elementary/src/elm_object.c
diff --git a/bsp/imxrt/libraries/drivers/vglite/elementary/src/elm_os.c b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/elementary/src/elm_os.c
index b2415fa875..b2415fa875 100644
--- a/bsp/imxrt/libraries/drivers/vglite/elementary/src/elm_os.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/elementary/src/elm_os.c
diff --git a/bsp/imxrt/libraries/drivers/vglite/elementary/src/elm_os.h b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/elementary/src/elm_os.h
index fb3a0607bb..fb3a0607bb 100644
--- a/bsp/imxrt/libraries/drivers/vglite/elementary/src/elm_os.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/elementary/src/elm_os.h
diff --git a/bsp/imxrt/libraries/drivers/vglite/elementary/src/elm_precom.h b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/elementary/src/elm_precom.h
index 0ef71a34e8..0ef71a34e8 100644
--- a/bsp/imxrt/libraries/drivers/vglite/elementary/src/elm_precom.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/elementary/src/elm_precom.h
diff --git a/bsp/imxrt/libraries/drivers/vglite/elementary/src/elm_text.c b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/elementary/src/elm_text.c
index 0e7bf06e27..0e7bf06e27 100644
--- a/bsp/imxrt/libraries/drivers/vglite/elementary/src/elm_text.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/elementary/src/elm_text.c
diff --git a/bsp/imxrt/libraries/drivers/vglite/elementary/src/elm_text.h b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/elementary/src/elm_text.h
index f5df74c67b..f5df74c67b 100644
--- a/bsp/imxrt/libraries/drivers/vglite/elementary/src/elm_text.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/elementary/src/elm_text.h
diff --git a/bsp/imxrt/libraries/drivers/vglite/elementary/src/velm.h b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/elementary/src/velm.h
index 6c0beab8b8..6c0beab8b8 100644
--- a/bsp/imxrt/libraries/drivers/vglite/elementary/src/velm.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/elementary/src/velm.h
diff --git a/bsp/imxrt/libraries/drivers/vglite/font/buf_reader.c b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/buf_reader.c
index 7fa832c6f5..7fa832c6f5 100644
--- a/bsp/imxrt/libraries/drivers/vglite/font/buf_reader.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/buf_reader.c
diff --git a/bsp/imxrt/libraries/drivers/vglite/font/buf_reader.h b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/buf_reader.h
index 85c5247ce2..85c5247ce2 100644
--- a/bsp/imxrt/libraries/drivers/vglite/font/buf_reader.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/buf_reader.h
diff --git a/bsp/imxrt/libraries/drivers/vglite/font/fonts.h b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/fonts.h
index 40ebe2734e..40ebe2734e 100644
--- a/bsp/imxrt/libraries/drivers/vglite/font/fonts.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/fonts.h
diff --git a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mcufont.h b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mcufont.h
index 8a81ff42e7..8a81ff42e7 100644
--- a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mcufont.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mcufont.h
diff --git a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_bwfont.c b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_bwfont.c
index 95e9b86e87..95e9b86e87 100644
--- a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_bwfont.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_bwfont.c
diff --git a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_bwfont.h b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_bwfont.h
index 94be3452a5..94be3452a5 100644
--- a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_bwfont.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_bwfont.h
diff --git a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_config.h b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_config.h
index 681ff8ba87..681ff8ba87 100644
--- a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_config.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_config.h
diff --git a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_encoding.c b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_encoding.c
index c96a8d3a17..c96a8d3a17 100644
--- a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_encoding.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_encoding.c
diff --git a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_encoding.h b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_encoding.h
index f43538113a..f43538113a 100644
--- a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_encoding.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_encoding.h
diff --git a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_font.c b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_font.c
index 9453939a4b..9453939a4b 100644
--- a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_font.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_font.c
diff --git a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_font.h b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_font.h
index f0190005f9..f0190005f9 100644
--- a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_font.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_font.h
diff --git a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_justify.c b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_justify.c
index def9be05c4..def9be05c4 100644
--- a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_justify.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_justify.c
diff --git a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_justify.h b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_justify.h
index c3e8ba75ef..c3e8ba75ef 100644
--- a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_justify.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_justify.h
diff --git a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_kerning.c b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_kerning.c
index cc6e392c24..cc6e392c24 100644
--- a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_kerning.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_kerning.c
diff --git a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_kerning.h b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_kerning.h
index a7dcecca4a..a7dcecca4a 100644
--- a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_kerning.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_kerning.h
diff --git a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_rlefont.c b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_rlefont.c
index d45d720962..d45d720962 100644
--- a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_rlefont.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_rlefont.c
diff --git a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_rlefont.h b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_rlefont.h
index d26691b18e..d26691b18e 100644
--- a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_rlefont.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_rlefont.h
diff --git a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_scaledfont.c b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_scaledfont.c
index 132016a9d8..132016a9d8 100644
--- a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_scaledfont.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_scaledfont.c
diff --git a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_scaledfont.h b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_scaledfont.h
index 7756591d6c..7756591d6c 100644
--- a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_scaledfont.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_scaledfont.h
diff --git a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_wordwrap.c b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_wordwrap.c
index 1d7bfe1317..1d7bfe1317 100644
--- a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_wordwrap.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_wordwrap.c
diff --git a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_wordwrap.h b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_wordwrap.h
index 521f4cf636..521f4cf636 100644
--- a/bsp/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_wordwrap.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/mcufont/decoder/mf_wordwrap.h
diff --git a/bsp/imxrt/libraries/drivers/vglite/font/rle_font_read.c b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/rle_font_read.c
index 05f27c8f6e..05f27c8f6e 100644
--- a/bsp/imxrt/libraries/drivers/vglite/font/rle_font_read.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/rle_font_read.c
diff --git a/bsp/imxrt/libraries/drivers/vglite/font/vft_debug.c b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/vft_debug.c
index 458dc51f75..458dc51f75 100644
--- a/bsp/imxrt/libraries/drivers/vglite/font/vft_debug.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/vft_debug.c
diff --git a/bsp/imxrt/libraries/drivers/vglite/font/vft_debug.h b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/vft_debug.h
index 7710b2a4ab..7710b2a4ab 100644
--- a/bsp/imxrt/libraries/drivers/vglite/font/vft_debug.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/vft_debug.h
diff --git a/bsp/imxrt/libraries/drivers/vglite/font/vft_draw.c b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/vft_draw.c
index 6c17192083..6c17192083 100644
--- a/bsp/imxrt/libraries/drivers/vglite/font/vft_draw.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/vft_draw.c
diff --git a/bsp/imxrt/libraries/drivers/vglite/font/vft_draw.h b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/vft_draw.h
index 716b777a1c..716b777a1c 100644
--- a/bsp/imxrt/libraries/drivers/vglite/font/vft_draw.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/vft_draw.h
diff --git a/bsp/imxrt/libraries/drivers/vglite/font/vg_lite_text.c b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/vg_lite_text.c
index 57dd8e12e0..57dd8e12e0 100644
--- a/bsp/imxrt/libraries/drivers/vglite/font/vg_lite_text.c
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/font/vg_lite_text.c
diff --git a/bsp/imxrt/libraries/drivers/vglite/inc/vg_lite.h b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/inc/vg_lite.h
index 3c952deca2..3c952deca2 100644
--- a/bsp/imxrt/libraries/drivers/vglite/inc/vg_lite.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/inc/vg_lite.h
diff --git a/bsp/imxrt/libraries/drivers/vglite/inc/vg_lite_hal.h b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/inc/vg_lite_hal.h
index b4cd3e3418..b4cd3e3418 100644
--- a/bsp/imxrt/libraries/drivers/vglite/inc/vg_lite_hal.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/inc/vg_lite_hal.h
diff --git a/bsp/imxrt/libraries/drivers/vglite/inc/vg_lite_text.h b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/inc/vg_lite_text.h
index 3c519b1e56..3c519b1e56 100644
--- a/bsp/imxrt/libraries/drivers/vglite/inc/vg_lite_text.h
+++ b/bsp/nxp/imx/imxrt/libraries/drivers/vglite/inc/vg_lite_text.h
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/.config b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/.config
index 535d811918..535d811918 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/.config
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/.config
diff --git a/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/Kconfig b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/Kconfig
new file mode 100644
index 0000000000..db456f310b
--- /dev/null
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/Kconfig
@@ -0,0 +1,16 @@
+mainmenu "RT-Thread Configuration"
+
+config RTT_DIR
+    string
+    option env="RTT_ROOT"
+    default "../../../../.."
+
+config PKGS_DIR
+    string
+    option env="PKGS_ROOT"
+    default "packages"
+
+source "$RTT_DIR/Kconfig"
+source "$PKGS_DIR/Kconfig"
+source "../libraries/Kconfig"
+source "board/Kconfig"
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/README.md b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/README.md
index 476a9528f2..476a9528f2 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/README.md
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/README.md
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/SConscript b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/SConscript
index c7ef7659ec..c7ef7659ec 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/SConscript
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/SConscript
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/SConstruct b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/SConstruct
index e4b3f6c66a..71cd6e9c0b 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/SConstruct
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/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:
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/applications/SConscript b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/applications/SConscript
index 9efbc795ab..9efbc795ab 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/applications/SConscript
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/applications/SConscript
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/applications/main.c b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/applications/main.c
index cac77214c1..cac77214c1 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/applications/main.c
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/applications/main.c
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/board/Kconfig b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/board/Kconfig
index 33e35d2ac5..33e35d2ac5 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/board/Kconfig
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/board/Kconfig
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/board/MCUX_Config/MCUX_Config.mex b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/board/MCUX_Config/MCUX_Config.mex
index e63eb0c204..e63eb0c204 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/board/MCUX_Config/MCUX_Config.mex
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/board/MCUX_Config/MCUX_Config.mex
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/board/MCUX_Config/clock_config.c b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/board/MCUX_Config/clock_config.c
index 87b20a1e25..87b20a1e25 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/board/MCUX_Config/clock_config.c
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/board/MCUX_Config/clock_config.c
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/board/MCUX_Config/clock_config.h b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/board/MCUX_Config/clock_config.h
index 43fbb9d805..43fbb9d805 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/board/MCUX_Config/clock_config.h
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/board/MCUX_Config/clock_config.h
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/board/MCUX_Config/pin_mux.c b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/board/MCUX_Config/pin_mux.c
index 488525497e..488525497e 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/board/MCUX_Config/pin_mux.c
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/board/MCUX_Config/pin_mux.c
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/board/MCUX_Config/pin_mux.h b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/board/MCUX_Config/pin_mux.h
index bf1f2be8bd..bf1f2be8bd 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/board/MCUX_Config/pin_mux.h
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/board/MCUX_Config/pin_mux.h
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/board/SConscript b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/board/SConscript
index 82349a3dba..82349a3dba 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/board/SConscript
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/board/SConscript
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/board/board.c b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/board/board.c
index 53fc078d10..53fc078d10 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/board/board.c
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/board/board.c
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/board/board.h b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/board/board.h
index 180a2c6f69..180a2c6f69 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/board/board.h
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/board/board.h
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/board/linker_scripts/link.icf b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/board/linker_scripts/link.icf
index a022ded1d6..a022ded1d6 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/board/linker_scripts/link.icf
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/board/linker_scripts/link.icf
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/board/linker_scripts/link.lds b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/board/linker_scripts/link.lds
index d2f73ebaf0..d2f73ebaf0 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/board/linker_scripts/link.lds
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/board/linker_scripts/link.lds
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/board/linker_scripts/link.sct b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/board/linker_scripts/link.sct
index f7ceb52456..f7ceb52456 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/board/linker_scripts/link.sct
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/board/linker_scripts/link.sct
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/figures/board.png b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/figures/board.png
index 91918bfd37..91918bfd37 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/figures/board.png
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/figures/board.png
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/project.ewd b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/project.ewd
index 55328e709c..55328e709c 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/project.ewd
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/project.ewd
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/project.ewp b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/project.ewp
index f5a716af31..f5a716af31 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/project.ewp
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/project.ewp
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/project.eww b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/project.eww
index c2cb02eb1e..c2cb02eb1e 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/project.eww
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/project.eww
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/project.uvoptx b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/project.uvoptx
index c1f392aa34..c1f392aa34 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/project.uvoptx
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/project.uvoptx
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/project.uvprojx b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/project.uvprojx
index e15669351d..e15669351d 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/project.uvprojx
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/project.uvprojx
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/rtconfig.h b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/rtconfig.h
index f949e22c83..f949e22c83 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/rtconfig.h
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/rtconfig.h
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/rtconfig.py b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/rtconfig.py
index c1dd7ae2bb..c1dd7ae2bb 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/rtconfig.py
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/rtconfig.py
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/template.ewd b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/template.ewd
index 1bccb036b3..1bccb036b3 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/template.ewd
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/template.ewd
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/template.ewp b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/template.ewp
index fb890850d1..fb890850d1 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/template.ewp
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/template.ewp
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/template.ewt b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/template.ewt
index 1201d37c24..1201d37c24 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/template.ewt
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/template.ewt
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/template.eww b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/template.eww
index bd036bb4c9..bd036bb4c9 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/template.eww
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/template.eww
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/template.uvoptx b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/template.uvoptx
index 75f90396bc..75f90396bc 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/template.uvoptx
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/template.uvoptx
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/template.uvprojx b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/template.uvprojx
index 80381b5045..80381b5045 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/template.uvprojx
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1050xxx/template.uvprojx
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/.config b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/.config
index cb1a0c6508..cb1a0c6508 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/.config
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/.config
diff --git a/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/Kconfig b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/Kconfig
new file mode 100644
index 0000000000..db456f310b
--- /dev/null
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/Kconfig
@@ -0,0 +1,16 @@
+mainmenu "RT-Thread Configuration"
+
+config RTT_DIR
+    string
+    option env="RTT_ROOT"
+    default "../../../../.."
+
+config PKGS_DIR
+    string
+    option env="PKGS_ROOT"
+    default "packages"
+
+source "$RTT_DIR/Kconfig"
+source "$PKGS_DIR/Kconfig"
+source "../libraries/Kconfig"
+source "board/Kconfig"
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/MIMXRT1064EVK-TOP.jpg b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/MIMXRT1064EVK-TOP.jpg
index 772df7df2d..772df7df2d 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/MIMXRT1064EVK-TOP.jpg
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/MIMXRT1064EVK-TOP.jpg
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/README.md b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/README.md
index 8046410d43..8046410d43 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/README.md
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/README.md
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/SConscript b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/SConscript
index c7ef7659ec..c7ef7659ec 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/SConscript
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/SConscript
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/SConstruct b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/SConstruct
index e5611ff1e6..90a9120a52 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/SConstruct
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/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:
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/applications/SConscript b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/applications/SConscript
index 9efbc795ab..9efbc795ab 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/applications/SConscript
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/applications/SConscript
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/applications/main.c b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/applications/main.c
index 2095c10651..2095c10651 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/applications/main.c
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/applications/main.c
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/board/Kconfig b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/board/Kconfig
index 7bfd46cf4b..7bfd46cf4b 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/board/Kconfig
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/board/Kconfig
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/board/MCUX_Config/MCUX_Config.mex b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/board/MCUX_Config/MCUX_Config.mex
index e6194441dc..e6194441dc 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/board/MCUX_Config/MCUX_Config.mex
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/board/MCUX_Config/MCUX_Config.mex
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/board/MCUX_Config/clock_config.c b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/board/MCUX_Config/clock_config.c
index 88dc4624c3..88dc4624c3 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/board/MCUX_Config/clock_config.c
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/board/MCUX_Config/clock_config.c
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/board/MCUX_Config/clock_config.h b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/board/MCUX_Config/clock_config.h
index 96129972d3..96129972d3 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/board/MCUX_Config/clock_config.h
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/board/MCUX_Config/clock_config.h
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/board/MCUX_Config/pin_mux.c b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/board/MCUX_Config/pin_mux.c
index d484af62a5..d484af62a5 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/board/MCUX_Config/pin_mux.c
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/board/MCUX_Config/pin_mux.c
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/board/MCUX_Config/pin_mux.h b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/board/MCUX_Config/pin_mux.h
index 736e3bed18..736e3bed18 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/board/MCUX_Config/pin_mux.h
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/board/MCUX_Config/pin_mux.h
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/board/SConscript b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/board/SConscript
index 4776fd97a1..4776fd97a1 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/board/SConscript
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/board/SConscript
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/board/board.c b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/board/board.c
index 23d3c088aa..23d3c088aa 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/board/board.c
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/board/board.c
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/board/board.h b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/board/board.h
index 8ef5219bd1..8ef5219bd1 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/board/board.h
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/board/board.h
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/board/linker_scripts/link.icf b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/board/linker_scripts/link.icf
index 5555cd099a..5555cd099a 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/board/linker_scripts/link.icf
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/board/linker_scripts/link.icf
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/board/linker_scripts/link.lds b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/board/linker_scripts/link.lds
index 169a2d310a..169a2d310a 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/board/linker_scripts/link.lds
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/board/linker_scripts/link.lds
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/board/linker_scripts/link.sct b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/board/linker_scripts/link.sct
index d179e6093f..d179e6093f 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/board/linker_scripts/link.sct
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/board/linker_scripts/link.sct
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/project.ewd b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/project.ewd
index 9eeda70599..9eeda70599 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/project.ewd
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/project.ewd
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/project.ewp b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/project.ewp
index 2a6b63a8a6..2a6b63a8a6 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/project.ewp
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/project.ewp
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/project.eww b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/project.eww
index c2cb02eb1e..c2cb02eb1e 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/project.eww
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/project.eww
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/project.uvoptx b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/project.uvoptx
index c4218d5d92..c4218d5d92 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/project.uvoptx
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/project.uvoptx
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/project.uvprojx b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/project.uvprojx
index 9874343b6b..9874343b6b 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/project.uvprojx
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/project.uvprojx
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/rtconfig.h b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/rtconfig.h
index 1aa2ca4194..1aa2ca4194 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/rtconfig.h
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/rtconfig.h
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/rtconfig.py b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/rtconfig.py
index 331106dac0..331106dac0 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/rtconfig.py
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/rtconfig.py
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/template.ewd b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/template.ewd
index 1bccb036b3..1bccb036b3 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/template.ewd
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/template.ewd
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/template.ewp b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/template.ewp
index fb890850d1..fb890850d1 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/template.ewp
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/template.ewp
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/template.ewt b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/template.ewt
index 1201d37c24..1201d37c24 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/template.ewt
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/template.ewt
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/template.eww b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/template.eww
index bd036bb4c9..bd036bb4c9 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/template.eww
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/template.eww
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/template.uvoptx b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/template.uvoptx
index 4ee900f061..4ee900f061 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/template.uvoptx
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/template.uvoptx
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/template.uvprojx b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/template.uvprojx
index 3a58534550..3a58534550 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/template.uvprojx
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/template.uvprojx
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/xip/SConscript b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/xip/SConscript
index 804f330855..804f330855 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/xip/SConscript
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/xip/SConscript
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/xip/evkmimxrt1064_flexspi_nor_config.c b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/xip/evkmimxrt1064_flexspi_nor_config.c
index b58414eba9..b58414eba9 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/xip/evkmimxrt1064_flexspi_nor_config.c
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/xip/evkmimxrt1064_flexspi_nor_config.c
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/xip/evkmimxrt1064_flexspi_nor_config.h b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/xip/evkmimxrt1064_flexspi_nor_config.h
index 81f22550ad..81f22550ad 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/xip/evkmimxrt1064_flexspi_nor_config.h
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/xip/evkmimxrt1064_flexspi_nor_config.h
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/xip/evkmimxrt1064_sdram_ini_dcd.c b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/xip/evkmimxrt1064_sdram_ini_dcd.c
index 475e2efcbe..475e2efcbe 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/xip/evkmimxrt1064_sdram_ini_dcd.c
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/xip/evkmimxrt1064_sdram_ini_dcd.c
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/xip/evkmimxrt1064_sdram_ini_dcd.h b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/xip/evkmimxrt1064_sdram_ini_dcd.h
index 154f8c14ec..154f8c14ec 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/xip/evkmimxrt1064_sdram_ini_dcd.h
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/xip/evkmimxrt1064_sdram_ini_dcd.h
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/xip/fsl_flexspi_nor_boot.c b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/xip/fsl_flexspi_nor_boot.c
index 2e05990395..2e05990395 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/xip/fsl_flexspi_nor_boot.c
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/xip/fsl_flexspi_nor_boot.c
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/xip/fsl_flexspi_nor_boot.h b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/xip/fsl_flexspi_nor_boot.h
index b22ad21bc0..b22ad21bc0 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/xip/fsl_flexspi_nor_boot.h
+++ b/bsp/nxp/imx/imxrt/libraries/templates/imxrt1064xxx/xip/fsl_flexspi_nor_boot.h
diff --git a/bsp/imxrt/tools/sdk_dist.py b/bsp/nxp/imx/imxrt/tools/sdk_dist.py
index b663628504..b663628504 100644
--- a/bsp/imxrt/tools/sdk_dist.py
+++ b/bsp/nxp/imx/imxrt/tools/sdk_dist.py