Merge tag 'fsl-qoriq-for-2026.04-rc2' of https://source.denx.de/u-boot/custodians/u-boot-fsl-qoriq

- Rename freescale to nxp
- Add CPLD support via IFC to the ls1021a-iot board
- Use scmi_clk_state_in_v2 in sandbox

MAINTAINERS

@@ -315,8 +315,8 @@ F:	arch/arm/include/asm/arch-imx*/
 F:	arch/arm/include/asm/arch-mx*/
 F:	arch/arm/include/asm/arch-vf610/
 F:	arch/arm/include/asm/mach-imx/
-F:	board/freescale/*mx*/
-F:	board/freescale/common/
+F:	board/nxp/*mx*/
+F:	board/nxp/common/
 F:	common/spl/spl_imx_container.c
 F:	doc/board/nxp/
 F:	doc/imx/

arch/arm/Kconfig

@@ -2415,23 +2415,23 @@ source "board/cavium/thunderx/Kconfig"
 source "board/eets/pdu001/Kconfig"
 source "board/emulation/qemu-arm/Kconfig"
 source "board/emulation/qemu-sbsa/Kconfig"
-source "board/freescale/ls2080aqds/Kconfig"
-source "board/freescale/ls2080ardb/Kconfig"
-source "board/freescale/ls1088a/Kconfig"
-source "board/freescale/ls1028a/Kconfig"
-source "board/freescale/ls1021aqds/Kconfig"
-source "board/freescale/ls1043aqds/Kconfig"
-source "board/freescale/ls1021atwr/Kconfig"
-source "board/freescale/ls1021atsn/Kconfig"
-source "board/freescale/ls1021aiot/Kconfig"
-source "board/freescale/ls1046aqds/Kconfig"
-source "board/freescale/ls1043ardb/Kconfig"
-source "board/freescale/ls1046ardb/Kconfig"
-source "board/freescale/ls1046afrwy/Kconfig"
-source "board/freescale/ls1012aqds/Kconfig"
-source "board/freescale/ls1012ardb/Kconfig"
-source "board/freescale/ls1012afrdm/Kconfig"
-source "board/freescale/lx2160a/Kconfig"
+source "board/nxp/ls2080aqds/Kconfig"
+source "board/nxp/ls2080ardb/Kconfig"
+source "board/nxp/ls1088a/Kconfig"
+source "board/nxp/ls1028a/Kconfig"
+source "board/nxp/ls1021aqds/Kconfig"
+source "board/nxp/ls1043aqds/Kconfig"
+source "board/nxp/ls1021atwr/Kconfig"
+source "board/nxp/ls1021atsn/Kconfig"
+source "board/nxp/ls1021aiot/Kconfig"
+source "board/nxp/ls1046aqds/Kconfig"
+source "board/nxp/ls1043ardb/Kconfig"
+source "board/nxp/ls1046ardb/Kconfig"
+source "board/nxp/ls1046afrwy/Kconfig"
+source "board/nxp/ls1012aqds/Kconfig"
+source "board/nxp/ls1012ardb/Kconfig"
+source "board/nxp/ls1012afrdm/Kconfig"
+source "board/nxp/lx2160a/Kconfig"
 source "board/grinn/chiliboard/Kconfig"
 source "board/hisilicon/hikey/Kconfig"
 source "board/hisilicon/hikey960/Kconfig"

arch/arm/cpu/armv7/vf610/Kconfig

@@ -30,7 +30,7 @@ endchoice
 config SYS_SOC
 	default "vf610"
 
-source "board/freescale/vf610twr/Kconfig"
+source "board/nxp/vf610twr/Kconfig"
 source "board/phytec/pcm052/Kconfig"
 source "board/toradex/colibri_vf/Kconfig"
 

arch/arm/mach-imx/imx8/Kconfig

@@ -104,8 +104,8 @@ config TARGET_IMX8QXP_MEK
 
 endchoice
 
-source "board/freescale/imx8qm_mek/Kconfig"
-source "board/freescale/imx8qxp_mek/Kconfig"
+source "board/nxp/imx8qm_mek/Kconfig"
+source "board/nxp/imx8qxp_mek/Kconfig"
 source "board/congatec/cgtqmx8/Kconfig"
 source "board/advantech/imx8qm_dmsse20_a1/Kconfig"
 source "board/advantech/imx8qm_rom7720_a1/Kconfig"

arch/arm/mach-imx/imx8m/Kconfig

@@ -441,10 +441,10 @@ source "board/dhelectronics/dh_imx8mp/Kconfig"
 source "board/emcraft/imx8mp_navqp/Kconfig"
 source "board/engicam/imx8mm/Kconfig"
 source "board/engicam/imx8mp/Kconfig"
-source "board/freescale/imx8mq_evk/Kconfig"
-source "board/freescale/imx8mm_evk/Kconfig"
-source "board/freescale/imx8mn_evk/Kconfig"
-source "board/freescale/imx8mp_evk/Kconfig"
+source "board/nxp/imx8mq_evk/Kconfig"
+source "board/nxp/imx8mm_evk/Kconfig"
+source "board/nxp/imx8mn_evk/Kconfig"
+source "board/nxp/imx8mp_evk/Kconfig"
 source "board/gateworks/venice/Kconfig"
 source "board/google/imx8mq_phanbell/Kconfig"
 source "board/kontron/osm-s-mx8mp/Kconfig"

arch/arm/mach-imx/imx8ulp/Kconfig

@@ -31,6 +31,6 @@ config TARGET_IMX8ULP_EVK
 
 endchoice
 
-source "board/freescale/imx8ulp_evk/Kconfig"
+source "board/nxp/imx8ulp_evk/Kconfig"
 
 endif

arch/arm/mach-imx/imx9/Kconfig

@@ -155,16 +155,16 @@ config TARGET_TORADEX_SMARC_IMX95
 
 endchoice
 
-source "board/freescale/imx91_evk/Kconfig"
-source "board/freescale/imx91_frdm/Kconfig"
-source "board/freescale/imx93_evk/Kconfig"
-source "board/freescale/imx93_frdm/Kconfig"
-source "board/freescale/imx93_qsb/Kconfig"
+source "board/nxp/imx91_evk/Kconfig"
+source "board/nxp/imx91_frdm/Kconfig"
+source "board/nxp/imx93_evk/Kconfig"
+source "board/nxp/imx93_frdm/Kconfig"
+source "board/nxp/imx93_qsb/Kconfig"
 source "board/kontron/osm-s-mx93/Kconfig"
 source "board/phytec/phycore_imx93/Kconfig"
 source "board/variscite/imx93_var_som/Kconfig"
-source "board/freescale/imx94_evk/Kconfig"
-source "board/freescale/imx95_evk/Kconfig"
+source "board/nxp/imx94_evk/Kconfig"
+source "board/nxp/imx95_evk/Kconfig"
 source "board/toradex/smarc-imx95/Kconfig"
 
 endif

arch/arm/mach-imx/imxrt/Kconfig

@@ -38,8 +38,8 @@ config TARGET_IMXRT1170_EVK
 
 endchoice
 
-source "board/freescale/imxrt1020-evk/Kconfig"
-source "board/freescale/imxrt1050-evk/Kconfig"
-source "board/freescale/imxrt1170-evk/Kconfig"
+source "board/nxp/imxrt1020-evk/Kconfig"
+source "board/nxp/imxrt1050-evk/Kconfig"
+source "board/nxp/imxrt1170-evk/Kconfig"
 
 endif

arch/arm/mach-imx/mx5/Kconfig

@@ -71,8 +71,8 @@ config SYS_SOC
 	default "mx5"
 
 source "board/beckhoff/mx53cx9020/Kconfig"
-source "board/freescale/mx51evk/Kconfig"
-source "board/freescale/mx53loco/Kconfig"
+source "board/nxp/mx51evk/Kconfig"
+source "board/nxp/mx53loco/Kconfig"
 source "board/ge/mx53ppd/Kconfig"
 source "board/inversepath/usbarmory/Kconfig"
 source "board/k+p/kp_imx53/Kconfig"

arch/arm/mach-imx/mx6/Kconfig

@@ -713,15 +713,15 @@ source "board/dhelectronics/dh_imx6/Kconfig"
 source "board/embest/mx6boards/Kconfig"
 source "board/engicam/imx6q/Kconfig"
 source "board/engicam/imx6ul/Kconfig"
-source "board/freescale/mx6memcal/Kconfig"
-source "board/freescale/mx6sabreauto/Kconfig"
-source "board/freescale/mx6sabresd/Kconfig"
-source "board/freescale/mx6slevk/Kconfig"
-source "board/freescale/mx6sllevk/Kconfig"
-source "board/freescale/mx6sxsabresd/Kconfig"
-source "board/freescale/mx6sxsabreauto/Kconfig"
-source "board/freescale/mx6ul_14x14_evk/Kconfig"
-source "board/freescale/mx6ullevk/Kconfig"
+source "board/nxp/mx6memcal/Kconfig"
+source "board/nxp/mx6sabreauto/Kconfig"
+source "board/nxp/mx6sabresd/Kconfig"
+source "board/nxp/mx6slevk/Kconfig"
+source "board/nxp/mx6sllevk/Kconfig"
+source "board/nxp/mx6sxsabresd/Kconfig"
+source "board/nxp/mx6sxsabreauto/Kconfig"
+source "board/nxp/mx6ul_14x14_evk/Kconfig"
+source "board/nxp/mx6ullevk/Kconfig"
 source "board/bosch/acc/Kconfig"
 source "board/grinn/liteboard/Kconfig"
 source "board/phytec/pcm058/Kconfig"

arch/arm/mach-imx/mx7/Kconfig

@@ -97,7 +97,7 @@ config SYS_SOC
 
 source "board/compulab/cl-som-imx7/Kconfig"
 source "board/ronetix/imx7-cm/Kconfig"
-source "board/freescale/mx7dsabresd/Kconfig"
+source "board/nxp/mx7dsabresd/Kconfig"
 source "board/novtech/meerkat96/Kconfig"
 source "board/storopack/smegw01/Kconfig"
 source "board/technexion/pico-imx7d/Kconfig"

arch/arm/mach-imx/mx7ulp/Kconfig

@@ -46,6 +46,6 @@ config TARGET_MX7ULP_EVK
 endchoice
 
 source "board/ea/mx7ulp_com/Kconfig"
-source "board/freescale/mx7ulp_evk/Kconfig"
+source "board/nxp/mx7ulp_evk/Kconfig"
 
 endif

arch/arm/mach-imx/mxs/Kconfig

@@ -24,7 +24,7 @@ config SYS_SOC
 	default "mxs"
 
 source "board/olimex/mx23_olinuxino/Kconfig"
-source "board/freescale/mx23evk/Kconfig"
+source "board/nxp/mx23evk/Kconfig"
 
 endif
 
@@ -74,7 +74,7 @@ config SPL_MXS_PMU_ENABLE_4P2_LINEAR_REGULATOR
 	  This option enables the 4P2 linear regulator (derived
 	  from VDD5V) - so the VDD4P2 power source is operational.
 
-source "board/freescale/mx28evk/Kconfig"
+source "board/nxp/mx28evk/Kconfig"
 source "board/liebherr/btt/Kconfig"
 source "board/liebherr/xea/Kconfig"
 

arch/m68k/Kconfig

@@ -180,16 +180,16 @@ endchoice
 
 source "board/BuS/eb_cpu5282/Kconfig"
 source "board/cobra5272/Kconfig"
-source "board/freescale/m5208evbe/Kconfig"
-source "board/freescale/m5235evb/Kconfig"
-source "board/freescale/m5249evb/Kconfig"
-source "board/freescale/m5253demo/Kconfig"
-source "board/freescale/m5272c3/Kconfig"
-source "board/freescale/m5275evb/Kconfig"
-source "board/freescale/m5282evb/Kconfig"
-source "board/freescale/m53017evb/Kconfig"
-source "board/freescale/m5329evb/Kconfig"
-source "board/freescale/m5373evb/Kconfig"
+source "board/nxp/m5208evbe/Kconfig"
+source "board/nxp/m5235evb/Kconfig"
+source "board/nxp/m5249evb/Kconfig"
+source "board/nxp/m5253demo/Kconfig"
+source "board/nxp/m5272c3/Kconfig"
+source "board/nxp/m5275evb/Kconfig"
+source "board/nxp/m5282evb/Kconfig"
+source "board/nxp/m53017evb/Kconfig"
+source "board/nxp/m5329evb/Kconfig"
+source "board/nxp/m5373evb/Kconfig"
 source "board/sysam/amcore/Kconfig"
 source "board/sysam/stmark2/Kconfig"
 

arch/powerpc/cpu/mpc83xx/Kconfig

@@ -207,7 +207,7 @@ config FSL_SERDES
 config NEVER_ASSERT_ODT_TO_CPU
 	bool "Never assert ODT to internal IOs"
 
-source "board/freescale/mpc837xerdb/Kconfig"
+source "board/nxp/mpc837xerdb/Kconfig"
 source "board/gdsys/mpc8308/Kconfig"
 source "board/cssi/cmpcpro/Kconfig"
 

arch/powerpc/cpu/mpc85xx/Kconfig

@@ -1542,15 +1542,15 @@ config FSL_VIA
 
 source "board/CZ.NIC/turris_1x/Kconfig"
 source "board/emulation/qemu-ppce500/Kconfig"
-source "board/freescale/mpc8548cds/Kconfig"
-source "board/freescale/p1010rdb/Kconfig"
-source "board/freescale/p1_p2_rdb_pc/Kconfig"
-source "board/freescale/p2041rdb/Kconfig"
-source "board/freescale/t102xrdb/Kconfig"
-source "board/freescale/t104xrdb/Kconfig"
-source "board/freescale/t208xqds/Kconfig"
-source "board/freescale/t208xrdb/Kconfig"
-source "board/freescale/t4rdb/Kconfig"
+source "board/nxp/mpc8548cds/Kconfig"
+source "board/nxp/p1010rdb/Kconfig"
+source "board/nxp/p1_p2_rdb_pc/Kconfig"
+source "board/nxp/p2041rdb/Kconfig"
+source "board/nxp/t102xrdb/Kconfig"
+source "board/nxp/t104xrdb/Kconfig"
+source "board/nxp/t208xqds/Kconfig"
+source "board/nxp/t208xrdb/Kconfig"
+source "board/nxp/t4rdb/Kconfig"
 source "board/socrates/Kconfig"
 
 endmenu

board/CZ.NIC/turris_1x/MAINTAINERS

@@ -6,8 +6,8 @@ F:	arch/powerpc/dts/turris1x.dts
 F:	board/CZ.NIC/turris_1x/
 F:	board/CZ.NIC/turris_atsha_otp.c
 F:	board/CZ.NIC/turris_atsha_otp.h
-F:	board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
-F:	board/freescale/p1_p2_rdb_pc/spl.c
+F:	board/nxp/p1_p2_rdb_pc/p1_p2_rdb_pc.c
+F:	board/nxp/p1_p2_rdb_pc/spl.c
 F:	configs/turris_1x_nor_defconfig
 F:	configs/turris_1x_sdcard_defconfig
 F:	include/configs/turris_1x.h

board/CZ.NIC/turris_1x/Makefile

@@ -2,10 +2,10 @@
 # (C) 2022 Pali Rohár <pali@kernel.org>
 
 ifdef CONFIG_XPL_BUILD
-obj-y	+= ../../freescale/p1_p2_rdb_pc/spl.o
+obj-y	+= ../../nxp/p1_p2_rdb_pc/spl.o
 endif
 
-obj-y	+= ../../freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.o
+obj-y	+= ../../nxp/p1_p2_rdb_pc/p1_p2_rdb_pc.o
 obj-y	+= ../turris_atsha_otp.o
 obj-y	+= ../turris_common.o
 

board/CZ.NIC/turris_1x/turris_1x.c

@@ -315,7 +315,7 @@ int misc_init_r(void)
 	return 0;
 }
 
-/* This comes from ../../freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c */
+/* This comes from ../../nxp/p1_p2_rdb_pc/p1_p2_rdb_pc.c */
 extern int checkboard_p1_p2(void);
 
 int checkboard(void)

board/beacon/imx8mm/Makefile

@@ -5,7 +5,7 @@
 #
 
 obj-y += imx8mm_beacon.o
-obj-y += ../../freescale/common/
+obj-y += ../../nxp/common/
 
 ifdef CONFIG_XPL_BUILD
 obj-y += spl.o

board/beacon/imx8mn/Makefile

@@ -5,7 +5,7 @@
 #
 
 obj-y += imx8mn_beacon.o
-obj-y += ../../freescale/common/
+obj-y += ../../nxp/common/
 ifdef CONFIG_XPL_BUILD
 obj-y += spl.o
 ifdef CONFIG_IMX8MN_BEACON_2GB_LPDDR

board/beacon/imx8mp/Kconfig

@@ -10,7 +10,7 @@ config SYS_CONFIG_NAME
 	default "imx8mp_beacon"
 
 config IMX_CONFIG
-	default "board/freescale/imx8mp_evk/imximage-8mp-lpddr4.cfg"
+	default "board/nxp/imx8mp_evk/imximage-8mp-lpddr4.cfg"
 
 
 endif

board/beacon/imx8mp/Makefile

@@ -5,7 +5,7 @@
 #
 
 obj-y += imx8mp_beacon.o
-obj-y += ../../freescale/common/
+obj-y += ../../nxp/common/
 
 ifdef CONFIG_XPL_BUILD
 obj-y += spl.o

board/beckhoff/mx53cx9020/imximage.cfg

@@ -3,7 +3,7 @@
  * Copyright (C) 2015  Beckhoff Automation GmbH
  * Patrick Bruenn <p.bruenn@beckhoff.com>
  *
- * Based on <u-boot>/board/freescale/mx53loco/imximage.cfg
+ * Based on <u-boot>/board/nxp/mx53loco/imximage.cfg
  * Copyright (C) 2011 Freescale Semiconductor, Inc.
  */
 

board/beckhoff/mx53cx9020/mx53cx9020.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2015  Beckhoff Automation GmbH & Co. KG
  * Patrick Bruenn <p.bruenn@beckhoff.com>
  *
- * Based on <u-boot>/board/freescale/mx53loco/mx53loco.c
+ * Based on <u-boot>/board/nxp/mx53loco/mx53loco.c
  * Copyright (C) 2011 Freescale Semiconductor, Inc.
  */
 

board/beckhoff/mx53cx9020/mx53cx9020_video.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2015  Beckhoff Automation GmbH & Co. KG
  * Patrick Bruenn <p.bruenn@beckhoff.com>
  *
- * Based on <u-boot>/board/freescale/mx53loco/mx53loco_video.c
+ * Based on <u-boot>/board/nxp/mx53loco/mx53loco_video.c
  * Copyright (C) 2012 Freescale Semiconductor, Inc.
  */
 

board/boundary/nitrogen6x/README

@@ -10,7 +10,7 @@ Freescale i.MX6Q SabreLite boards.
 The configuration in this directory supports both the
 Nitrogen6X and Freescale SabreLite board, but in a
 different fashion from Freescale's implementation in
-board/freescale/mx6qsabrelite.
+board/nxp/mx6qsabrelite.
 
 In particular, this image supports booting from SPI NOR
 and saving the environment to SPI NOR.

board/ea/mx7ulp_com/imximage.cfg

@@ -24,7 +24,7 @@ BOOT_FROM	sd
 
 #ifdef CONFIG_USE_IMXIMG_PLUGIN
 /*PLUGIN    plugin-binary-file    IRAM_FREE_START_ADDR*/
-PLUGIN	board/freescale/mx7ulp_evk/plugin.bin 0x2F020000
+PLUGIN	board/nxp/mx7ulp_evk/plugin.bin 0x2F020000
 #else
 
 #ifdef CONFIG_IMX_HAB

board/ge/mx53ppd/Makefile

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0+
 # Copyright 2017 General Electric Company
 #
-# Based on board/freescale/mx53loco/Makefile:
+# Based on board/nxp/mx53loco/Makefile:
 #
 # (C) Copyright 2011 Freescale Semiconductor, Inc.
 # Jason Liu <r64343@freescale.com>

board/ge/mx53ppd/imximage.cfg

@@ -2,7 +2,7 @@
 /*
  * Copyright 2017 General Electric Company
  *
- * Based on board/freescale/mx53loco/imximage.cfg:
+ * Based on board/nxp/mx53loco/imximage.cfg:
  *
  * Copyright (C) 2011 Freescale Semiconductor, Inc.
  * Jason Liu <r64343@freescale.com>

board/ge/mx53ppd/mx53ppd.c

@@ -2,7 +2,7 @@
 /*
  * Copyright 2017 General Electric Company
  *
- * Based on board/freescale/mx53loco/mx53loco.c:
+ * Based on board/nxp/mx53loco/mx53loco.c:
  *
  * Copyright (C) 2011 Freescale Semiconductor, Inc.
  * Jason Liu <r64343@freescale.com>

board/ge/mx53ppd/mx53ppd_video.c

@@ -2,7 +2,7 @@
 /*
  * Copyright 2017 General Electric Company
  *
- * Based on board/freescale/mx53loco/mx53loco_video.c:
+ * Based on board/nxp/mx53loco/mx53loco_video.c:
  *
  * Copyright (C) 2012 Freescale Semiconductor, Inc.
  * Fabio Estevam <fabio.estevam@freescale.com>

board/k+p/kp_imx53/Kconfig

@@ -13,6 +13,6 @@ config SYS_CONFIG_NAME
 	default "kp_imx53"
 
 config IMX_CONFIG
-	default "board/freescale/mx53loco/imximage.cfg"
+	default "board/nxp/mx53loco/imximage.cfg"
 
 endif

board/keymile/pg-wcom-ls102xa/Makefile

@@ -6,6 +6,6 @@
 
 obj-y += pg-wcom-ls102xa.o ddr.o
 obj-y += ../common/common.o ../common/ivm.o ../common/qrio.o
-obj-$(CONFIG_LAYERSCAPE_NS_ACCESS) += ../../freescale/common/ns_access.o
-obj-$(CONFIG_LS102XA_STREAM_ID) += ../../freescale/common/ls102xa_stream_id.o
-obj-$(CONFIG_ID_EEPROM) += ../../freescale/common/sys_eeprom.o
+obj-$(CONFIG_LAYERSCAPE_NS_ACCESS) += ../../nxp/common/ns_access.o
+obj-$(CONFIG_LS102XA_STREAM_ID) += ../../nxp/common/ls102xa_stream_id.o
+obj-$(CONFIG_ID_EEPROM) += ../../nxp/common/sys_eeprom.o

board/nxp/imx8mm_evk/Kconfig

@@ -4,12 +4,12 @@ config SYS_BOARD
 	default "imx8mm_evk"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "imx8mm_evk"
 
 config IMX_CONFIG
-	default "board/freescale/imx8mm_evk/imximage-8mm-lpddr4.cfg"
+	default "board/nxp/imx8mm_evk/imximage-8mm-lpddr4.cfg"
 
 endif

board/nxp/imx8mm_evk/MAINTAINERS

@@ -1,7 +1,7 @@
 i.MX8MM EVK BOARD
 M:	Peng Fan <peng.fan@nxp.com>
 S:	Maintained
-F:	board/freescale/imx8mm_evk/
+F:	board/nxp/imx8mm_evk/
 F:	include/configs/imx8mm_evk.h
 F:	configs/imx8mm_evk_defconfig
 F:  configs/imx8mm_evk_fspi_defconfig

board/nxp/imx8mn_evk/Kconfig

@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "imx8mn_evk"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "imx8mn_evk"
@@ -13,6 +13,6 @@ config IMX8MN_LOW_DRIVE_MODE
 	bool "Enable the low drive mode of iMX8MN on EVK board"
 
 config IMX_CONFIG
-	default "board/freescale/imx8mn_evk/imximage-8mn-ddr4.cfg"
+	default "board/nxp/imx8mn_evk/imximage-8mn-ddr4.cfg"
 
 endif

board/nxp/imx8mn_evk/MAINTAINERS

@@ -1,7 +1,7 @@
 i.MX8MN EVK BOARD
 M:	Peng Fan <peng.fan@nxp.com>
 S:	Maintained
-F:	board/freescale/imx8mn_evk/
+F:	board/nxp/imx8mn_evk/
 F:	include/configs/imx8mn_evk.h
 F:	configs/imx8mn_ddr4_evk_defconfig
 F:	configs/imx8mn_evk_defconfig

board/nxp/imx8mp_evk/Kconfig

@@ -4,12 +4,12 @@ config SYS_BOARD
 	default "imx8mp_evk"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "imx8mp_evk"
 
 config IMX_CONFIG
-	default "board/freescale/imx8mp_evk/imximage-8mp-lpddr4.cfg"
+	default "board/nxp/imx8mp_evk/imximage-8mp-lpddr4.cfg"
 
 endif

board/nxp/imx8mp_evk/MAINTAINERS

@@ -2,6 +2,6 @@ i.MX8MP EVK BOARD
 M:	Fabio Estevam <festevam@gmail.com>
 M:	Peng Fan <peng.fan@nxp.com>
 S:	Maintained
-F:	board/freescale/imx8mp_evk/
+F:	board/nxp/imx8mp_evk/
 F:	include/configs/imx8mp_evk.h
 F:	configs/imx8mp_evk_defconfig