697 files changed, 975 insertions, 518 deletions

diff --git a/board/CZ.NIC/turris_1x/MAINTAINERS b/board/CZ.NIC/turris_1x/MAINTAINERS
index e858c97b962..36e27a57221 100644
--- a/board/CZ.NIC/turris_1x/MAINTAINERS
+++ b/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
diff --git a/board/CZ.NIC/turris_1x/Makefile b/board/CZ.NIC/turris_1x/Makefile
index 1bf370122d9..c5c47adac0a 100644
--- a/board/CZ.NIC/turris_1x/Makefile
+++ b/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
 
diff --git a/board/CZ.NIC/turris_1x/turris_1x.c b/board/CZ.NIC/turris_1x/turris_1x.c
index 7a0b68caaef..2f9557a4170 100644
--- a/board/CZ.NIC/turris_1x/turris_1x.c
+++ b/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)
diff --git a/board/adi/carriers/Makefile b/board/adi/carriers/Makefile
new file mode 100644
index 00000000000..cefd2cc837f
--- /dev/null
+++ b/board/adi/carriers/Makefile
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# (C) Copyright 2024 - Analog Devices, Inc.
+#
+
+obj-y += somcrr_common.o
+obj-$(CONFIG_ADI_CARRIER_SOMCRR_EZKIT) += somcrr_ezkit.o
+obj-$(CONFIG_ADI_CARRIER_SOMCRR_EZLITE) += somcrr_ezlite.o
diff --git a/board/adi/carriers/somcrr.h b/board/adi/carriers/somcrr.h
new file mode 100644
index 00000000000..01e908c67f8
--- /dev/null
+++ b/board/adi/carriers/somcrr.h
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * (C) Copyright 2025 - Analog Devices, Inc.
+ *
+ */
+
+#ifndef BOARD_ADI_CARRIERS_SOMCRR_H
+#define BOARD_ADI_CARRIERS_SOMCRR_H
+
+void adi_somcrr_init_ethernet(void);
+void adi_somcrr_enable_ethernet(void);
+void adi_somcrr_disable_ethernet(void);
+
+#endif
diff --git a/board/adi/carriers/somcrr_common.c b/board/adi/carriers/somcrr_common.c
new file mode 100644
index 00000000000..34ae48f31d2
--- /dev/null
+++ b/board/adi/carriers/somcrr_common.c
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * (C) Copyright 2025 - Analog Devices, Inc.
+ */
+
+#include <asm/arch-adi/sc5xx/sc5xx.h>
+#include <linux/delay.h>
+
+#include "somcrr.h"
+
+void adi_somcrr_init_ethernet(void)
+{
+	adi_somcrr_enable_ethernet();
+	mdelay(20);
+	adi_somcrr_disable_ethernet();
+	mdelay(90);
+	adi_somcrr_enable_ethernet();
+	mdelay(20);
+}
diff --git a/board/adi/carriers/somcrr_ezkit.c b/board/adi/carriers/somcrr_ezkit.c
new file mode 100644
index 00000000000..8b4d6a96c18
--- /dev/null
+++ b/board/adi/carriers/somcrr_ezkit.c
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * (C) Copyright 2025 - Analog Devices, Inc.
+ */
+
+#include <asm/gpio.h>
+
+#include "somcrr.h"
+
+void adi_somcrr_enable_ethernet(void)
+{
+	struct gpio_desc *eth1;
+	struct gpio_desc *eth1_reset;
+	struct gpio_desc *gige_reset;
+
+	gpio_hog_lookup_name("eth1-en", &eth1);
+	gpio_hog_lookup_name("eth1-reset", &eth1_reset);
+	gpio_hog_lookup_name("gige-reset", &gige_reset);
+
+	dm_gpio_set_value(eth1, 1);
+	dm_gpio_set_value(eth1_reset, 0);
+	dm_gpio_set_value(gige_reset, 0);
+}
+
+void adi_somcrr_disable_ethernet(void)
+{
+	struct gpio_desc *eth1;
+	struct gpio_desc *eth1_reset;
+	struct gpio_desc *gige_reset;
+
+	gpio_hog_lookup_name("eth1-en", &eth1);
+	gpio_hog_lookup_name("eth1-reset", &eth1_reset);
+	gpio_hog_lookup_name("gige-reset", &gige_reset);
+
+	dm_gpio_set_value(eth1, 0);
+	dm_gpio_set_value(eth1_reset, 1);
+	dm_gpio_set_value(gige_reset, 1);
+}
diff --git a/board/adi/carriers/somcrr_ezlite.c b/board/adi/carriers/somcrr_ezlite.c
new file mode 100644
index 00000000000..c0655574bab
--- /dev/null
+++ b/board/adi/carriers/somcrr_ezlite.c
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * (C) Copyright 2025 - Analog Devices, Inc.
+ */
+
+#include <asm/gpio.h>
+
+#include "somcrr.h"
+
+void adi_somcrr_enable_ethernet(void)
+{
+	struct gpio_desc *gige_reset;
+
+	gpio_hog_lookup_name("eth0-reset", &gige_reset);
+	dm_gpio_set_value(gige_reset, 0);
+}
+
+void adi_somcrr_disable_ethernet(void)
+{
+	struct gpio_desc *gige_reset;
+
+	gpio_hog_lookup_name("eth0-reset", &gige_reset);
+	dm_gpio_set_value(gige_reset, 1);
+}
diff --git a/board/adi/common-sc594-som/sc594-som.c b/board/adi/common-sc594-som/sc594-som.c
new file mode 100644
index 00000000000..aab729fc761
--- /dev/null
+++ b/board/adi/common-sc594-som/sc594-som.c
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * (C) Copyright 2025 - Analog Devices, Inc.
+ */
+
+#include <config.h>
+#include <phy.h>
+#include <asm/u-boot.h>
+#include <asm/arch-adi/sc5xx/sc5xx.h>
+#include <asm/arch-adi/sc5xx/soc.h>
+
+#include "../carriers/somcrr.h"
+
+int board_phy_config(struct phy_device *phydev)
+{
+	if (IS_ENABLED(CONFIG_ADI_CARRIER_SOMCRR_EZKIT))
+		fixup_dp83867_phy(phydev);
+
+	return 0;
+}
+
+int board_init(void)
+{
+	sc59x_remap_ospi();
+
+	if (IS_ENABLED(CONFIG_ADI_CARRIER_SOMCRR_EZKIT) ||
+	    IS_ENABLED(CONFIG_ADI_CARRIER_SOMCRR_EZLITE)) {
+		adi_somcrr_init_ethernet();
+	}
+
+	sc5xx_enable_rgmii();
+
+	return 0;
+}
diff --git a/board/adi/common-sc598-som/sc598-som.c b/board/adi/common-sc598-som/sc598-som.c
new file mode 100644
index 00000000000..96b73520e66
--- /dev/null
+++ b/board/adi/common-sc598-som/sc598-som.c
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * (C) Copyright 2025 - Analog Devices, Inc.
+ */
+
+#include <config.h>
+#include <phy.h>
+#include <asm/u-boot.h>
+#include <asm/arch-adi/sc5xx/sc5xx.h>
+#include <asm/arch-adi/sc5xx/soc.h>
+#include <asm/armv8/mmu.h>
+
+#include "../carriers/somcrr.h"
+
+int board_phy_config(struct phy_device *phydev)
+{
+	if (IS_ENABLED(CONFIG_ADI_CARRIER_SOMCRR_EZKIT))
+		fixup_dp83867_phy(phydev);
+	return 0;
+}
+
+int board_init(void)
+{
+	sc59x_remap_ospi();
+
+	if (IS_ENABLED(CONFIG_ADI_CARRIER_SOMCRR_EZKIT) ||
+	    IS_ENABLED(CONFIG_ADI_CARRIER_SOMCRR_EZLITE)) {
+		adi_somcrr_init_ethernet();
+	}
+
+	sc5xx_enable_rgmii();
+
+	return 0;
+}
diff --git a/board/adi/sc573-ezkit/Makefile b/board/adi/sc573-ezkit/Makefile
new file mode 100644
index 00000000000..0ea725b992b
--- /dev/null
+++ b/board/adi/sc573-ezkit/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# (C) Copyright 2025 - Analog Devices, Inc.
+#
+
+obj-y	+= sc573-ezkit.o
diff --git a/board/adi/sc573-ezkit/sc573-ezkit.c b/board/adi/sc573-ezkit/sc573-ezkit.c
new file mode 100644
index 00000000000..288c2670761
--- /dev/null
+++ b/board/adi/sc573-ezkit/sc573-ezkit.c
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * (C) Copyright 2025 - Analog Devices, Inc.
+ */
+
+#include <phy.h>
+#include <asm/u-boot.h>
+#include <asm/arch-adi/sc5xx/sc5xx.h>
+#include <asm/arch-adi/sc5xx/soc.h>
+
+int board_phy_config(struct phy_device *phydev)
+{
+	fixup_dp83867_phy(phydev);
+	return 0;
+}
+
+int board_init(void)
+{
+	sc5xx_enable_rgmii();
+	return 0;
+}
diff --git a/board/adi/sc573-ezkit/sc573-ezkit.env b/board/adi/sc573-ezkit/sc573-ezkit.env
index 26f7b6cb799..8b03a3d5da9 100644
--- a/board/adi/sc573-ezkit/sc573-ezkit.env
+++ b/board/adi/sc573-ezkit/sc573-ezkit.env
@@ -1,13 +1,17 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later+ */
-
 /*
  * (C) Copyright 2024 - Analog Devices, Inc.
  */
 
-#include <env/adi/adi_boot.env>
-
-adi_stage2_offset=0x20000
-adi_image_offset=0xE0000
-adi_rfs_offset=0x6E0000
-loadaddr=0x83000000
+adi_stage2_offset=CONFIG_SC5XX_UBOOT_OFFSET
+adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
+adi_rfs_offset=CONFIG_SC5XX_ROOTFS_OFFSET
 jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc573-ezkit.jffs2
+loadaddr=CONFIG_SC5XX_LOADADDR
+
+#define USE_NFS
+#define USE_SPI
+#define USE_RAM
+#define USE_MMC
+
+#include <env/adi/adi_boot.env>
diff --git a/board/adi/sc584-ezkit/Makefile b/board/adi/sc584-ezkit/Makefile
new file mode 100644
index 00000000000..86f94976cf3
--- /dev/null
+++ b/board/adi/sc584-ezkit/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# (C) Copyright 2025 - Analog Devices, Inc.
+#
+
+obj-y	:= sc584-ezkit.o
diff --git a/board/adi/sc584-ezkit/sc584-ezkit.c b/board/adi/sc584-ezkit/sc584-ezkit.c
new file mode 100644
index 00000000000..288c2670761
--- /dev/null
+++ b/board/adi/sc584-ezkit/sc584-ezkit.c
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * (C) Copyright 2025 - Analog Devices, Inc.
+ */
+
+#include <phy.h>
+#include <asm/u-boot.h>
+#include <asm/arch-adi/sc5xx/sc5xx.h>
+#include <asm/arch-adi/sc5xx/soc.h>
+
+int board_phy_config(struct phy_device *phydev)
+{
+	fixup_dp83867_phy(phydev);
+	return 0;
+}
+
+int board_init(void)
+{
+	sc5xx_enable_rgmii();
+	return 0;
+}
diff --git a/board/adi/sc584-ezkit/sc584-ezkit.env b/board/adi/sc584-ezkit/sc584-ezkit.env
index af9a9e01bcf..8a6f7edd5e8 100644
--- a/board/adi/sc584-ezkit/sc584-ezkit.env
+++ b/board/adi/sc584-ezkit/sc584-ezkit.env
@@ -1,13 +1,16 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later+ */
-
 /*
  * (C) Copyright 2024 - Analog Devices, Inc.
  */
 
-#include <env/adi/adi_boot.env>
-
-adi_stage2_offset=0x20000
-adi_image_offset=0xE0000
-adi_rfs_offset=0x6E0000
-loadaddr=0x89300000
+adi_stage2_offset=CONFIG_SC5XX_UBOOT_OFFSET
+adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
+adi_rfs_offset=CONFIG_SC5XX_ROOTFS_OFFSET
 jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc584-ezkit.jffs2
+loadaddr=CONFIG_SC5XX_LOADADDR
+
+#define USE_NFS
+#define USE_SPI
+#define USE_RAM
+
+#include <env/adi/adi_boot.env>
diff --git a/board/adi/sc589-ezkit/Makefile b/board/adi/sc589-ezkit/Makefile
new file mode 100644
index 00000000000..0450aa373bd
--- /dev/null
+++ b/board/adi/sc589-ezkit/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# (C) Copyright 2025 - Analog Devices, Inc.
+#
+
+obj-y	:= sc589-ezkit.o
diff --git a/board/adi/sc589-ezkit/sc589-ezkit.c b/board/adi/sc589-ezkit/sc589-ezkit.c
new file mode 100644
index 00000000000..288c2670761
--- /dev/null
+++ b/board/adi/sc589-ezkit/sc589-ezkit.c
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * (C) Copyright 2025 - Analog Devices, Inc.
+ */
+
+#include <phy.h>
+#include <asm/u-boot.h>
+#include <asm/arch-adi/sc5xx/sc5xx.h>
+#include <asm/arch-adi/sc5xx/soc.h>
+
+int board_phy_config(struct phy_device *phydev)
+{
+	fixup_dp83867_phy(phydev);
+	return 0;
+}
+
+int board_init(void)
+{
+	sc5xx_enable_rgmii();
+	return 0;
+}
diff --git a/board/adi/sc589-ezkit/sc589-ezkit.env b/board/adi/sc589-ezkit/sc589-ezkit.env
index 34b924992ac..b8206e85179 100644
--- a/board/adi/sc589-ezkit/sc589-ezkit.env
+++ b/board/adi/sc589-ezkit/sc589-ezkit.env
@@ -1,13 +1,17 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later+ */
-
 /*
  * (C) Copyright 2024 - Analog Devices, Inc.
  */
 
-#include <env/adi/adi_boot.env>
-
-adi_stage2_offset=0x20000
-adi_image_offset=0xE0000
-adi_rfs_offset=0x6E0000
-loadaddr=0xC3000000
+adi_stage2_offset=CONFIG_SC5XX_UBOOT_OFFSET
+adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
+adi_rfs_offset=CONFIG_SC5XX_ROOTFS_OFFSET
 jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc589-ezkit.jffs2
+loadaddr=CONFIG_SC5XX_LOADADDR
+
+#define USE_NFS
+#define USE_RAM
+#define USE_MMC
+#define USE_SPI
+
+#include <env/adi/adi_boot.env>
diff --git a/board/adi/sc589-mini/Makefile b/board/adi/sc589-mini/Makefile
new file mode 100644
index 00000000000..b2712e8e488
--- /dev/null
+++ b/board/adi/sc589-mini/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# (C) Copyright 2025 - Analog Devices, Inc.
+#
+
+obj-y	:= sc589-mini.o
diff --git a/board/adi/sc589-mini/sc589-mini.c b/board/adi/sc589-mini/sc589-mini.c
new file mode 100644
index 00000000000..288c2670761
--- /dev/null
+++ b/board/adi/sc589-mini/sc589-mini.c
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * (C) Copyright 2025 - Analog Devices, Inc.
+ */
+
+#include <phy.h>
+#include <asm/u-boot.h>
+#include <asm/arch-adi/sc5xx/sc5xx.h>
+#include <asm/arch-adi/sc5xx/soc.h>
+
+int board_phy_config(struct phy_device *phydev)
+{
+	fixup_dp83867_phy(phydev);
+	return 0;
+}
+
+int board_init(void)
+{
+	sc5xx_enable_rgmii();
+	return 0;
+}
diff --git a/board/adi/sc589-mini/sc589-mini.env b/board/adi/sc589-mini/sc589-mini.env
index 0f3f0bd28e9..f7628b0b335 100644
--- a/board/adi/sc589-mini/sc589-mini.env
+++ b/board/adi/sc589-mini/sc589-mini.env
@@ -1,13 +1,17 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later+ */
-
 /*
  * (C) Copyright 2024 - Analog Devices, Inc.
  */
 
-#include <env/adi/adi_boot.env>
-
-adi_stage2_offset=0x20000
-adi_image_offset=0xE0000
-adi_rfs_offset=0x8E0000
-loadaddr=0xC3000000
+adi_stage2_offset=CONFIG_SC5XX_UBOOT_OFFSET
+adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
+adi_rfs_offset=CONFIG_SC5XX_ROOTFS_OFFSET
 jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc589-mini.jffs2
+loadaddr=CONFIG_SC5XX_LOADADDR
+
+#define USE_NFS
+#define USE_RAM
+#define USE_SPI
+#define USE_MMC
+
+#include <env/adi/adi_boot.env>
diff --git a/board/adi/sc594-som-ezkit/Makefile b/board/adi/sc594-som-ezkit/Makefile
new file mode 100644
index 00000000000..6a74b509f1b
--- /dev/null
+++ b/board/adi/sc594-som-ezkit/Makefile
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# (C) Copyright 2025 - Analog Devices, Inc.
+#
+
+obj-y	:= ../common-sc594-som/sc594-som.o
+
+obj-y += ../carriers/
diff --git a/board/adi/sc594-som-ezkit/sc594-som-ezkit.env b/board/adi/sc594-som-ezkit/sc594-som-ezkit.env
index 83d6b457a08..069edc717da 100644
--- a/board/adi/sc594-som-ezkit/sc594-som-ezkit.env
+++ b/board/adi/sc594-som-ezkit/sc594-som-ezkit.env
@@ -1,13 +1,18 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later+ */
-
 /*
  * (C) Copyright 2024 - Analog Devices, Inc.
  */
 
-#include <env/adi/adi_boot.env>
-
-adi_stage2_offset=0x40000
-adi_image_offset=0x0120000
-adi_rfs_offset=0x1020000
-loadaddr=0xA2000000
+adi_stage2_offset=CONFIG_SC5XX_UBOOT_OFFSET
+adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
+adi_rfs_offset=CONFIG_SC5XX_ROOTFS_OFFSET
 jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc594-som-ezkit.jffs2
+loadaddr=CONFIG_SC5XX_LOADADDR
+
+#define USE_NFS
+#define USE_SPI
+#define USE_OSPI
+#define USE_RAM
+#define USE_MMC
+
+#include <env/adi/adi_boot.env>
diff --git a/board/adi/sc594-som-ezlite/Makefile b/board/adi/sc594-som-ezlite/Makefile
new file mode 100644
index 00000000000..6a74b509f1b
--- /dev/null
+++ b/board/adi/sc594-som-ezlite/Makefile
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# (C) Copyright 2025 - Analog Devices, Inc.
+#
+
+obj-y	:= ../common-sc594-som/sc594-som.o
+
+obj-y += ../carriers/
diff --git a/board/adi/sc594-som-ezlite/sc594-som-ezlite.env b/board/adi/sc594-som-ezlite/sc594-som-ezlite.env
index 152e1f14fdf..e5382b67c81 100644
--- a/board/adi/sc594-som-ezlite/sc594-som-ezlite.env
+++ b/board/adi/sc594-som-ezlite/sc594-som-ezlite.env
@@ -1,13 +1,18 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later+ */
-
 /*
  * (C) Copyright 2024 - Analog Devices, Inc.
  */
 
-#include <env/adi/adi_boot.env>
-
-adi_stage2_offset=0x40000
-adi_image_offset=0x0120000
-adi_rfs_offset=0x1020000
-loadaddr=0xA2000000
+adi_stage2_offset=CONFIG_SC5XX_UBOOT_OFFSET
+adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
+adi_rfs_offset=CONFIG_SC5XX_ROOTFS_OFFSET
 jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc594-som-ezlite.jffs2
+loadaddr=CONFIG_SC5XX_LOADADDR
+
+#define USE_NFS
+#define USE_SPI
+#define USE_OSPI
+#define USE_RAM
+#define USE_MMC
+
+#include <env/adi/adi_boot.env>
diff --git a/board/adi/sc598-som-ezkit/Makefile b/board/adi/sc598-som-ezkit/Makefile
new file mode 100644
index 00000000000..b22c4f5ccf5
--- /dev/null
+++ b/board/adi/sc598-som-ezkit/Makefile
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# (C) Copyright 2025 - Analog Devices, Inc.
+#
+
+obj-y	:= ../common-sc598-som/sc598-som.o
+
+obj-y += ../carriers/
diff --git a/board/adi/sc598-som-ezkit/sc598-som-ezkit.env b/board/adi/sc598-som-ezkit/sc598-som-ezkit.env
index 242436c1600..2cb475e1001 100644
--- a/board/adi/sc598-som-ezkit/sc598-som-ezkit.env
+++ b/board/adi/sc598-som-ezkit/sc598-som-ezkit.env
@@ -1,13 +1,18 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later+ */
-
 /*
  * (C) Copyright 2024 - Analog Devices, Inc.
  */
 
-#include <env/adi/adi_boot.env>
-
-adi_stage2_offset=0x40000
-adi_image_offset=0x01a0000
-adi_rfs_offset=0x1020000
-loadaddr=0x90000000
+adi_stage2_offset=CONFIG_SC5XX_UBOOT_OFFSET
+adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
+adi_rfs_offset=CONFIG_SC5XX_ROOTFS_OFFSET
 jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc598-som-ezkit.jffs2
+loadaddr=CONFIG_SC5XX_LOADADDR
+
+#define USE_NFS
+#define USE_SPI
+#define USE_OSPI
+#define USE_RAM
+#define USE_MMC
+
+#include <env/adi/adi_boot.env>
diff --git a/board/adi/sc598-som-ezlite/Makefile b/board/adi/sc598-som-ezlite/Makefile
new file mode 100644
index 00000000000..b22c4f5ccf5
--- /dev/null
+++ b/board/adi/sc598-som-ezlite/Makefile
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# (C) Copyright 2025 - Analog Devices, Inc.
+#
+
+obj-y	:= ../common-sc598-som/sc598-som.o
+
+obj-y += ../carriers/
diff --git a/board/adi/sc598-som-ezlite/sc598-som-ezlite.env b/board/adi/sc598-som-ezlite/sc598-som-ezlite.env
index 036c9ae7590..1d9ea6d188b 100644
--- a/board/adi/sc598-som-ezlite/sc598-som-ezlite.env
+++ b/board/adi/sc598-som-ezlite/sc598-som-ezlite.env
@@ -1,13 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later+ */
-
 /*
  * (C) Copyright 2024 - Analog Devices, Inc.
  */
 
-#include <env/adi/adi_boot.env>
-
-adi_stage2_offset=0x40000
-adi_image_offset=0x01a0000
-adi_rfs_offset=0x1020000
-loadaddr=0x90000000
+adi_stage2_offset=CONFIG_SC5XX_UBOOT_OFFSET
+adi_image_offset=CONFIG_SC5XX_FITIMAGE_OFFSET
+adi_rfs_offset=CONFIG_SC5XX_ROOTFS_OFFSET
+loadaddr=CONFIG_SC5XX_LOADADDR
 jffs2file=adsp-sc5xx-__stringify(CONFIG_ADI_IMAGE)-adsp-sc598-som-ezlite.jffs2
+
+#include <env/adi/adi_boot.env>
diff --git a/board/amd/versal2/board.c b/board/amd/versal2/board.c
index 1fd05a1157a..d8079c1cee0 100644
--- a/board/amd/versal2/board.c
+++ b/board/amd/versal2/board.c
@@ -253,6 +253,12 @@ static int boot_targets_setup(void)
 		break;
 	case EMMC_MODE:
 		puts("EMMC_MODE\n");
+		if (uclass_get_device_by_name(UCLASS_MMC,
+					      "mmc@f1050000", &dev)) {
+			debug("SD1 driver for SD1 device is not present\n");
+			break;
+		}
+		debug("mmc1 device found at %p, seq %d\n", dev, dev_seq(dev));
 		mode = "mmc";
 		bootseq = dev_seq(dev);
 		break;
diff --git a/board/beacon/imx8mm/Makefile b/board/beacon/imx8mm/Makefile
index b33dc8b05b9..8484b85ae12 100644
--- a/board/beacon/imx8mm/Makefile
+++ b/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
diff --git a/board/beacon/imx8mn/Makefile b/board/beacon/imx8mn/Makefile
index 48b7b0952cc..54735792b93 100644
--- a/board/beacon/imx8mn/Makefile
+++ b/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
diff --git a/board/beacon/imx8mp/Kconfig b/board/beacon/imx8mp/Kconfig
index 3c0fca9be8d..b0dd98cf9fd 100644
--- a/board/beacon/imx8mp/Kconfig
+++ b/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
diff --git a/board/beacon/imx8mp/Makefile b/board/beacon/imx8mp/Makefile
index 7b994d2c8a1..669b54d63e7 100644
--- a/board/beacon/imx8mp/Makefile
+++ b/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
diff --git a/board/beckhoff/mx53cx9020/imximage.cfg b/board/beckhoff/mx53cx9020/imximage.cfg
index 159f50e2a5f..be2ec43d346 100644
--- a/board/beckhoff/mx53cx9020/imximage.cfg
+++ b/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.
  */
 
diff --git a/board/beckhoff/mx53cx9020/mx53cx9020.c b/board/beckhoff/mx53cx9020/mx53cx9020.c
index 3a766728a6f..ffbd639921d 100644
--- a/board/beckhoff/mx53cx9020/mx53cx9020.c
+++ b/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.
  */
 
diff --git a/board/beckhoff/mx53cx9020/mx53cx9020_video.c b/board/beckhoff/mx53cx9020/mx53cx9020_video.c
index fd28a70f4d7..e3eaf0393ba 100644
--- a/board/beckhoff/mx53cx9020/mx53cx9020_video.c
+++ b/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.
  */
 
diff --git a/board/boundary/nitrogen6x/README b/board/boundary/nitrogen6x/README
index 973b18fa93f..0b59289e7f0 100644
--- a/board/boundary/nitrogen6x/README
+++ b/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.
diff --git a/board/cssi/cmpc885/u-boot.lds b/board/cssi/cmpc885/u-boot.lds
index 167606357e0..da9cff64d46 100644
--- a/board/cssi/cmpc885/u-boot.lds
+++ b/board/cssi/cmpc885/u-boot.lds
@@ -72,6 +72,7 @@ SECTIONS
 	 * _end - This is end of u-boot.bin image.
 	 * dtb will be appended here to make u-boot-dtb.bin
 	 */
+	. = ALIGN(8);
 	_end = .;
 
 	. = ALIGN(4096);
@@ -93,3 +94,5 @@ SECTIONS
 	PROVIDE (end = .);
 }
 ENTRY(_start)
+
+ASSERT(_end % 8 == 0, "_end must be 8-byte aligned for device tree");
diff --git a/board/cssi/mcr3000/u-boot.lds b/board/cssi/mcr3000/u-boot.lds
index 66afdebc0f7..1fd98726b2a 100644
--- a/board/cssi/mcr3000/u-boot.lds
+++ b/board/cssi/mcr3000/u-boot.lds
@@ -72,6 +72,7 @@ SECTIONS
 	 * _end - This is end of u-boot.bin image.
 	 * dtb will be appended here to make u-boot-dtb.bin
 	 */
+	. = ALIGN(8);
 	_end = .;
 
 	. = ALIGN(4096);
@@ -93,3 +94,5 @@ SECTIONS
 	PROVIDE (end = .);
 }
 ENTRY(_start)
+
+ASSERT(_end % 8 == 0, "_end must be 8-byte aligned for device tree");
diff --git a/board/davinci/da8xxevm/u-boot-spl-da850evm.lds b/board/davinci/da8xxevm/u-boot-spl-da850evm.lds
index 56d6f4f114b..c369c14a255 100644
--- a/board/davinci/da8xxevm/u-boot-spl-da850evm.lds
+++ b/board/davinci/da8xxevm/u-boot-spl-da850evm.lds
@@ -36,13 +36,9 @@ SECTIONS
 	.data : { *(SORT_BY_ALIGNMENT(.data*)) } >.sram
 
 	. = ALIGN(4);
-	__u_boot_list : { KEEP(*(SORT(__u_boot_list*))); } >.sram
-
-	. = ALIGN(4);
-	.rel.dyn : {
-		__rel_dyn_start = .;
-		*(.rel*)
-		__rel_dyn_end = .;
+	__u_boot_list : {
+		KEEP(*(SORT(__u_boot_list*)));
+		. = ALIGN(8);
 	} >.sram
 
 	__image_copy_end = .;
@@ -58,3 +54,6 @@ SECTIONS
 		__bss_end = .;
 	} >.sdram
 }
+
+ASSERT(_image_binary_end % 8 == 0, \
+       "_image_binary_end must be 8-byte aligned for device tree");
diff --git a/board/dhelectronics/dh_stm32mp1/board.c b/board/dhelectronics/dh_stm32mp1/board.c
index 55526189d5a..90590d14941 100644
--- a/board/dhelectronics/dh_stm32mp1/board.c
+++ b/board/dhelectronics/dh_stm32mp1/board.c
@@ -314,7 +314,7 @@ int board_stm32mp1_ddr_config_name_match(struct udevice *dev,
 			return 0;
 	}
 
-	if (IS_ENABLED(CONFIG_TARGET_DH_STM32MP15X)) {
+	if (IS_ENABLED(CONFIG_STM32MP15X)) {
 		if (ddr3code == 1 &&
 		    !strcmp(name, "st,ddr3l-dhsom-1066-888-bin-g-2x1gb-533mhz"))
 			return 0;
diff --git a/board/ea/mx7ulp_com/imximage.cfg b/board/ea/mx7ulp_com/imximage.cfg
index 1731da814d0..c77a9966076 100644
--- a/board/ea/mx7ulp_com/imximage.cfg
+++ b/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
diff --git a/board/freescale/imx93_frdm/imx93_frdm.c b/board/freescale/imx93_frdm/imx93_frdm.c
deleted file mode 100644
index c436ac6aa47..00000000000
--- a/board/freescale/imx93_frdm/imx93_frdm.c
+++ /dev/null
@@ -1,65 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2025 NXP
- */
-
-#include <env.h>
-#include <efi_loader.h>
-#include <init.h>
-#include <asm/global_data.h>
-#include <asm/arch/sys_proto.h>
-#include <asm/arch-imx9/imx93_pins.h>
-#include <asm/arch/clock.h>
-#include <asm/mach-imx/boot_mode.h>
-#include <dm/device.h>
-#include <dm/uclass.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)
-#define IMX_BOOT_IMAGE_GUID \
-	EFI_GUID(0xbc550d86, 0xda26, 0x4b70, 0xac, 0x05, \
-		 0x2a, 0x44, 0x8e, 0xda, 0x6f, 0x21)
-
-struct efi_fw_image fw_images[] = {
-	{
-		.image_type_id = IMX_BOOT_IMAGE_GUID,
-		.fw_name = u"IMX93-11X11-FRDM-RAW",
-		.image_index = 1,
-	},
-};
-
-struct efi_capsule_update_info update_info = {
-	.dfu_string = "mmc 0=flash-bin raw 0 0x2000 mmcpart 1",
-	.num_images = ARRAY_SIZE(fw_images),
-	.images = fw_images,
-};
-#endif /* EFI_HAVE_CAPSULE_SUPPORT */
-
-int board_early_init_f(void)
-{
-	return 0;
-}
-
-int board_init(void)
-{
-	return 0;
-}
-
-int board_late_init(void)
-{
-	if (IS_ENABLED(CONFIG_ENV_IS_IN_MMC) || IS_ENABLED(CONFIG_ENV_IS_IN_NOWHERE))
-		board_late_mmc_env_init();
-
-	if (IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG)) {
-		env_set("board_name", "11X11_FRDM");
-		env_set("board_rev", "iMX93");
-	}
-
-	if (get_boot_device() == USB_BOOT) {
-		printf("USB boot detected. Will enter fasboot mode\n");
-		env_set_ulong("dofastboot", 1);
-	}
-
-	return 0;
-}
diff --git a/board/ge/mx53ppd/Makefile b/board/ge/mx53ppd/Makefile
index 9fae4143998..112bceda3f6 100644
--- a/board/ge/mx53ppd/Makefile
+++ b/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>
diff --git a/board/ge/mx53ppd/imximage.cfg b/board/ge/mx53ppd/imximage.cfg
index 1ee81983907..533f18b674b 100644
--- a/board/ge/mx53ppd/imximage.cfg
+++ b/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>
diff --git a/board/ge/mx53ppd/mx53ppd.c b/board/ge/mx53ppd/mx53ppd.c
index 9396d43f8ad..cb9b88a1a58 100644
--- a/board/ge/mx53ppd/mx53ppd.c
+++ b/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>
diff --git a/board/ge/mx53ppd/mx53ppd_video.c b/board/ge/mx53ppd/mx53ppd_video.c
index eb4dd758b3b..32e208aadd1 100644
--- a/board/ge/mx53ppd/mx53ppd_video.c
+++ b/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>
diff --git a/board/k+p/kp_imx53/Kconfig b/board/k+p/kp_imx53/Kconfig
index fb35127696b..ef6696b1160 100644
--- a/board/k+p/kp_imx53/Kconfig
+++ b/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
diff --git a/board/keymile/pg-wcom-ls102xa/Makefile b/board/keymile/pg-wcom-ls102xa/Makefile
index 229b0c28278..88cb95bb8c3 100644
--- a/board/keymile/pg-wcom-ls102xa/Makefile
+++ b/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
diff --git a/board/freescale/common/Makefile b/board/nxp/common/Makefile
index ed102ae7bf7..ed102ae7bf7 100644
--- a/board/freescale/common/Makefile
+++ b/board/nxp/common/Makefile
diff --git a/board/freescale/common/arm_sleep.c b/board/nxp/common/arm_sleep.c
index 228f07502f7..228f07502f7 100644
--- a/board/freescale/common/arm_sleep.c
+++ b/board/nxp/common/arm_sleep.c
diff --git a/board/freescale/common/cadmus.c b/board/nxp/common/cadmus.c
index e5ecd0e19c6..e5ecd0e19c6 100644
--- a/board/freescale/common/cadmus.c
+++ b/board/nxp/common/cadmus.c
diff --git a/board/freescale/common/cadmus.h b/board/nxp/common/cadmus.h
index 93cea120845..93cea120845 100644
--- a/board/freescale/common/cadmus.h
+++ b/board/nxp/common/cadmus.h
diff --git a/board/freescale/common/cds_pci_ft.c b/board/nxp/common/cds_pci_ft.c
index 56b01e3f51f..56b01e3f51f 100644
--- a/board/freescale/common/cds_pci_ft.c
+++ b/board/nxp/common/cds_pci_ft.c
diff --git a/board/freescale/common/cds_via.c b/board/nxp/common/cds_via.c
index 6fc3a21780f..6fc3a21780f 100644
--- a/board/freescale/common/cds_via.c
+++ b/board/nxp/common/cds_via.c
diff --git a/board/freescale/common/cmd_esbc_validate.c b/board/nxp/common/cmd_esbc_validate.c
index 7629d7091e9..7629d7091e9 100644
--- a/board/freescale/common/cmd_esbc_validate.c
+++ b/board/nxp/common/cmd_esbc_validate.c
diff --git a/board/freescale/common/eeprom.h b/board/nxp/common/eeprom.h
index 1d0685fde67..1d0685fde67 100644
--- a/board/freescale/common/eeprom.h
+++ b/board/nxp/common/eeprom.h
diff --git a/board/freescale/common/emc2305.c b/board/nxp/common/emc2305.c
index 50252bb5007..50252bb5007 100644
--- a/board/freescale/common/emc2305.c
+++ b/board/nxp/common/emc2305.c
diff --git a/board/freescale/common/emc2305.h b/board/nxp/common/emc2305.h
index 24c5410d120..24c5410d120 100644
--- a/board/freescale/common/emc2305.h
+++ b/board/nxp/common/emc2305.h
diff --git a/board/freescale/common/fman.c b/board/nxp/common/fman.c
index 650ecc7b440..650ecc7b440 100644
--- a/board/freescale/common/fman.c
+++ b/board/nxp/common/fman.c
diff --git a/board/freescale/common/fman.h b/board/nxp/common/fman.h
index 16afc34b03e..16afc34b03e 100644
--- a/board/freescale/common/fman.h
+++ b/board/nxp/common/fman.h
diff --git a/board/freescale/common/fsl_chain_of_trust.c b/board/nxp/common/fsl_chain_of_trust.c
index 3d44357caf7..3d44357caf7 100644
--- a/board/freescale/common/fsl_chain_of_trust.c
+++ b/board/nxp/common/fsl_chain_of_trust.c
diff --git a/board/freescale/common/fsl_validate.c b/board/nxp/common/fsl_validate.c
index df0c1a1f406..df0c1a1f406 100644
--- a/board/freescale/common/fsl_validate.c
+++ b/board/nxp/common/fsl_validate.c
diff --git a/board/freescale/common/i2c_common.c b/board/nxp/common/i2c_common.c
index 20705ecc8e4..20705ecc8e4 100644
--- a/board/freescale/common/i2c_common.c
+++ b/board/nxp/common/i2c_common.c
diff --git a/board/freescale/common/i2c_common.h b/board/nxp/common/i2c_common.h
index 77a7b6aedd7..77a7b6aedd7 100644
--- a/board/freescale/common/i2c_common.h
+++ b/board/nxp/common/i2c_common.h
diff --git a/board/freescale/common/i2c_mux.c b/board/nxp/common/i2c_mux.c
index 89151ccaf06..89151ccaf06 100644
--- a/board/freescale/common/i2c_mux.c
+++ b/board/nxp/common/i2c_mux.c
diff --git a/board/freescale/common/i2c_mux.h b/board/nxp/common/i2c_mux.h
index 0870c1918e6..0870c1918e6 100644
--- a/board/freescale/common/i2c_mux.h
+++ b/board/nxp/common/i2c_mux.h
diff --git a/board/freescale/common/ics307_clk.c b/board/nxp/common/ics307_clk.c
index af30faa0c5f..af30faa0c5f 100644
--- a/board/freescale/common/ics307_clk.c
+++ b/board/nxp/common/ics307_clk.c
diff --git a/board/freescale/common/ics307_clk.h b/board/nxp/common/ics307_clk.h
index 163496930c8..163496930c8 100644
--- a/board/freescale/common/ics307_clk.h
+++ b/board/nxp/common/ics307_clk.h
diff --git a/board/freescale/common/ls102xa_stream_id.c b/board/nxp/common/ls102xa_stream_id.c
index bf76274c43c..bf76274c43c 100644
--- a/board/freescale/common/ls102xa_stream_id.c
+++ b/board/nxp/common/ls102xa_stream_id.c
diff --git a/board/freescale/common/mc34vr500.c b/board/nxp/common/mc34vr500.c
index cf14b29a3ec..cf14b29a3ec 100644
--- a/board/freescale/common/mc34vr500.c
+++ b/board/nxp/common/mc34vr500.c
diff --git a/board/freescale/common/mmc.c b/board/nxp/common/mmc.c
index 00e4f3675fe..00e4f3675fe 100644
--- a/board/freescale/common/mmc.c
+++ b/board/nxp/common/mmc.c
diff --git a/board/freescale/common/mpc85xx_sleep.c b/board/nxp/common/mpc85xx_sleep.c
index d4ca278e883..d4ca278e883 100644
--- a/board/freescale/common/mpc85xx_sleep.c
+++ b/board/nxp/common/mpc85xx_sleep.c
diff --git a/board/freescale/common/ngpixis.c b/board/nxp/common/ngpixis.c
index 74c345807e6..74c345807e6 100644
--- a/board/freescale/common/ngpixis.c
+++ b/board/nxp/common/ngpixis.c
diff --git a/board/freescale/common/ngpixis.h b/board/nxp/common/ngpixis.h
index 7a20ee015fa..7a20ee015fa 100644
--- a/board/freescale/common/ngpixis.h
+++ b/board/nxp/common/ngpixis.h
diff --git a/board/freescale/common/ns_access.c b/board/nxp/common/ns_access.c
index c46e87f4cce..c46e87f4cce 100644
--- a/board/freescale/common/ns_access.c
+++ b/board/nxp/common/ns_access.c
diff --git a/board/freescale/common/p_corenet/Makefile b/board/nxp/common/p_corenet/Makefile
index ce156018a06..ce156018a06 100644
--- a/board/freescale/common/p_corenet/Makefile
+++ b/board/nxp/common/p_corenet/Makefile
diff --git a/board/freescale/common/p_corenet/law.c b/board/nxp/common/p_corenet/law.c
index 83818d6d847..83818d6d847 100644
--- a/board/freescale/common/p_corenet/law.c
+++ b/board/nxp/common/p_corenet/law.c
diff --git a/board/freescale/common/p_corenet/tlb.c b/board/nxp/common/p_corenet/tlb.c
index cebdedfa4a7..cebdedfa4a7 100644
--- a/board/freescale/common/p_corenet/tlb.c
+++ b/board/nxp/common/p_corenet/tlb.c
diff --git a/board/freescale/common/pfuze.c b/board/nxp/common/pfuze.c
index 0d7a94fd232..0d7a94fd232 100644
--- a/board/freescale/common/pfuze.c
+++ b/board/nxp/common/pfuze.c
diff --git a/board/freescale/common/pfuze.h b/board/nxp/common/pfuze.h
index 45b49afaeb7..45b49afaeb7 100644
--- a/board/freescale/common/pfuze.h
+++ b/board/nxp/common/pfuze.h
diff --git a/board/freescale/common/qixis.c b/board/nxp/common/qixis.c
index 04cad48f033..04cad48f033 100644
--- a/board/freescale/common/qixis.c
+++ b/board/nxp/common/qixis.c
diff --git a/board/freescale/common/qixis.h b/board/nxp/common/qixis.h
index 0a0df6f34f8..0a0df6f34f8 100644
--- a/board/freescale/common/qixis.h
+++ b/board/nxp/common/qixis.h
diff --git a/board/freescale/common/sdhc_boot.c b/board/nxp/common/sdhc_boot.c
index 5ee730cefd0..5ee730cefd0 100644
--- a/board/freescale/common/sdhc_boot.c
+++ b/board/nxp/common/sdhc_boot.c
diff --git a/board/freescale/common/sgmii_riser.h b/board/nxp/common/sgmii_riser.h
index e1fcc858f3f..e1fcc858f3f 100644
--- a/board/freescale/common/sgmii_riser.h
+++ b/board/nxp/common/sgmii_riser.h
diff --git a/board/freescale/common/sleep.h b/board/nxp/common/sleep.h
index 1450baa0725..1450baa0725 100644
--- a/board/freescale/common/sleep.h
+++ b/board/nxp/common/sleep.h
diff --git a/board/freescale/common/spl.h b/board/nxp/common/spl.h
index d4689d3d726..d4689d3d726 100644
--- a/board/freescale/common/spl.h
+++ b/board/nxp/common/spl.h
diff --git a/board/freescale/common/sys_eeprom.c b/board/nxp/common/sys_eeprom.c
index ec3c9e37222..ec3c9e37222 100644
--- a/board/freescale/common/sys_eeprom.c
+++ b/board/nxp/common/sys_eeprom.c
diff --git a/board/freescale/common/via.h b/board/nxp/common/via.h
index 77cfacc5261..77cfacc5261 100644
--- a/board/freescale/common/via.h
+++ b/board/nxp/common/via.h
diff --git a/board/freescale/common/vid.c b/board/nxp/common/vid.c
index 84cb43fad56..84cb43fad56 100644
--- a/board/freescale/common/vid.c
+++ b/board/nxp/common/vid.c
diff --git a/board/freescale/common/vid.h b/board/nxp/common/vid.h
index b34c080b4ba..b34c080b4ba 100644
--- a/board/freescale/common/vid.h
+++ b/board/nxp/common/vid.h
diff --git a/board/freescale/common/vsc3316_3308.h b/board/nxp/common/vsc3316_3308.h
index 9725d6d9e39..9725d6d9e39 100644
--- a/board/freescale/common/vsc3316_3308.h
+++ b/board/nxp/common/vsc3316_3308.h
diff --git a/board/freescale/imx8mm_evk/Kconfig b/board/nxp/imx8mm_evk/Kconfig
index 24cc526b0ab..3b7025af053 100644
--- a/board/freescale/imx8mm_evk/Kconfig
+++ b/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
diff --git a/board/freescale/imx8mm_evk/MAINTAINERS b/board/nxp/imx8mm_evk/MAINTAINERS
index 875adf58ee2..d63202418f9 100644
--- a/board/freescale/imx8mm_evk/MAINTAINERS
+++ b/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
diff --git a/board/freescale/imx8mm_evk/Makefile b/board/nxp/imx8mm_evk/Makefile
index 9fecd8dd8cb..9fecd8dd8cb 100644
--- a/board/freescale/imx8mm_evk/Makefile
+++ b/board/nxp/imx8mm_evk/Makefile
diff --git a/board/freescale/imx8mm_evk/imx8mm_evk.c b/board/nxp/imx8mm_evk/imx8mm_evk.c
index ecc20768cb5..ecc20768cb5 100644
--- a/board/freescale/imx8mm_evk/imx8mm_evk.c
+++ b/board/nxp/imx8mm_evk/imx8mm_evk.c
diff --git a/board/freescale/imx8mm_evk/imx8mm_evk.env b/board/nxp/imx8mm_evk/imx8mm_evk.env
index 299b8472c74..299b8472c74 100644
--- a/board/freescale/imx8mm_evk/imx8mm_evk.env
+++ b/board/nxp/imx8mm_evk/imx8mm_evk.env
diff --git a/board/freescale/imx8mm_evk/imximage-8mm-lpddr4-fspi.cfg b/board/nxp/imx8mm_evk/imximage-8mm-lpddr4-fspi.cfg
index fcace8a93a0..fcace8a93a0 100644
--- a/board/freescale/imx8mm_evk/imximage-8mm-lpddr4-fspi.cfg
+++ b/board/nxp/imx8mm_evk/imximage-8mm-lpddr4-fspi.cfg
diff --git a/board/freescale/imx8mm_evk/imximage-8mm-lpddr4.cfg b/board/nxp/imx8mm_evk/imximage-8mm-lpddr4.cfg
index 20061521f22..20061521f22 100644
--- a/board/freescale/imx8mm_evk/imximage-8mm-lpddr4.cfg
+++ b/board/nxp/imx8mm_evk/imximage-8mm-lpddr4.cfg
diff --git a/board/freescale/imx8mm_evk/lpddr4_timing.c b/board/nxp/imx8mm_evk/lpddr4_timing.c
index 4373ca624e4..4373ca624e4 100644
--- a/board/freescale/imx8mm_evk/lpddr4_timing.c
+++ b/board/nxp/imx8mm_evk/lpddr4_timing.c
diff --git a/board/freescale/imx8mm_evk/spl.c b/board/nxp/imx8mm_evk/spl.c
index cd251d274ff..cd251d274ff 100644
--- a/board/freescale/imx8mm_evk/spl.c
+++ b/board/nxp/imx8mm_evk/spl.c
diff --git a/board/freescale/imx8mn_evk/Kconfig b/board/nxp/imx8mn_evk/Kconfig
index a148a9b998c..9ae21db6974 100644
--- a/board/freescale/imx8mn_evk/Kconfig
+++ b/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
diff --git a/board/freescale/imx8mn_evk/MAINTAINERS b/board/nxp/imx8mn_evk/MAINTAINERS
index 6d110ccf22b..19ebfb2b1a1 100644
--- a/board/freescale/imx8mn_evk/MAINTAINERS
+++ b/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
diff --git a/board/freescale/imx8mn_evk/Makefile b/board/nxp/imx8mn_evk/Makefile
index 5ef666a36dd..5ef666a36dd 100644
--- a/board/freescale/imx8mn_evk/Makefile
+++ b/board/nxp/imx8mn_evk/Makefile
diff --git a/board/freescale/imx8mn_evk/ddr4_timing.c b/board/nxp/imx8mn_evk/ddr4_timing.c
index ce39c9e2bcf..ce39c9e2bcf 100644
--- a/board/freescale/imx8mn_evk/ddr4_timing.c
+++ b/board/nxp/imx8mn_evk/ddr4_timing.c
diff --git a/board/freescale/imx8mn_evk/ddr4_timing_ld.c b/board/nxp/imx8mn_evk/ddr4_timing_ld.c
index d719b5916f5..d719b5916f5 100644
--- a/board/freescale/imx8mn_evk/ddr4_timing_ld.c
+++ b/board/nxp/imx8mn_evk/ddr4_timing_ld.c
diff --git a/board/freescale/imx8mn_evk/imx8mn_evk.c b/board/nxp/imx8mn_evk/imx8mn_evk.c
index 9d3f29f2253..9d3f29f2253 100644
--- a/board/freescale/imx8mn_evk/imx8mn_evk.c
+++ b/board/nxp/imx8mn_evk/imx8mn_evk.c
diff --git a/board/freescale/imx8mn_evk/imx8mn_evk.env b/board/nxp/imx8mn_evk/imx8mn_evk.env
index 487893f9287..487893f9287 100644
--- a/board/freescale/imx8mn_evk/imx8mn_evk.env
+++ b/board/nxp/imx8mn_evk/imx8mn_evk.env
diff --git a/board/freescale/imx8mn_evk/imximage-8mn-ddr4.cfg b/board/nxp/imx8mn_evk/imximage-8mn-ddr4.cfg
index 0edda9c5e06..0edda9c5e06 100644
--- a/board/freescale/imx8mn_evk/imximage-8mn-ddr4.cfg
+++ b/board/nxp/imx8mn_evk/imximage-8mn-ddr4.cfg
diff --git a/board/freescale/imx8mn_evk/lpddr4_timing.c b/board/nxp/imx8mn_evk/lpddr4_timing.c
index 671e924132a..671e924132a 100644
--- a/board/freescale/imx8mn_evk/lpddr4_timing.c
+++ b/board/nxp/imx8mn_evk/lpddr4_timing.c
diff --git a/board/freescale/imx8mn_evk/lpddr4_timing_ld.c b/board/nxp/imx8mn_evk/lpddr4_timing_ld.c
index aa23c350945..aa23c350945 100644
--- a/board/freescale/imx8mn_evk/lpddr4_timing_ld.c
+++ b/board/nxp/imx8mn_evk/lpddr4_timing_ld.c
diff --git a/board/freescale/imx8mn_evk/spl.c b/board/nxp/imx8mn_evk/spl.c
index f96f5c45789..f96f5c45789 100644
--- a/board/freescale/imx8mn_evk/spl.c
+++ b/board/nxp/imx8mn_evk/spl.c
diff --git a/board/freescale/imx8mp_evk/Kconfig b/board/nxp/imx8mp_evk/Kconfig
index cafa6329a40..2dfbc2c6786 100644
--- a/board/freescale/imx8mp_evk/Kconfig
+++ b/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
diff --git a/board/freescale/imx8mp_evk/MAINTAINERS b/board/nxp/imx8mp_evk/MAINTAINERS
index 4419527b8bc..4d4e8add9ac 100644
--- a/board/freescale/imx8mp_evk/MAINTAINERS
+++ b/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
diff --git a/board/freescale/imx8mp_evk/Makefile b/board/nxp/imx8mp_evk/Makefile
index 3c154d7f7f5..3c154d7f7f5 100644
--- a/board/freescale/imx8mp_evk/Makefile
+++ b/board/nxp/imx8mp_evk/Makefile
diff --git a/board/freescale/imx8mp_evk/imx8mp_evk.c b/board/nxp/imx8mp_evk/imx8mp_evk.c
index 732c0fa561d..732c0fa561d 100644
--- a/board/freescale/imx8mp_evk/imx8mp_evk.c
+++ b/board/nxp/imx8mp_evk/imx8mp_evk.c
diff --git a/board/freescale/imx8mp_evk/imx8mp_evk.env b/board/nxp/imx8mp_evk/imx8mp_evk.env
index 18cdf3da056..18cdf3da056 100644
--- a/board/freescale/imx8mp_evk/imx8mp_evk.env
+++ b/board/nxp/imx8mp_evk/imx8mp_evk.env
diff --git a/board/freescale/imx8mp_evk/imximage-8mp-lpddr4.cfg b/board/nxp/imx8mp_evk/imximage-8mp-lpddr4.cfg
index 6dedf1724ab..6dedf1724ab 100644
--- a/board/freescale/imx8mp_evk/imximage-8mp-lpddr4.cfg
+++ b/board/nxp/imx8mp_evk/imximage-8mp-lpddr4.cfg
diff --git a/board/freescale/imx8mp_evk/lpddr4_timing.c b/board/nxp/imx8mp_evk/lpddr4_timing.c
index 8c5306d5d20..8c5306d5d20 100644
--- a/board/freescale/imx8mp_evk/lpddr4_timing.c
+++ b/board/nxp/imx8mp_evk/lpddr4_timing.c
diff --git a/board/freescale/imx8mp_evk/spl.c b/board/nxp/imx8mp_evk/spl.c
index 12da1b2abfb..12da1b2abfb 100644
--- a/board/freescale/imx8mp_evk/spl.c
+++ b/board/nxp/imx8mp_evk/spl.c
diff --git a/board/freescale/imx8mq_evk/Kconfig b/board/nxp/imx8mq_evk/Kconfig
index c4d20ad7c7d..dd5c58a9d0f 100644
--- a/board/freescale/imx8mq_evk/Kconfig
+++ b/board/nxp/imx8mq_evk/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "imx8mq_evk"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "imx8mq_evk"
diff --git a/board/freescale/imx8mq_evk/MAINTAINERS b/board/nxp/imx8mq_evk/MAINTAINERS
index a00bb4ef786..2fd584ea97c 100644
--- a/board/freescale/imx8mq_evk/MAINTAINERS
+++ b/board/nxp/imx8mq_evk/MAINTAINERS
@@ -2,6 +2,6 @@ i.MX8MQ EVK BOARD
 M:	Peng Fan <peng.fan@nxp.com>
 M:	Fabio Estevam <festevam@gmail.com>
 S:	Maintained
-F:	board/freescale/imx8mq_evk/
+F:	board/nxp/imx8mq_evk/
 F:	include/configs/imx8mq_evk.h
 F:	configs/imx8mq_evk_defconfig
diff --git a/board/freescale/imx8mq_evk/Makefile b/board/nxp/imx8mq_evk/Makefile
index ca449e6f369..ca449e6f369 100644
--- a/board/freescale/imx8mq_evk/Makefile
+++ b/board/nxp/imx8mq_evk/Makefile
diff --git a/board/freescale/imx8mq_evk/imx8mq_evk.c b/board/nxp/imx8mq_evk/imx8mq_evk.c
index e90c56c33ff..e90c56c33ff 100644
--- a/board/freescale/imx8mq_evk/imx8mq_evk.c
+++ b/board/nxp/imx8mq_evk/imx8mq_evk.c
diff --git a/board/freescale/imx8mq_evk/imx8mq_evk.env b/board/nxp/imx8mq_evk/imx8mq_evk.env
index cab8c6b70bf..cab8c6b70bf 100644
--- a/board/freescale/imx8mq_evk/imx8mq_evk.env
+++ b/board/nxp/imx8mq_evk/imx8mq_evk.env
diff --git a/board/freescale/imx8mq_evk/lpddr4_timing.c b/board/nxp/imx8mq_evk/lpddr4_timing.c
index e9559e3d843..e9559e3d843 100644
--- a/board/freescale/imx8mq_evk/lpddr4_timing.c
+++ b/board/nxp/imx8mq_evk/lpddr4_timing.c
diff --git a/board/freescale/imx8mq_evk/lpddr4_timing_b0.c b/board/nxp/imx8mq_evk/lpddr4_timing_b0.c
index 5d8f2803be6..5d8f2803be6 100644
--- a/board/freescale/imx8mq_evk/lpddr4_timing_b0.c
+++ b/board/nxp/imx8mq_evk/lpddr4_timing_b0.c
diff --git a/board/freescale/imx8mq_evk/spl.c b/board/nxp/imx8mq_evk/spl.c
index a346305c863..a346305c863 100644
--- a/board/freescale/imx8mq_evk/spl.c
+++ b/board/nxp/imx8mq_evk/spl.c
diff --git a/board/freescale/imx8qm_mek/Kconfig b/board/nxp/imx8qm_mek/Kconfig
index 5f2413f8dbf..789de0f1a07 100644
--- a/board/freescale/imx8qm_mek/Kconfig
+++ b/board/nxp/imx8qm_mek/Kconfig
@@ -4,12 +4,12 @@ config SYS_BOARD
 	default "imx8qm_mek"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "imx8qm_mek"
 
 config IMX_CONFIG
-	default "board/freescale/imx8qm_mek/imximage.cfg"
+	default "board/nxp/imx8qm_mek/imximage.cfg"
 
 endif
diff --git a/board/freescale/imx8qm_mek/MAINTAINERS b/board/nxp/imx8qm_mek/MAINTAINERS
index 115830df19b..b3b4f9b9c23 100644
--- a/board/freescale/imx8qm_mek/MAINTAINERS
+++ b/board/nxp/imx8qm_mek/MAINTAINERS
@@ -1,6 +1,6 @@
 i.MX8QM MEK BOARD
 M:	Peng Fan <peng.fan@nxp.com>
 S:	Maintained
-F:	board/freescale/imx8qm_mek/
+F:	board/nxp/imx8qm_mek/
 F:	include/configs/imx8qm_mek.h
 F:	configs/imx8qm_mek_defconfig
diff --git a/board/freescale/imx8qm_mek/Makefile b/board/nxp/imx8qm_mek/Makefile
index 53b33a0dfb1..53b33a0dfb1 100644
--- a/board/freescale/imx8qm_mek/Makefile
+++ b/board/nxp/imx8qm_mek/Makefile
diff --git a/board/freescale/imx8qm_mek/README b/board/nxp/imx8qm_mek/README
index 47fae3d2843..47fae3d2843 100644
--- a/board/freescale/imx8qm_mek/README
+++ b/board/nxp/imx8qm_mek/README
diff --git a/board/freescale/imx8qm_mek/imx8qm_mek.c b/board/nxp/imx8qm_mek/imx8qm_mek.c
index 72527f774ca..72527f774ca 100644
--- a/board/freescale/imx8qm_mek/imx8qm_mek.c
+++ b/board/nxp/imx8qm_mek/imx8qm_mek.c
diff --git a/board/freescale/imx8qm_mek/imximage.cfg b/board/nxp/imx8qm_mek/imximage.cfg
index 71612678c99..71612678c99 100644
--- a/board/freescale/imx8qm_mek/imximage.cfg
+++ b/board/nxp/imx8qm_mek/imximage.cfg
diff --git a/board/freescale/imx8qm_mek/spl.c b/board/nxp/imx8qm_mek/spl.c
index ad786833309..ad786833309 100644
--- a/board/freescale/imx8qm_mek/spl.c
+++ b/board/nxp/imx8qm_mek/spl.c
diff --git a/board/freescale/imx8qm_mek/uboot-container.cfg b/board/nxp/imx8qm_mek/uboot-container.cfg
index e25aa76fe18..e25aa76fe18 100644
--- a/board/freescale/imx8qm_mek/uboot-container.cfg
+++ b/board/nxp/imx8qm_mek/uboot-container.cfg
diff --git a/board/freescale/imx8qxp_mek/Kconfig b/board/nxp/imx8qxp_mek/Kconfig
index 6533b4d9535..3d0b13061e0 100644
--- a/board/freescale/imx8qxp_mek/Kconfig
+++ b/board/nxp/imx8qxp_mek/Kconfig
@@ -4,12 +4,12 @@ config SYS_BOARD
 	default "imx8qxp_mek"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "imx8qxp_mek"
 
 config IMX_CONFIG
-	default "board/freescale/imx8qxp_mek/imximage.cfg"
+	default "board/nxp/imx8qxp_mek/imximage.cfg"
 
 endif
diff --git a/board/freescale/imx8qxp_mek/MAINTAINERS b/board/nxp/imx8qxp_mek/MAINTAINERS
index 3a21f5521d8..4e8fbd15876 100644
--- a/board/freescale/imx8qxp_mek/MAINTAINERS
+++ b/board/nxp/imx8qxp_mek/MAINTAINERS
@@ -2,6 +2,6 @@ i.MX8QXP MEK BOARD
 M:	Peng Fan <peng.fan@nxp.com>
 M:	Fabio Estevam <festevam@gmail.com>
 S:	Maintained
-F:	board/freescale/imx8qxp_mek/
+F:	board/nxp/imx8qxp_mek/
 F:	include/configs/imx8qxp_mek.h
 F:	configs/imx8qxp_mek_defconfig
diff --git a/board/freescale/imx8qxp_mek/Makefile b/board/nxp/imx8qxp_mek/Makefile
index 459ec771eea..459ec771eea 100644
--- a/board/freescale/imx8qxp_mek/Makefile
+++ b/board/nxp/imx8qxp_mek/Makefile
diff --git a/board/freescale/imx8qxp_mek/imx8qxp_mek.c b/board/nxp/imx8qxp_mek/imx8qxp_mek.c
index adb9556a021..adb9556a021 100644
--- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c
+++ b/board/nxp/imx8qxp_mek/imx8qxp_mek.c
diff --git a/board/freescale/imx8qxp_mek/imximage.cfg b/board/nxp/imx8qxp_mek/imximage.cfg
index 88d6955a9ef..88d6955a9ef 100644
--- a/board/freescale/imx8qxp_mek/imximage.cfg
+++ b/board/nxp/imx8qxp_mek/imximage.cfg
diff --git a/board/freescale/imx8qxp_mek/spl.c b/board/nxp/imx8qxp_mek/spl.c
index 05e3c0a2ff2..05e3c0a2ff2 100644
--- a/board/freescale/imx8qxp_mek/spl.c
+++ b/board/nxp/imx8qxp_mek/spl.c
diff --git a/board/freescale/imx8qxp_mek/uboot-container.cfg b/board/nxp/imx8qxp_mek/uboot-container.cfg
index b481c98f929..b481c98f929 100644
--- a/board/freescale/imx8qxp_mek/uboot-container.cfg
+++ b/board/nxp/imx8qxp_mek/uboot-container.cfg
diff --git a/board/freescale/imx8ulp_evk/Kconfig b/board/nxp/imx8ulp_evk/Kconfig
index 4637b969be6..c6c48a30f09 100644
--- a/board/freescale/imx8ulp_evk/Kconfig
+++ b/board/nxp/imx8ulp_evk/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "imx8ulp_evk"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "imx8ulp_evk"
diff --git a/board/freescale/imx8ulp_evk/MAINTAINERS b/board/nxp/imx8ulp_evk/MAINTAINERS
index 267b7b0caa5..67f725b5c54 100644
--- a/board/freescale/imx8ulp_evk/MAINTAINERS
+++ b/board/nxp/imx8ulp_evk/MAINTAINERS
@@ -1,6 +1,6 @@
 i.MX8ULP EVK BOARD
 M:	Peng Fan <peng.fan@nxp.com>
 S:	Maintained
-F:	board/freescale/imx8ulp_evk/
+F:	board/nxp/imx8ulp_evk/
 F:	include/configs/imx8ulp_evk.h
 F:	configs/imx8ulp_evk_defconfig
diff --git a/board/freescale/imx8ulp_evk/Makefile b/board/nxp/imx8ulp_evk/Makefile
index 7819b2675b3..7819b2675b3 100644
--- a/board/freescale/imx8ulp_evk/Makefile
+++ b/board/nxp/imx8ulp_evk/Makefile
diff --git a/board/freescale/imx8ulp_evk/imx8ulp_evk.c b/board/nxp/imx8ulp_evk/imx8ulp_evk.c
index 4bf77a488cc..4bf77a488cc 100644
--- a/board/freescale/imx8ulp_evk/imx8ulp_evk.c
+++ b/board/nxp/imx8ulp_evk/imx8ulp_evk.c
diff --git a/board/freescale/imx8ulp_evk/imx8ulp_evk.env b/board/nxp/imx8ulp_evk/imx8ulp_evk.env
index 52d7f447029..52d7f447029 100644
--- a/board/freescale/imx8ulp_evk/imx8ulp_evk.env
+++ b/board/nxp/imx8ulp_evk/imx8ulp_evk.env
diff --git a/board/freescale/imx8ulp_evk/lpddr4_timing.c b/board/nxp/imx8ulp_evk/lpddr4_timing.c
index 6d2805315b4..6d2805315b4 100644
--- a/board/freescale/imx8ulp_evk/lpddr4_timing.c
+++ b/board/nxp/imx8ulp_evk/lpddr4_timing.c
diff --git a/board/freescale/imx8ulp_evk/lpddr4_timing_266.c b/board/nxp/imx8ulp_evk/lpddr4_timing_266.c
index 79457601461..79457601461 100644
--- a/board/freescale/imx8ulp_evk/lpddr4_timing_266.c
+++ b/board/nxp/imx8ulp_evk/lpddr4_timing_266.c
diff --git a/board/freescale/imx8ulp_evk/spl.c b/board/nxp/imx8ulp_evk/spl.c
index fe637077928..fe637077928 100644
--- a/board/freescale/imx8ulp_evk/spl.c
+++ b/board/nxp/imx8ulp_evk/spl.c
diff --git a/board/freescale/imx91_evk/Kconfig b/board/nxp/imx91_evk/Kconfig
index caaa82b4af8..07baf63932c 100644
--- a/board/freescale/imx91_evk/Kconfig
+++ b/board/nxp/imx91_evk/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "imx91_evk"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "imx91_evk"
diff --git a/board/freescale/imx91_evk/MAINTAINERS b/board/nxp/imx91_evk/MAINTAINERS
index f7d39bfb0a3..ed701dd6838 100644
--- a/board/freescale/imx91_evk/MAINTAINERS
+++ b/board/nxp/imx91_evk/MAINTAINERS
@@ -1,7 +1,7 @@
 i.MX91 11x11 EVK BOARD
 M:	Peng Fan <peng.fan@nxp.com>
 S:	Maintained
-F:	board/freescale/imx91_evk/
+F:	board/nxp/imx91_evk/
 F:	include/configs/imx91_evk.h
 F:	configs/imx91_11x11_evk_defconfig
 F:	configs/imx91_11x11_evk_inline_ecc_defconfig
diff --git a/board/freescale/imx91_evk/Makefile b/board/nxp/imx91_evk/Makefile
index a96228af959..a96228af959 100644
--- a/board/freescale/imx91_evk/Makefile
+++ b/board/nxp/imx91_evk/Makefile
diff --git a/board/freescale/imx91_evk/imx91_evk.c b/board/nxp/imx91_evk/imx91_evk.c
index cbd0a72bf4b..fca2521081b 100644
--- a/board/freescale/imx91_evk/imx91_evk.c
+++ b/board/nxp/imx91_evk/imx91_evk.c
@@ -5,8 +5,6 @@
 
 #include <env.h>
 #include <init.h>
-#include <miiphy.h>
-#include <netdev.h>
 #include <asm/arch/sys_proto.h>
 
 int board_late_init(void)
diff --git a/board/freescale/imx91_evk/imx91_evk.env b/board/nxp/imx91_evk/imx91_evk.env
index 6c10784cf61..6c10784cf61 100644
--- a/board/freescale/imx91_evk/imx91_evk.env
+++ b/board/nxp/imx91_evk/imx91_evk.env
diff --git a/board/freescale/imx91_evk/lpddr4_timing_1600mts.c b/board/nxp/imx91_evk/lpddr4_timing_1600mts.c
index 45e19daa028..45e19daa028 100644
--- a/board/freescale/imx91_evk/lpddr4_timing_1600mts.c
+++ b/board/nxp/imx91_evk/lpddr4_timing_1600mts.c
diff --git a/board/freescale/imx91_evk/lpddr4_timing_1600mts_ecc.c b/board/nxp/imx91_evk/lpddr4_timing_1600mts_ecc.c
index 4594ab68aa0..4594ab68aa0 100644
--- a/board/freescale/imx91_evk/lpddr4_timing_1600mts_ecc.c
+++ b/board/nxp/imx91_evk/lpddr4_timing_1600mts_ecc.c
diff --git a/board/freescale/imx91_evk/lpddr4_timing_2400mts.c b/board/nxp/imx91_evk/lpddr4_timing_2400mts.c
index e0e6f5da3d6..e0e6f5da3d6 100644
--- a/board/freescale/imx91_evk/lpddr4_timing_2400mts.c
+++ b/board/nxp/imx91_evk/lpddr4_timing_2400mts.c
diff --git a/board/freescale/imx91_evk/lpddr4_timing_2400mts_ecc.c b/board/nxp/imx91_evk/lpddr4_timing_2400mts_ecc.c
index 811687170c3..811687170c3 100644
--- a/board/freescale/imx91_evk/lpddr4_timing_2400mts_ecc.c
+++ b/board/nxp/imx91_evk/lpddr4_timing_2400mts_ecc.c
diff --git a/board/freescale/imx91_evk/spl.c b/board/nxp/imx91_evk/spl.c
index 46bde93fe3b..2aa63a61b74 100644
--- a/board/freescale/imx91_evk/spl.c
+++ b/board/nxp/imx91_evk/spl.c
@@ -3,35 +3,19 @@
  * Copyright 2024 NXP
  */
 
-#include <command.h>
-#include <cpu_func.h>
-#include <hang.h>
-#include <image.h>
 #include <init.h>
-#include <log.h>
+#include <power/pmic.h>
+#include <power/pca9450.h>
 #include <spl.h>
 #include <asm/global_data.h>
-#include <asm/io.h>
-#include <asm/arch/mu.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/sys_proto.h>
-#include <asm/mach-imx/boot_mode.h>
-#include <asm/mach-imx/mxc_i2c.h>
-#include <asm/arch-mx7ulp/gpio.h>
-#include <asm/mach-imx/ele_api.h>
-#include <asm/mach-imx/syscounter.h>
 #include <asm/sections.h>
-#include <dm/uclass.h>
-#include <dm/device.h>
-#include <dm/uclass-internal.h>
-#include <dm/device-internal.h>
-#include <linux/delay.h>
 #include <asm/arch/clock.h>
-#include <asm/arch/ccm_regs.h>
 #include <asm/arch/ddr.h>
-#include <power/pmic.h>
-#include <power/pca9450.h>
+#include <asm/arch/mu.h>
+#include <asm/arch/sys_proto.h>
 #include <asm/arch/trdc.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/ele_api.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/imx91_frdm/Kconfig b/board/nxp/imx91_frdm/Kconfig
index 68f4bb5c7ec..d536407531a 100644
--- a/board/freescale/imx91_frdm/Kconfig
+++ b/board/nxp/imx91_frdm/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "imx91_frdm"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "imx91_frdm"
diff --git a/board/freescale/imx91_frdm/MAINTAINERS b/board/nxp/imx91_frdm/MAINTAINERS
index bf5320f03db..19e8b8421ec 100644
--- a/board/freescale/imx91_frdm/MAINTAINERS
+++ b/board/nxp/imx91_frdm/MAINTAINERS
@@ -1,7 +1,7 @@
 FRDM-IMX91 BOARD
 M:	Joseph Guo <qijian.guo@nxp.com>
 S:	Maintained
-F:	board/freescale/imx91_frdm/
+F:	board/nxp/imx91_frdm/
 F:	include/configs/imx91_frdm.h
 F:	configs/imx91_11x11_frdm_defconfig
 F:	configs/imx91_11x11_frdm_inline_ecc_defconfig
diff --git a/board/freescale/imx91_frdm/Makefile b/board/nxp/imx91_frdm/Makefile
index 75510b13b44..75510b13b44 100644
--- a/board/freescale/imx91_frdm/Makefile
+++ b/board/nxp/imx91_frdm/Makefile
diff --git a/board/freescale/imx91_frdm/imx91_frdm.c b/board/nxp/imx91_frdm/imx91_frdm.c
index 14ad464ded1..14ad464ded1 100644
--- a/board/freescale/imx91_frdm/imx91_frdm.c
+++ b/board/nxp/imx91_frdm/imx91_frdm.c
diff --git a/board/freescale/imx91_frdm/imx91_frdm.env b/board/nxp/imx91_frdm/imx91_frdm.env
index b0450ff576c..b0450ff576c 100644
--- a/board/freescale/imx91_frdm/imx91_frdm.env
+++ b/board/nxp/imx91_frdm/imx91_frdm.env
diff --git a/board/freescale/imx91_frdm/lpddr4_2400mts_1gb_timing.c b/board/nxp/imx91_frdm/lpddr4_2400mts_1gb_timing.c
index 0a52cb9762f..0a52cb9762f 100644
--- a/board/freescale/imx91_frdm/lpddr4_2400mts_1gb_timing.c
+++ b/board/nxp/imx91_frdm/lpddr4_2400mts_1gb_timing.c
diff --git a/board/freescale/imx91_frdm/lpddr4_2400mts_2gb_timing.c b/board/nxp/imx91_frdm/lpddr4_2400mts_2gb_timing.c
index 017677fbbe9..017677fbbe9 100644
--- a/board/freescale/imx91_frdm/lpddr4_2400mts_2gb_timing.c
+++ b/board/nxp/imx91_frdm/lpddr4_2400mts_2gb_timing.c
diff --git a/board/freescale/imx91_frdm/lpddr4_2400mts_ecc_1gb_timing.c b/board/nxp/imx91_frdm/lpddr4_2400mts_ecc_1gb_timing.c
index d57e083557c..d57e083557c 100644
--- a/board/freescale/imx91_frdm/lpddr4_2400mts_ecc_1gb_timing.c
+++ b/board/nxp/imx91_frdm/lpddr4_2400mts_ecc_1gb_timing.c
diff --git a/board/freescale/imx91_frdm/lpddr4_2400mts_ecc_2gb_timing.c b/board/nxp/imx91_frdm/lpddr4_2400mts_ecc_2gb_timing.c
index 4859796be38..4859796be38 100644
--- a/board/freescale/imx91_frdm/lpddr4_2400mts_ecc_2gb_timing.c
+++ b/board/nxp/imx91_frdm/lpddr4_2400mts_ecc_2gb_timing.c
diff --git a/board/freescale/imx91_frdm/lpddr4_timing.h b/board/nxp/imx91_frdm/lpddr4_timing.h
index 9b483bbc3ed..9b483bbc3ed 100644
--- a/board/freescale/imx91_frdm/lpddr4_timing.h
+++ b/board/nxp/imx91_frdm/lpddr4_timing.h
diff --git a/board/freescale/imx91_frdm/spl.c b/board/nxp/imx91_frdm/spl.c
index cd59479d3b3..cd59479d3b3 100644
--- a/board/freescale/imx91_frdm/spl.c
+++ b/board/nxp/imx91_frdm/spl.c
diff --git a/board/freescale/imx93_evk/Kconfig b/board/nxp/imx93_evk/Kconfig
index 821144c9382..305c3963f06 100644
--- a/board/freescale/imx93_evk/Kconfig
+++ b/board/nxp/imx93_evk/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "imx93_evk"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "imx93_evk"
diff --git a/board/freescale/imx93_evk/MAINTAINERS b/board/nxp/imx93_evk/MAINTAINERS
index eb6e669bd17..da0540307c6 100644
--- a/board/freescale/imx93_evk/MAINTAINERS
+++ b/board/nxp/imx93_evk/MAINTAINERS
@@ -1,7 +1,7 @@
 i.MX93 EVK BOARD
 M:	Peng Fan <peng.fan@nxp.com>
 S:	Maintained
-F:	board/freescale/imx93_evk/
+F:	board/nxp/imx93_evk/
 F:	include/configs/imx93_evk.h
 F:	configs/imx93_11x11_evk_defconfig
 F:	configs/imx93_11x11_evk_ld_defconfig
diff --git a/board/freescale/imx93_evk/Makefile b/board/nxp/imx93_evk/Makefile
index b077acc70a5..b077acc70a5 100644
--- a/board/freescale/imx93_evk/Makefile
+++ b/board/nxp/imx93_evk/Makefile
diff --git a/board/freescale/imx93_evk/imx93_evk.c b/board/nxp/imx93_evk/imx93_evk.c
index d62f94dc418..70b07fa3c6f 100644
--- a/board/freescale/imx93_evk/imx93_evk.c
+++ b/board/nxp/imx93_evk/imx93_evk.c
@@ -6,25 +6,7 @@
 #include <env.h>
 #include <efi_loader.h>
 #include <init.h>
-#include <miiphy.h>
-#include <netdev.h>
-#include <asm/global_data.h>
-#include <asm/arch-imx9/ccm_regs.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/arch-imx9/imx93_pins.h>
-#include <asm/arch/clock.h>
-#include <dm/device.h>
-#include <dm/uclass.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#define UART_PAD_CTRL	(PAD_CTL_DSE(6) | PAD_CTL_FSEL2)
-#define WDOG_PAD_CTRL	(PAD_CTL_DSE(6) | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE)
-
-static iomux_v3_cfg_t const uart_pads[] = {
-	MX93_PAD_UART1_RXD__LPUART1_RX | MUX_PAD_CTRL(UART_PAD_CTRL),
-	MX93_PAD_UART1_TXD__LPUART1_TX | MUX_PAD_CTRL(UART_PAD_CTRL),
-};
 
 #if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT)
 #define IMX_BOOT_IMAGE_GUID \
@@ -46,34 +28,6 @@ struct efi_capsule_update_info update_info = {
 };
 #endif /* EFI_HAVE_CAPSULE_SUPPORT */
 
-int board_early_init_f(void)
-{
-	imx_iomux_v3_setup_multiple_pads(uart_pads, ARRAY_SIZE(uart_pads));
-
-	return 0;
-}
-
-static int setup_fec(void)
-{
-	return set_clk_enet(ENET_125MHZ);
-}
-
-int board_phy_config(struct phy_device *phydev)
-{
-	if (phydev->drv->config)
-		phydev->drv->config(phydev);
-
-	return 0;
-}
-
-int board_init(void)
-{
-	if (IS_ENABLED(CONFIG_FEC_MXC))
-		setup_fec();
-
-	return 0;
-}
-
 int board_late_init(void)
 {
 #if CONFIG_IS_ENABLED(ENV_IS_IN_MMC) || CONFIG_IS_ENABLED(ENV_IS_NOWHERE)
diff --git a/board/freescale/imx93_evk/imx93_evk.env b/board/nxp/imx93_evk/imx93_evk.env
index d5ed216f54b..d5ed216f54b 100644
--- a/board/freescale/imx93_evk/imx93_evk.env
+++ b/board/nxp/imx93_evk/imx93_evk.env
diff --git a/board/freescale/imx93_evk/lpddr4x_timing.c b/board/nxp/imx93_evk/lpddr4x_timing.c
index ffdf96b739f..ffdf96b739f 100644
--- a/board/freescale/imx93_evk/lpddr4x_timing.c
+++ b/board/nxp/imx93_evk/lpddr4x_timing.c
diff --git a/board/freescale/imx93_evk/lpddr4x_timing_1866mts.c b/board/nxp/imx93_evk/lpddr4x_timing_1866mts.c
index f4e910b2536..f4e910b2536 100644
--- a/board/freescale/imx93_evk/lpddr4x_timing_1866mts.c
+++ b/board/nxp/imx93_evk/lpddr4x_timing_1866mts.c
diff --git a/board/freescale/imx93_evk/spl.c b/board/nxp/imx93_evk/spl.c
index 67a10bbb05b..176d25a74a6 100644
--- a/board/freescale/imx93_evk/spl.c
+++ b/board/nxp/imx93_evk/spl.c
@@ -3,36 +3,19 @@
  * Copyright 2022 NXP
  */
 
-#include <command.h>
-#include <cpu_func.h>
-#include <hang.h>
-#include <image.h>
 #include <init.h>
-#include <log.h>
+#include <power/pmic.h>
+#include <power/pca9450.h>
 #include <spl.h>
 #include <asm/global_data.h>
-#include <asm/io.h>
-#include <asm/arch/imx93_pins.h>
-#include <asm/arch/mu.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/sys_proto.h>
-#include <asm/mach-imx/boot_mode.h>
-#include <asm/mach-imx/mxc_i2c.h>
-#include <asm/arch-mx7ulp/gpio.h>
-#include <asm/mach-imx/ele_api.h>
-#include <asm/mach-imx/syscounter.h>
 #include <asm/sections.h>
-#include <dm/uclass.h>
-#include <dm/device.h>
-#include <dm/uclass-internal.h>
-#include <dm/device-internal.h>
-#include <linux/delay.h>
 #include <asm/arch/clock.h>
-#include <asm/arch/ccm_regs.h>
 #include <asm/arch/ddr.h>
-#include <power/pmic.h>
-#include <power/pca9450.h>
+#include <asm/arch/mu.h>
+#include <asm/arch/sys_proto.h>
 #include <asm/arch/trdc.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/ele_api.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -102,6 +85,8 @@ int power_init_board(void)
 		printf("PMIC: Over Drive Voltage Mode\n");
 	}
 
+	ele_volt_change_start_req();
+
 	if (val & PCA9450_REG_PWRCTRL_TOFF_DEB) {
 		pmic_reg_write(dev, PCA9450_BUCK1OUT_DVS0, buck_val);
 		pmic_reg_write(dev, PCA9450_BUCK3OUT_DVS0, buck_val);
@@ -110,6 +95,8 @@ int power_init_board(void)
 		pmic_reg_write(dev, PCA9450_BUCK3OUT_DVS0, buck_val + 0x4);
 	}
 
+	ele_volt_change_finish_req();
+
 	/* set standby voltage to 0.65v */
 	if (val & PCA9450_REG_PWRCTRL_TOFF_DEB)
 		pmic_reg_write(dev, PCA9450_BUCK1OUT_DVS1, 0x0);
@@ -133,8 +120,6 @@ void board_init_f(ulong dummy)
 
 	arch_cpu_init();
 
-	board_early_init_f();
-
 	spl_early_init();
 
 	preloader_console_init();
diff --git a/board/freescale/imx93_frdm/Kconfig b/board/nxp/imx93_frdm/Kconfig
index 5f5ac7f8f04..d0610bce77e 100644
--- a/board/freescale/imx93_frdm/Kconfig
+++ b/board/nxp/imx93_frdm/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "imx93_frdm"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "imx93_frdm"
diff --git a/board/freescale/imx93_frdm/MAINTAINERS b/board/nxp/imx93_frdm/MAINTAINERS
index 59595bb2118..72b5daffb39 100644
--- a/board/freescale/imx93_frdm/MAINTAINERS
+++ b/board/nxp/imx93_frdm/MAINTAINERS
@@ -1,6 +1,6 @@
 i.MX93 FRDM BOARD
 M:	Fabio Estevam <festevam@gmail.com>
 S:	Maintained
-F:	board/freescale/imx93_frdm/
+F:	board/nxp/imx93_frdm/
 F:	include/configs/imx93_frdm.h
 F:	configs/imx93_frdm_defconfig
diff --git a/board/freescale/imx93_frdm/Makefile b/board/nxp/imx93_frdm/Makefile
index 9612b1fa55b..9612b1fa55b 100644
--- a/board/freescale/imx93_frdm/Makefile
+++ b/board/nxp/imx93_frdm/Makefile
diff --git a/board/nxp/imx93_frdm/imx93_frdm.c b/board/nxp/imx93_frdm/imx93_frdm.c
new file mode 100644
index 00000000000..cfbcde2e1a5
--- /dev/null
+++ b/board/nxp/imx93_frdm/imx93_frdm.c
@@ -0,0 +1,124 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2025 NXP
+ */
+
+#include <env.h>
+#include <efi_loader.h>
+#include <i2c.h>
+#include <init.h>
+#include <asm/global_data.h>
+#include <asm/arch/sys_proto.h>
+#include <asm/arch-imx9/imx93_pins.h>
+#include <asm/arch/clock.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <dm/device.h>
+#include <dm/uclass.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)
+#define IMX_BOOT_IMAGE_GUID \
+	EFI_GUID(0xbc550d86, 0xda26, 0x4b70, 0xac, 0x05, \
+		 0x2a, 0x44, 0x8e, 0xda, 0x6f, 0x21)
+
+struct efi_fw_image fw_images[] = {
+	{
+		.image_type_id = IMX_BOOT_IMAGE_GUID,
+		.fw_name = u"IMX93-11X11-FRDM-RAW",
+		.image_index = 1,
+	},
+};
+
+struct efi_capsule_update_info update_info = {
+	.dfu_string = "mmc 0=flash-bin raw 0 0x2000 mmcpart 1",
+	.num_images = ARRAY_SIZE(fw_images),
+	.images = fw_images,
+};
+#endif /* EFI_HAVE_CAPSULE_SUPPORT */
+
+#define TCPC_ALERT 0x10
+#define TCPC_ALERT_MASK 0x12
+#define TCPC_FAULT_STATUS_MASK 0x15
+
+#define TCPC1_I2C_BUS 2
+#define TCPC1_I2C_ADDR 0x50
+
+/*
+ * Mask all interrupts and clear alert status for the PTN5110 TCPC USB Power
+ * Delivery controller. This is required to avoid an interrupt storm on OS
+ * startup, since the interrupt line for the PTN5110 is shared also by the
+ * PCAL6524 I/O expander.
+ */
+static int clear_pd_alert(void)
+{
+	struct udevice *bus;
+	struct udevice *i2c_dev = NULL;
+	int ret;
+	u8 buffer_0[2] = {0, 0};
+	u8 buffer_1[2] = {0xff, 0xff};
+
+	ret = uclass_get_device_by_seq(UCLASS_I2C, TCPC1_I2C_BUS, &bus);
+	if (ret) {
+		printf("Failed to get I2C bus %d\n", TCPC1_I2C_BUS);
+		return ret;
+	}
+
+	ret = dm_i2c_probe(bus, TCPC1_I2C_ADDR, 0, &i2c_dev);
+	if (ret) {
+		printf("Can't find USB PD device at 0x%02x\n", TCPC1_I2C_ADDR);
+		return ret;
+	}
+
+	/* Mask all alert status*/
+	ret = dm_i2c_write(i2c_dev, TCPC_ALERT_MASK, buffer_0, 2);
+	if (ret) {
+		printf("%s dm_i2c_write failed: %d\n", __func__, ret);
+		return ret;
+	}
+
+	ret = dm_i2c_write(i2c_dev, TCPC_FAULT_STATUS_MASK, buffer_0, 2);
+	if (ret) {
+		printf("%s dm_i2c_write failed: %d\n", __func__, ret);
+		return ret;
+	}
+
+	/* Clear active alerts */
+	ret = dm_i2c_write(i2c_dev, TCPC_ALERT, buffer_1, 2);
+	if (ret) {
+		printf("%s dm_i2c_write failed: %d\n", __func__, ret);
+		return ret;
+	}
+
+	return 0;
+}
+
+int board_early_init_f(void)
+{
+	return 0;
+}
+
+int board_init(void)
+{
+	return 0;
+}
+
+int board_late_init(void)
+{
+	if (IS_ENABLED(CONFIG_ENV_IS_IN_MMC) || IS_ENABLED(CONFIG_ENV_IS_IN_NOWHERE))
+		board_late_mmc_env_init();
+
+	if (IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG)) {
+		env_set("board_name", "11X11_FRDM");
+		env_set("board_rev", "iMX93");
+	}
+
+	if (get_boot_device() == USB_BOOT) {
+		printf("USB boot detected. Will enter fasboot mode\n");
+		env_set_ulong("dofastboot", 1);
+	}
+
+	clear_pd_alert();
+
+	return 0;
+}
diff --git a/board/freescale/imx93_frdm/imx93_frdm.env b/board/nxp/imx93_frdm/imx93_frdm.env
index 111f38ed72a..111f38ed72a 100644
--- a/board/freescale/imx93_frdm/imx93_frdm.env
+++ b/board/nxp/imx93_frdm/imx93_frdm.env
diff --git a/board/freescale/imx93_frdm/lpddr4_timing.h b/board/nxp/imx93_frdm/lpddr4_timing.h
index 192bc9e1519..192bc9e1519 100644
--- a/board/freescale/imx93_frdm/lpddr4_timing.h
+++ b/board/nxp/imx93_frdm/lpddr4_timing.h
diff --git a/board/freescale/imx93_frdm/lpddr4x_1gb_timing.c b/board/nxp/imx93_frdm/lpddr4x_1gb_timing.c
index 17549206ee4..17549206ee4 100644
--- a/board/freescale/imx93_frdm/lpddr4x_1gb_timing.c
+++ b/board/nxp/imx93_frdm/lpddr4x_1gb_timing.c
diff --git a/board/freescale/imx93_frdm/lpddr4x_2gb_timing.c b/board/nxp/imx93_frdm/lpddr4x_2gb_timing.c
index cd129e12959..cd129e12959 100644
--- a/board/freescale/imx93_frdm/lpddr4x_2gb_timing.c
+++ b/board/nxp/imx93_frdm/lpddr4x_2gb_timing.c
diff --git a/board/freescale/imx93_frdm/spl.c b/board/nxp/imx93_frdm/spl.c
index 006c752d071..006c752d071 100644
--- a/board/freescale/imx93_frdm/spl.c
+++ b/board/nxp/imx93_frdm/spl.c
diff --git a/board/freescale/imx93_qsb/Kconfig b/board/nxp/imx93_qsb/Kconfig
index fea69c85870..e619014a741 100644
--- a/board/freescale/imx93_qsb/Kconfig
+++ b/board/nxp/imx93_qsb/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "imx93_qsb"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "imx93_qsb"
diff --git a/board/freescale/imx93_qsb/MAINTAINERS b/board/nxp/imx93_qsb/MAINTAINERS
index a3247d17e7c..11226c7ef8b 100644
--- a/board/freescale/imx93_qsb/MAINTAINERS
+++ b/board/nxp/imx93_qsb/MAINTAINERS
@@ -1,7 +1,7 @@
 i.MX93 QSB BOARD
 M:	Peng Fan <peng.fan@nxp.com>
 S:	Maintained
-F:	board/freescale/imx93_qsb/
+F:	board/nxp/imx93_qsb/
 F:	include/configs/imx93_qsb.h
 F:	configs/imx93_9x9_qsb_defconfig
 F:	configs/imx93_9x9_qsb_inline_ecc_defconfig
diff --git a/board/freescale/imx93_qsb/Makefile b/board/nxp/imx93_qsb/Makefile
index c94a6b2279d..c94a6b2279d 100644
--- a/board/freescale/imx93_qsb/Makefile
+++ b/board/nxp/imx93_qsb/Makefile
diff --git a/board/freescale/imx93_qsb/imx93_qsb.c b/board/nxp/imx93_qsb/imx93_qsb.c
index 503a8667245..9de91758aa7 100644
--- a/board/freescale/imx93_qsb/imx93_qsb.c
+++ b/board/nxp/imx93_qsb/imx93_qsb.c
@@ -5,8 +5,6 @@
 
 #include <env.h>
 #include <init.h>
-#include <miiphy.h>
-#include <netdev.h>
 #include <asm/arch/sys_proto.h>
 
 int board_late_init(void)
diff --git a/board/freescale/imx93_qsb/imx93_qsb.env b/board/nxp/imx93_qsb/imx93_qsb.env
index 6c10784cf61..6c10784cf61 100644
--- a/board/freescale/imx93_qsb/imx93_qsb.env
+++ b/board/nxp/imx93_qsb/imx93_qsb.env
diff --git a/board/freescale/imx93_qsb/lpddr4_timing.c b/board/nxp/imx93_qsb/lpddr4_timing.c
index c589c165720..c589c165720 100644
--- a/board/freescale/imx93_qsb/lpddr4_timing.c
+++ b/board/nxp/imx93_qsb/lpddr4_timing.c
diff --git a/board/freescale/imx93_qsb/lpddr4_timing_ecc.c b/board/nxp/imx93_qsb/lpddr4_timing_ecc.c
index 60cd4908f4a..60cd4908f4a 100644
--- a/board/freescale/imx93_qsb/lpddr4_timing_ecc.c
+++ b/board/nxp/imx93_qsb/lpddr4_timing_ecc.c
diff --git a/board/freescale/imx93_qsb/spl.c b/board/nxp/imx93_qsb/spl.c
index 6d1ab60eda0..9e64714521b 100644
--- a/board/freescale/imx93_qsb/spl.c
+++ b/board/nxp/imx93_qsb/spl.c
@@ -3,36 +3,19 @@
  * Copyright 2024 NXP
  */
 
-#include <command.h>
-#include <cpu_func.h>
-#include <hang.h>
-#include <image.h>
 #include <init.h>
-#include <log.h>
+#include <power/pmic.h>
+#include <power/pca9450.h>
 #include <spl.h>
 #include <asm/global_data.h>
-#include <asm/io.h>
-#include <asm/arch/imx93_pins.h>
-#include <asm/arch/mu.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/sys_proto.h>
-#include <asm/mach-imx/boot_mode.h>
-#include <asm/mach-imx/mxc_i2c.h>
-#include <asm/arch-mx7ulp/gpio.h>
-#include <asm/mach-imx/ele_api.h>
-#include <asm/mach-imx/syscounter.h>
 #include <asm/sections.h>
-#include <dm/uclass.h>
-#include <dm/device.h>
-#include <dm/uclass-internal.h>
-#include <dm/device-internal.h>
-#include <linux/delay.h>
 #include <asm/arch/clock.h>
-#include <asm/arch/ccm_regs.h>
 #include <asm/arch/ddr.h>
-#include <power/pmic.h>
-#include <power/pca9450.h>
+#include <asm/arch/mu.h>
+#include <asm/arch/sys_proto.h>
 #include <asm/arch/trdc.h>
+#include <asm/mach-imx/boot_mode.h>
+#include <asm/mach-imx/ele_api.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -98,6 +81,8 @@ int power_init_board(void)
 		printf("PMIC: Over Drive Voltage Mode\n");
 	}
 
+	ele_volt_change_start_req();
+
 	if (val & PCA9450_REG_PWRCTRL_TOFF_DEB) {
 		pmic_reg_write(dev, PCA9450_BUCK1OUT_DVS0, buck_val);
 		pmic_reg_write(dev, PCA9450_BUCK3OUT_DVS0, buck_val);
@@ -106,6 +91,8 @@ int power_init_board(void)
 		pmic_reg_write(dev, PCA9450_BUCK3OUT_DVS0, buck_val + 0x4);
 	}
 
+	ele_volt_change_finish_req();
+
 	/* set standby voltage to 0.65v */
 	if (val & PCA9450_REG_PWRCTRL_TOFF_DEB)
 		pmic_reg_write(dev, PCA9450_BUCK1OUT_DVS1, 0x0);
diff --git a/board/freescale/imx94_evk/Kconfig b/board/nxp/imx94_evk/Kconfig
index a4237244ace..377b732c3e7 100644
--- a/board/freescale/imx94_evk/Kconfig
+++ b/board/nxp/imx94_evk/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "imx94_evk"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "imx94_evk"
diff --git a/board/freescale/imx94_evk/MAINTAINERS b/board/nxp/imx94_evk/MAINTAINERS
index 95309430734..a7aab5f3905 100644
--- a/board/freescale/imx94_evk/MAINTAINERS
+++ b/board/nxp/imx94_evk/MAINTAINERS
@@ -1,6 +1,6 @@
 i.MX94 EVK BOARD
 M:	Alice Guo <alice.guo@nxp.com>
 S:	Maintained
-F:	board/freescale/imx94_evk/
+F:	board/nxp/imx94_evk/
 F:	include/configs/imx94_evk.h
 F:	configs/imx943_evk_defconfig
diff --git a/board/freescale/imx94_evk/Makefile b/board/nxp/imx94_evk/Makefile
index ca31602f6ba..ca31602f6ba 100644
--- a/board/freescale/imx94_evk/Makefile
+++ b/board/nxp/imx94_evk/Makefile
diff --git a/board/freescale/imx94_evk/imx94_evk.c b/board/nxp/imx94_evk/imx94_evk.c
index 28d512ac5f3..588aa7548d4 100644
--- a/board/freescale/imx94_evk/imx94_evk.c
+++ b/board/nxp/imx94_evk/imx94_evk.c
@@ -3,11 +3,11 @@
  * Copyright 2025 NXP
  */
 
-#include <asm/arch/clock.h>
-#include <asm/gpio.h>
-#include <asm/mach-imx/sys_proto.h>
 #include <env.h>
 #include <fdt_support.h>
+#include <asm/gpio.h>
+#include <asm/arch/clock.h>
+#include <asm/mach-imx/sys_proto.h>
 
 int board_early_init_f(void)
 {
diff --git a/board/freescale/imx94_evk/imx94_evk.env b/board/nxp/imx94_evk/imx94_evk.env
index 2baf1bbadcb..2baf1bbadcb 100644
--- a/board/freescale/imx94_evk/imx94_evk.env
+++ b/board/nxp/imx94_evk/imx94_evk.env
diff --git a/board/freescale/imx94_evk/spl.c b/board/nxp/imx94_evk/spl.c
index 341b165b3c8..797806a8d4d 100644
--- a/board/freescale/imx94_evk/spl.c
+++ b/board/nxp/imx94_evk/spl.c
@@ -3,16 +3,17 @@
  * Copyright 2025 NXP
  */
 
+#include <hang.h>
+#include <init.h>
+#include <spl.h>
+#include <asm/gpio.h>
+#include <asm/global_data.h>
+#include <asm/sections.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/mu.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/gpio.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/mach-imx/ele_api.h>
-#include <asm/sections.h>
-#include <hang.h>
-#include <init.h>
-#include <spl.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/imx95_evk/Kconfig b/board/nxp/imx95_evk/Kconfig
index bf746e091de..fb255eda731 100644
--- a/board/freescale/imx95_evk/Kconfig
+++ b/board/nxp/imx95_evk/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "imx95_evk"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "imx95_evk"
diff --git a/board/freescale/imx95_evk/MAINTAINERS b/board/nxp/imx95_evk/MAINTAINERS
index bc27786f70d..e228b04d918 100644
--- a/board/freescale/imx95_evk/MAINTAINERS
+++ b/board/nxp/imx95_evk/MAINTAINERS
@@ -1,7 +1,7 @@
 i.MX95 EVK BOARD
 M:	Alice Guo <alice.guo@nxp.com>
 S:	Maintained
-F:	board/freescale/imx95_evk/
+F:	board/nxp/imx95_evk/
 F:	include/configs/imx95_evk.h
 F:	configs/imx95_a0_19x19_evk_defconfig
 F:	configs/imx95_19x19_evk_defconfig
diff --git a/board/freescale/imx95_evk/Makefile b/board/nxp/imx95_evk/Makefile
index 0f5cec385c3..0f5cec385c3 100644
--- a/board/freescale/imx95_evk/Makefile
+++ b/board/nxp/imx95_evk/Makefile
diff --git a/board/freescale/imx95_evk/imx95_evk.c b/board/nxp/imx95_evk/imx95_evk.c
index fe0111be508..ca1d916deab 100644
--- a/board/freescale/imx95_evk/imx95_evk.c
+++ b/board/nxp/imx95_evk/imx95_evk.c
@@ -3,8 +3,8 @@
  * Copyright 2025 NXP
  */
 
-#include <asm/arch/clock.h>
 #include <asm/gpio.h>
+#include <asm/arch/clock.h>
 #include <asm/mach-imx/sys_proto.h>
 
 int board_early_init_f(void)
diff --git a/board/freescale/imx95_evk/imx95_evk.env b/board/nxp/imx95_evk/imx95_evk.env
index a7309d734b0..a7309d734b0 100644
--- a/board/freescale/imx95_evk/imx95_evk.env
+++ b/board/nxp/imx95_evk/imx95_evk.env
diff --git a/board/freescale/imx95_evk/spl.c b/board/nxp/imx95_evk/spl.c
index 48b47d2aed9..752d7f916b6 100644
--- a/board/freescale/imx95_evk/spl.c
+++ b/board/nxp/imx95_evk/spl.c
@@ -3,15 +3,16 @@
  * Copyright 2025 NXP
  */
 
+#include <hang.h>
+#include <init.h>
+#include <spl.h>
+#include <asm/global_data.h>
+#include <asm/sections.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/mu.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/mach-imx/boot_mode.h>
 #include <asm/mach-imx/ele_api.h>
-#include <asm/sections.h>
-#include <hang.h>
-#include <init.h>
-#include <spl.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/freescale/imxrt1020-evk/Kconfig b/board/nxp/imxrt1020-evk/Kconfig
index 6618a9b3b57..d5b7702b686 100644
--- a/board/freescale/imxrt1020-evk/Kconfig
+++ b/board/nxp/imxrt1020-evk/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "imxrt1020-evk"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_SOC
 	default "imxrt1020"
@@ -13,6 +13,6 @@ config SYS_CONFIG_NAME
 	default "imxrt1020-evk"
 
 config IMX_CONFIG
-	default "board/freescale/imxrt1020-evk/imximage.cfg"
+	default "board/nxp/imxrt1020-evk/imximage.cfg"
 
 endif
diff --git a/board/freescale/imxrt1020-evk/MAINTAINERS b/board/nxp/imxrt1020-evk/MAINTAINERS
index 05f017b2bab..a587e5d0f68 100644
--- a/board/freescale/imxrt1020-evk/MAINTAINERS
+++ b/board/nxp/imxrt1020-evk/MAINTAINERS
@@ -1,6 +1,6 @@
 IMXRT1020 EVALUATION KIT
 M:	Giulio Benetti <giulio.benetti@benettiengineering.com>
 S:	Maintained
-F:	board/freescale/imxrt1020-evk
+F:	board/nxp/imxrt1020-evk
 F:	include/configs/imxrt1020-evk.h
 F:	configs/imxrt1020-evk_defconfig
diff --git a/board/freescale/imxrt1020-evk/Makefile b/board/nxp/imxrt1020-evk/Makefile
index 807dc7c35e1..807dc7c35e1 100644
--- a/board/freescale/imxrt1020-evk/Makefile
+++ b/board/nxp/imxrt1020-evk/Makefile
diff --git a/board/freescale/imxrt1020-evk/imximage.cfg b/board/nxp/imxrt1020-evk/imximage.cfg
index 0ed71479a60..0ed71479a60 100644
--- a/board/freescale/imxrt1020-evk/imximage.cfg
+++ b/board/nxp/imxrt1020-evk/imximage.cfg
diff --git a/board/freescale/imxrt1020-evk/imxrt1020-evk.c b/board/nxp/imxrt1020-evk/imxrt1020-evk.c
index 11dbef84688..11dbef84688 100644
--- a/board/freescale/imxrt1020-evk/imxrt1020-evk.c
+++ b/board/nxp/imxrt1020-evk/imxrt1020-evk.c
diff --git a/board/freescale/imxrt1050-evk/Kconfig b/board/nxp/imxrt1050-evk/Kconfig
index 04ade6ec900..8dd7511c0c8 100644
--- a/board/freescale/imxrt1050-evk/Kconfig
+++ b/board/nxp/imxrt1050-evk/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "imxrt1050-evk"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_SOC
 	default "imxrt1050"
@@ -13,6 +13,6 @@ config SYS_CONFIG_NAME
 	default "imxrt1050-evk"
 
 config IMX_CONFIG
-	default "board/freescale/imxrt1050-evk/imximage.cfg"
+	default "board/nxp/imxrt1050-evk/imximage.cfg"
 
 endif
diff --git a/board/freescale/imxrt1050-evk/MAINTAINERS b/board/nxp/imxrt1050-evk/MAINTAINERS
index 890825b39ae..9c0e6cfb3bb 100644
--- a/board/freescale/imxrt1050-evk/MAINTAINERS
+++ b/board/nxp/imxrt1050-evk/MAINTAINERS
@@ -1,7 +1,7 @@
 IMXRT1050 EVALUATION KIT
 M:	Giulio Benetti <giulio.benetti@benettiengineering.com>
 S:	Maintained
-F:	board/freescale/imxrt1050-evk
+F:	board/nxp/imxrt1050-evk
 F:	include/configs/imxrt1050-evk.h
 F:	configs/imxrt1050-evk_defconfig
 F:	configs/imxrt1050-evk_fspi_defconfig
diff --git a/board/freescale/imxrt1050-evk/Makefile b/board/nxp/imxrt1050-evk/Makefile
index 0e984d1d7a8..0e984d1d7a8 100644
--- a/board/freescale/imxrt1050-evk/Makefile
+++ b/board/nxp/imxrt1050-evk/Makefile
diff --git a/board/freescale/imxrt1050-evk/imximage-nor.cfg b/board/nxp/imxrt1050-evk/imximage-nor.cfg
index 829be6cbe2b..829be6cbe2b 100644
--- a/board/freescale/imxrt1050-evk/imximage-nor.cfg
+++ b/board/nxp/imxrt1050-evk/imximage-nor.cfg
diff --git a/board/freescale/imxrt1050-evk/imximage.cfg b/board/nxp/imxrt1050-evk/imximage.cfg
index b30d8521947..b30d8521947 100644
--- a/board/freescale/imxrt1050-evk/imximage.cfg
+++ b/board/nxp/imxrt1050-evk/imximage.cfg
diff --git a/board/freescale/imxrt1050-evk/imxrt1050-evk-nor.env b/board/nxp/imxrt1050-evk/imxrt1050-evk-nor.env
index c61e9e3c00a..c61e9e3c00a 100644
--- a/board/freescale/imxrt1050-evk/imxrt1050-evk-nor.env
+++ b/board/nxp/imxrt1050-evk/imxrt1050-evk-nor.env
diff --git a/board/freescale/imxrt1050-evk/imxrt1050-evk.c b/board/nxp/imxrt1050-evk/imxrt1050-evk.c
index 056489932ac..056489932ac 100644
--- a/board/freescale/imxrt1050-evk/imxrt1050-evk.c
+++ b/board/nxp/imxrt1050-evk/imxrt1050-evk.c
diff --git a/board/freescale/imxrt1050-evk/imxrt1050-evk.env b/board/nxp/imxrt1050-evk/imxrt1050-evk.env
index 1c5cbc29d53..1c5cbc29d53 100644
--- a/board/freescale/imxrt1050-evk/imxrt1050-evk.env
+++ b/board/nxp/imxrt1050-evk/imxrt1050-evk.env
diff --git a/board/freescale/imxrt1170-evk/Kconfig b/board/nxp/imxrt1170-evk/Kconfig
index ad7cd4aeb9c..6f804c10893 100644
--- a/board/freescale/imxrt1170-evk/Kconfig
+++ b/board/nxp/imxrt1170-evk/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "imxrt1170-evk"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_SOC
 	default "imxrt1170"
@@ -13,6 +13,6 @@ config SYS_CONFIG_NAME
 	default "imxrt1170-evk"
 
 config IMX_CONFIG
-	default "board/freescale/imxrt1170-evk/imximage.cfg"
+	default "board/nxp/imxrt1170-evk/imximage.cfg"
 
 endif
diff --git a/board/freescale/imxrt1170-evk/MAINTAINERS b/board/nxp/imxrt1170-evk/MAINTAINERS
index 1fc3179c005..239cda84b74 100644
--- a/board/freescale/imxrt1170-evk/MAINTAINERS
+++ b/board/nxp/imxrt1170-evk/MAINTAINERS
@@ -2,6 +2,6 @@ IMXRT1170 EVALUATION KIT
 M:	Giulio Benetti <giulio.benetti@benettiengineering.com>
 M:	Jesse Taube <Mr.Bossman075@gmail.com>
 S:	Maintained
-F:	board/freescale/imxrt1170-evk
+F:	board/nxp/imxrt1170-evk
 F:	include/configs/imxrt1170-evk.h
 F:	configs/imxrt1170-evk_defconfig
diff --git a/board/freescale/imxrt1170-evk/Makefile b/board/nxp/imxrt1170-evk/Makefile
index 857a168b09d..857a168b09d 100644
--- a/board/freescale/imxrt1170-evk/Makefile
+++ b/board/nxp/imxrt1170-evk/Makefile
diff --git a/board/freescale/imxrt1170-evk/imximage.cfg b/board/nxp/imxrt1170-evk/imximage.cfg
index 57583d04ce6..57583d04ce6 100644
--- a/board/freescale/imxrt1170-evk/imximage.cfg
+++ b/board/nxp/imxrt1170-evk/imximage.cfg
diff --git a/board/freescale/imxrt1170-evk/imxrt1170-evk.c b/board/nxp/imxrt1170-evk/imxrt1170-evk.c
index 047aea8181a..047aea8181a 100644
--- a/board/freescale/imxrt1170-evk/imxrt1170-evk.c
+++ b/board/nxp/imxrt1170-evk/imxrt1170-evk.c
diff --git a/board/freescale/ls1012afrdm/Kconfig b/board/nxp/ls1012afrdm/Kconfig
index a7e59e62656..26856f2d4e4 100644
--- a/board/freescale/ls1012afrdm/Kconfig
+++ b/board/nxp/ls1012afrdm/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "ls1012afrdm"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_SOC
 	default "fsl-layerscape"
@@ -54,7 +54,7 @@ config SYS_BOARD
 	default "ls1012afrdm"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_SOC
 	default "fsl-layerscape"
diff --git a/board/freescale/ls1012afrdm/MAINTAINERS b/board/nxp/ls1012afrdm/MAINTAINERS
index 89d1085b00b..a69c268e53b 100644
--- a/board/freescale/ls1012afrdm/MAINTAINERS
+++ b/board/nxp/ls1012afrdm/MAINTAINERS
@@ -1,7 +1,7 @@
 LS1012AFRDM BOARD
 M:	Pramod Kumar <pramod.kumar_1@nxp.com>
 S:	Maintained
-F:	board/freescale/ls1012afrdm/
+F:	board/nxp/ls1012afrdm/
 F:	include/configs/ls1012afrdm.h
 F:	configs/ls1012afrdm_qspi_defconfig
 F:	configs/ls1012afrdm_tfa_defconfig
@@ -11,7 +11,7 @@ F:	configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig
 LS1012AFRWY BOARD
 M:	Pramod Kumar <pramod.kumar_1@nxp.com>
 S:      Maintained
-F:      board/freescale/ls1012afrwy/
+F:      board/nxp/ls1012afrwy/
 F:      include/configs/ls1012afrwy.h
 F:      configs/ls1012afrwy_qspi_defconfig
 F:	configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig
diff --git a/board/freescale/ls1012afrdm/Makefile b/board/nxp/ls1012afrdm/Makefile
index 1e53c967304..1e53c967304 100644
--- a/board/freescale/ls1012afrdm/Makefile
+++ b/board/nxp/ls1012afrdm/Makefile
diff --git a/board/freescale/ls1012afrdm/README b/board/nxp/ls1012afrdm/README
index e60ed606ec1..e60ed606ec1 100644
--- a/board/freescale/ls1012afrdm/README
+++ b/board/nxp/ls1012afrdm/README
diff --git a/board/freescale/ls1012afrdm/eth.c b/board/nxp/ls1012afrdm/eth.c
index c431e5e611b..c431e5e611b 100644
--- a/board/freescale/ls1012afrdm/eth.c
+++ b/board/nxp/ls1012afrdm/eth.c
diff --git a/board/freescale/ls1012afrdm/ls1012afrdm.c b/board/nxp/ls1012afrdm/ls1012afrdm.c
index f157e75e385..f157e75e385 100644
--- a/board/freescale/ls1012afrdm/ls1012afrdm.c
+++ b/board/nxp/ls1012afrdm/ls1012afrdm.c
diff --git a/board/freescale/ls1012aqds/Kconfig b/board/nxp/ls1012aqds/Kconfig
index d333069898f..51751fc96fc 100644
--- a/board/freescale/ls1012aqds/Kconfig
+++ b/board/nxp/ls1012aqds/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "ls1012aqds"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_SOC
 	default "fsl-layerscape"
diff --git a/board/freescale/ls1012aqds/MAINTAINERS b/board/nxp/ls1012aqds/MAINTAINERS
index eabf5805765..2178df90992 100644
--- a/board/freescale/ls1012aqds/MAINTAINERS
+++ b/board/nxp/ls1012aqds/MAINTAINERS
@@ -1,7 +1,7 @@
 LS1012AQDS BOARD
 M:	Pramod Kumar <pramod.kumar_1@nxp.com>
 S:	Maintained
-F:	board/freescale/ls1012aqds/
+F:	board/nxp/ls1012aqds/
 F:	include/configs/ls1012aqds.h
 F:	configs/ls1012aqds_qspi_defconfig
 F:	configs/ls1012aqds_tfa_defconfig
diff --git a/board/freescale/ls1012aqds/Makefile b/board/nxp/ls1012aqds/Makefile
index 5aba9caf927..5aba9caf927 100644
--- a/board/freescale/ls1012aqds/Makefile
+++ b/board/nxp/ls1012aqds/Makefile
diff --git a/board/freescale/ls1012aqds/README b/board/nxp/ls1012aqds/README
index e9b80cad506..e9b80cad506 100644
--- a/board/freescale/ls1012aqds/README
+++ b/board/nxp/ls1012aqds/README
diff --git a/board/freescale/ls1012aqds/eth.c b/board/nxp/ls1012aqds/eth.c
index d5e87c5393b..d5e87c5393b 100644
--- a/board/freescale/ls1012aqds/eth.c
+++ b/board/nxp/ls1012aqds/eth.c
diff --git a/board/freescale/ls1012aqds/ls1012aqds.c b/board/nxp/ls1012aqds/ls1012aqds.c
index b21c4d917d0..b21c4d917d0 100644
--- a/board/freescale/ls1012aqds/ls1012aqds.c
+++ b/board/nxp/ls1012aqds/ls1012aqds.c
diff --git a/board/freescale/ls1012aqds/ls1012aqds_pfe.h b/board/nxp/ls1012aqds/ls1012aqds_pfe.h
index 5ab283ce8d5..5ab283ce8d5 100644
--- a/board/freescale/ls1012aqds/ls1012aqds_pfe.h
+++ b/board/nxp/ls1012aqds/ls1012aqds_pfe.h
diff --git a/board/freescale/ls1012aqds/ls1012aqds_qixis.h b/board/nxp/ls1012aqds/ls1012aqds_qixis.h
index 19f522d9eaa..19f522d9eaa 100644
--- a/board/freescale/ls1012aqds/ls1012aqds_qixis.h
+++ b/board/nxp/ls1012aqds/ls1012aqds_qixis.h
diff --git a/board/freescale/ls1012ardb/Kconfig b/board/nxp/ls1012ardb/Kconfig
index b55660d485f..bbe5ce21109 100644
--- a/board/freescale/ls1012ardb/Kconfig
+++ b/board/nxp/ls1012ardb/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "ls1012ardb"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_SOC
 	default "fsl-layerscape"
@@ -63,7 +63,7 @@ config SYS_BOARD
         default "ls1012ardb"
 
 config SYS_VENDOR
-        default "freescale"
+        default "nxp"
 
 config SYS_SOC
         default "fsl-layerscape"
diff --git a/board/freescale/ls1012ardb/MAINTAINERS b/board/nxp/ls1012ardb/MAINTAINERS
index ce2f9a16cc7..5dd2858a86c 100644
--- a/board/freescale/ls1012ardb/MAINTAINERS
+++ b/board/nxp/ls1012ardb/MAINTAINERS
@@ -1,7 +1,7 @@
 LS1012ARDB BOARD
 M:	Pramod Kumar <pramod.kumar_1@nxp.com>
 S:	Maintained
-F:	board/freescale/ls1012ardb/
+F:	board/nxp/ls1012ardb/
 F:	include/configs/ls1012ardb.h
 F:	configs/ls1012ardb_qspi_defconfig
 F:	configs/ls1012ardb_tfa_defconfig
@@ -12,6 +12,6 @@ F:	configs/ls1012ardb_qspi_SECURE_BOOT_defconfig
 LS1012A2G5RDB BOARD
 M:	Pramod Kumar <pramod.kumar_1@nxp.com>
 S:      Maintained
-F:      board/freescale/ls1012ardb/
+F:      board/nxp/ls1012ardb/
 F:      include/configs/ls1012a2g5rdb.h
 F:      configs/ls1012a2g5rdb_qspi_defconfig
diff --git a/board/freescale/ls1012ardb/Makefile b/board/nxp/ls1012ardb/Makefile
index 70c7b33273d..70c7b33273d 100644
--- a/board/freescale/ls1012ardb/Makefile
+++ b/board/nxp/ls1012ardb/Makefile
diff --git a/board/freescale/ls1012ardb/README b/board/nxp/ls1012ardb/README
index 26b0485a7f8..26b0485a7f8 100644
--- a/board/freescale/ls1012ardb/README
+++ b/board/nxp/ls1012ardb/README
diff --git a/board/freescale/ls1012ardb/eth.c b/board/nxp/ls1012ardb/eth.c
index 71cb2988a56..71cb2988a56 100644
--- a/board/freescale/ls1012ardb/eth.c
+++ b/board/nxp/ls1012ardb/eth.c
diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/nxp/ls1012ardb/ls1012ardb.c
index ab69eab8408..ab69eab8408 100644
--- a/board/freescale/ls1012ardb/ls1012ardb.c
+++ b/board/nxp/ls1012ardb/ls1012ardb.c
diff --git a/board/freescale/ls1021aiot/Kconfig b/board/nxp/ls1021aiot/Kconfig
index 4a12c1687fc..52e6e73f3b6 100644
--- a/board/freescale/ls1021aiot/Kconfig
+++ b/board/nxp/ls1021aiot/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "ls1021aiot"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_SOC
 	default "ls102xa"
diff --git a/board/freescale/ls1021aiot/MAINTAINERS b/board/nxp/ls1021aiot/MAINTAINERS
index 65f21bee344..db7a90b07e9 100644
--- a/board/freescale/ls1021aiot/MAINTAINERS
+++ b/board/nxp/ls1021aiot/MAINTAINERS
@@ -1,7 +1,7 @@
 LS1021AIOT BOARD
 M:	Alison Wang <alison.wang@nxp.com>
 S:	Maintained
-F:	board/freescale/ls1021aiot/
+F:	board/nxp/ls1021aiot/
 F:	include/configs/ls1021aiot.h
 F:	configs/ls1021aiot_sdcard_defconfig
 F:	configs/ls1021aiot_qspi_defconfig
diff --git a/board/freescale/ls1021aiot/Makefile b/board/nxp/ls1021aiot/Makefile
index 587bbd79ddf..587bbd79ddf 100644
--- a/board/freescale/ls1021aiot/Makefile
+++ b/board/nxp/ls1021aiot/Makefile
diff --git a/board/freescale/ls1021aiot/README b/board/nxp/ls1021aiot/README
index 08b0268b9bd..08b0268b9bd 100644
--- a/board/freescale/ls1021aiot/README
+++ b/board/nxp/ls1021aiot/README
diff --git a/board/freescale/ls1021aiot/ls1021aiot.c b/board/nxp/ls1021aiot/ls1021aiot.c
index 4eff0a3fee0..52a3c3abdb4 100644
--- a/board/freescale/ls1021aiot/ls1021aiot.c
+++ b/board/nxp/ls1021aiot/ls1021aiot.c
@@ -21,6 +21,7 @@
 #include <asm/sections.h>
 #include <fsl_csu.h>
 #include <fsl_immap.h>
+#include <fsl_ifc.h>
 #include <netdev.h>
 #include <fsl_mdio.h>
 #include <tsec.h>
@@ -120,6 +121,10 @@ int board_early_init_f(void)
 
 #endif
 
+#ifdef CONFIG_FSL_IFC
+	init_early_memctl_regs();
+#endif
+
 	arch_soc_init();
 
 	return 0;
diff --git a/board/freescale/ls1021aiot/ls102xa_pbi.cfg b/board/nxp/ls1021aiot/ls102xa_pbi.cfg
index b5ac5e27e9d..b5ac5e27e9d 100644
--- a/board/freescale/ls1021aiot/ls102xa_pbi.cfg
+++ b/board/nxp/ls1021aiot/ls102xa_pbi.cfg
diff --git a/board/freescale/ls1021aiot/ls102xa_rcw_sd.cfg b/board/nxp/ls1021aiot/ls102xa_rcw_sd.cfg
index a1984c713d5..a1984c713d5 100644
--- a/board/freescale/ls1021aiot/ls102xa_rcw_sd.cfg
+++ b/board/nxp/ls1021aiot/ls102xa_rcw_sd.cfg
diff --git a/board/freescale/ls1021aiot/psci.S b/board/nxp/ls1021aiot/psci.S
index d0106ba3905..d0106ba3905 100644
--- a/board/freescale/ls1021aiot/psci.S
+++ b/board/nxp/ls1021aiot/psci.S
diff --git a/board/freescale/ls1021aqds/Kconfig b/board/nxp/ls1021aqds/Kconfig
index 119b9550410..e14140aee33 100644
--- a/board/freescale/ls1021aqds/Kconfig
+++ b/board/nxp/ls1021aqds/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "ls1021aqds"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_SOC
 	default "ls102xa"
diff --git a/board/freescale/ls1021aqds/MAINTAINERS b/board/nxp/ls1021aqds/MAINTAINERS
index 913d251eeb7..4575dbd0ef2 100644
--- a/board/freescale/ls1021aqds/MAINTAINERS
+++ b/board/nxp/ls1021aqds/MAINTAINERS
@@ -1,7 +1,7 @@
 LS1021AQDS BOARD
 M:	Alison Wang <alison.wang@nxp.com>
 S:	Maintained
-F:	board/freescale/ls1021aqds/
+F:	board/nxp/ls1021aqds/
 F:	include/configs/ls1021aqds.h
 F:	configs/ls1021aqds_nor_defconfig
 F:	configs/ls1021aqds_ddr4_nor_defconfig
diff --git a/board/freescale/ls1021aqds/Makefile b/board/nxp/ls1021aqds/Makefile
index 8cbf33fa0ce..8cbf33fa0ce 100644
--- a/board/freescale/ls1021aqds/Makefile
+++ b/board/nxp/ls1021aqds/Makefile
diff --git a/board/freescale/ls1021aqds/README b/board/nxp/ls1021aqds/README
index e2ce00165bd..e2ce00165bd 100644
--- a/board/freescale/ls1021aqds/README
+++ b/board/nxp/ls1021aqds/README
diff --git a/board/freescale/ls1021aqds/ddr.c b/board/nxp/ls1021aqds/ddr.c
index fd897e832c8..fd897e832c8 100644
--- a/board/freescale/ls1021aqds/ddr.c
+++ b/board/nxp/ls1021aqds/ddr.c
diff --git a/board/freescale/ls1021aqds/ddr.h b/board/nxp/ls1021aqds/ddr.h
index 58a88384367..58a88384367 100644
--- a/board/freescale/ls1021aqds/ddr.h
+++ b/board/nxp/ls1021aqds/ddr.h
diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/nxp/ls1021aqds/ls1021aqds.c
index 0bdd468d9a7..0bdd468d9a7 100644
--- a/board/freescale/ls1021aqds/ls1021aqds.c
+++ b/board/nxp/ls1021aqds/ls1021aqds.c
diff --git a/board/freescale/ls1021aqds/ls1021aqds_qixis.h b/board/nxp/ls1021aqds/ls1021aqds_qixis.h
index 7ad08a54ea6..7ad08a54ea6 100644
--- a/board/freescale/ls1021aqds/ls1021aqds_qixis.h
+++ b/board/nxp/ls1021aqds/ls1021aqds_qixis.h
diff --git a/board/freescale/ls1021aqds/ls102xa_pbi.cfg b/board/nxp/ls1021aqds/ls102xa_pbi.cfg
index f1a1b63ab77..f1a1b63ab77 100644
--- a/board/freescale/ls1021aqds/ls102xa_pbi.cfg
+++ b/board/nxp/ls1021aqds/ls102xa_pbi.cfg
diff --git a/board/freescale/ls1021aqds/ls102xa_rcw_nand.cfg b/board/nxp/ls1021aqds/ls102xa_rcw_nand.cfg
index d76e9132e35..d76e9132e35 100644
--- a/board/freescale/ls1021aqds/ls102xa_rcw_nand.cfg
+++ b/board/nxp/ls1021aqds/ls102xa_rcw_nand.cfg
diff --git a/board/freescale/ls1021aqds/ls102xa_rcw_sd_ifc.cfg b/board/nxp/ls1021aqds/ls102xa_rcw_sd_ifc.cfg
index f0cf9c2b38d..f0cf9c2b38d 100644
--- a/board/freescale/ls1021aqds/ls102xa_rcw_sd_ifc.cfg
+++ b/board/nxp/ls1021aqds/ls102xa_rcw_sd_ifc.cfg
diff --git a/board/freescale/ls1021aqds/ls102xa_rcw_sd_qspi.cfg b/board/nxp/ls1021aqds/ls102xa_rcw_sd_qspi.cfg
index 10cc4a9ab0b..10cc4a9ab0b 100644
--- a/board/freescale/ls1021aqds/ls102xa_rcw_sd_qspi.cfg
+++ b/board/nxp/ls1021aqds/ls102xa_rcw_sd_qspi.cfg
diff --git a/board/freescale/ls1021aqds/psci.S b/board/nxp/ls1021aqds/psci.S
index 0f38c934ddf..0f38c934ddf 100644
--- a/board/freescale/ls1021aqds/psci.S
+++ b/board/nxp/ls1021aqds/psci.S
diff --git a/board/freescale/ls1021atsn/Kconfig b/board/nxp/ls1021atsn/Kconfig
index aa42a06c663..1b20c643a6d 100644
--- a/board/freescale/ls1021atsn/Kconfig
+++ b/board/nxp/ls1021atsn/Kconfig
@@ -5,7 +5,7 @@ config SYS_BOARD
 	default "ls1021atsn"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_SOC
 	default "ls102xa"
diff --git a/board/freescale/ls1021atsn/MAINTAINERS b/board/nxp/ls1021atsn/MAINTAINERS
index 560bb615d2f..eda36823ddc 100644
--- a/board/freescale/ls1021atsn/MAINTAINERS
+++ b/board/nxp/ls1021atsn/MAINTAINERS
@@ -2,7 +2,7 @@ NXP LS1021A-TSN Board
 M:	Vladimir Oltean <olteanv@gmail.com>
 S:	Maintained
 F:	arch/arm/dts/ls1021a-tsn.dts
-F:	board/freescale/ls1021atsn/
+F:	board/nxp/ls1021atsn/
 F:	include/configs/ls1021atsn.h
 F:	configs/ls1021atsn_qspi_defconfig
 F:	configs/ls1021atsn_sdcard_defconfig
diff --git a/board/freescale/ls1021atsn/Makefile b/board/nxp/ls1021atsn/Makefile
index b4808f05e8e..b4808f05e8e 100644
--- a/board/freescale/ls1021atsn/Makefile
+++ b/board/nxp/ls1021atsn/Makefile
diff --git a/board/freescale/ls1021atsn/README.rst b/board/nxp/ls1021atsn/README.rst
index cd12291d8aa..cd12291d8aa 100644
--- a/board/freescale/ls1021atsn/README.rst
+++ b/board/nxp/ls1021atsn/README.rst
diff --git a/board/freescale/ls1021atsn/ls1021atsn.c b/board/nxp/ls1021atsn/ls1021atsn.c
index c92430c0896..c92430c0896 100644
--- a/board/freescale/ls1021atsn/ls1021atsn.c
+++ b/board/nxp/ls1021atsn/ls1021atsn.c
diff --git a/board/freescale/ls1021atsn/ls102xa_pbi.cfg b/board/nxp/ls1021atsn/ls102xa_pbi.cfg
index ba1499b2644..ba1499b2644 100644
--- a/board/freescale/ls1021atsn/ls102xa_pbi.cfg
+++ b/board/nxp/ls1021atsn/ls102xa_pbi.cfg
diff --git a/board/freescale/ls1021atsn/ls102xa_rcw_sd.cfg b/board/nxp/ls1021atsn/ls102xa_rcw_sd.cfg
index a6fc91436f2..a6fc91436f2 100644
--- a/board/freescale/ls1021atsn/ls102xa_rcw_sd.cfg
+++ b/board/nxp/ls1021atsn/ls102xa_rcw_sd.cfg
diff --git a/board/freescale/ls1021atwr/Kconfig b/board/nxp/ls1021atwr/Kconfig
index bc50b8d9668..4c99d999d99 100644
--- a/board/freescale/ls1021atwr/Kconfig
+++ b/board/nxp/ls1021atwr/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "ls1021atwr"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_SOC
 	default "ls102xa"
diff --git a/board/freescale/ls1021atwr/MAINTAINERS b/board/nxp/ls1021atwr/MAINTAINERS
index 7ab8347e9ed..f70b06da5df 100644
--- a/board/freescale/ls1021atwr/MAINTAINERS
+++ b/board/nxp/ls1021atwr/MAINTAINERS
@@ -1,7 +1,7 @@
 LS1021ATWR BOARD
 M:	Alison Wang <alison.wang@nxp.com>
 S:	Maintained
-F:	board/freescale/ls1021atwr/
+F:	board/nxp/ls1021atwr/
 F:	include/configs/ls1021atwr.h
 F:	configs/ls1021atwr_nor_defconfig
 F:	configs/ls1021atwr_nor_SECURE_BOOT_defconfig
diff --git a/board/freescale/ls1021atwr/Makefile b/board/nxp/ls1021atwr/Makefile
index cfa6c0c8540..cfa6c0c8540 100644
--- a/board/freescale/ls1021atwr/Makefile
+++ b/board/nxp/ls1021atwr/Makefile
diff --git a/board/freescale/ls1021atwr/README b/board/nxp/ls1021atwr/README
index a4639cd7476..a4639cd7476 100644
--- a/board/freescale/ls1021atwr/README
+++ b/board/nxp/ls1021atwr/README
diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/nxp/ls1021atwr/ls1021atwr.c
index 0758e5eae25..0758e5eae25 100644
--- a/board/freescale/ls1021atwr/ls1021atwr.c
+++ b/board/nxp/ls1021atwr/ls1021atwr.c
diff --git a/board/freescale/ls1021atwr/ls102xa_pbi.cfg b/board/nxp/ls1021atwr/ls102xa_pbi.cfg
index f1a1b63ab77..f1a1b63ab77 100644
--- a/board/freescale/ls1021atwr/ls102xa_pbi.cfg
+++ b/board/nxp/ls1021atwr/ls102xa_pbi.cfg
diff --git a/board/freescale/ls1021atwr/ls102xa_rcw_sd_ifc.cfg b/board/nxp/ls1021atwr/ls102xa_rcw_sd_ifc.cfg
index f94997d5384..f94997d5384 100644
--- a/board/freescale/ls1021atwr/ls102xa_rcw_sd_ifc.cfg
+++ b/board/nxp/ls1021atwr/ls102xa_rcw_sd_ifc.cfg
diff --git a/board/freescale/ls1021atwr/ls102xa_rcw_sd_qspi.cfg b/board/nxp/ls1021atwr/ls102xa_rcw_sd_qspi.cfg
index 541b604cffc..541b604cffc 100644
--- a/board/freescale/ls1021atwr/ls102xa_rcw_sd_qspi.cfg
+++ b/board/nxp/ls1021atwr/ls102xa_rcw_sd_qspi.cfg
diff --git a/board/freescale/ls1021atwr/psci.S b/board/nxp/ls1021atwr/psci.S
index 3c093aa33cb..3c093aa33cb 100644
--- a/board/freescale/ls1021atwr/psci.S
+++ b/board/nxp/ls1021atwr/psci.S
diff --git a/board/freescale/ls1028a/Kconfig b/board/nxp/ls1028a/Kconfig
index fb6ee17ce89..d14eac2720e 100644
--- a/board/freescale/ls1028a/Kconfig
+++ b/board/nxp/ls1028a/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "ls1028a"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_SOC
 	default "fsl-layerscape"
@@ -28,7 +28,7 @@ config SYS_BOARD
 	default "ls1028a"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_SOC
 	default "fsl-layerscape"
diff --git a/board/freescale/ls1028a/MAINTAINERS b/board/nxp/ls1028a/MAINTAINERS
index 551f6a08651..fcaf7eddc51 100644
--- a/board/freescale/ls1028a/MAINTAINERS
+++ b/board/nxp/ls1028a/MAINTAINERS
@@ -1,7 +1,7 @@
 LS1028AQDS BOARD
 M:	Tang Yuantian <andy.tang@nxp.com>
 S:	Maintained
-F:	board/freescale/ls1028a/
+F:	board/nxp/ls1028a/
 F:	include/configs/ls1028a_common.h
 F:	include/configs/ls1028aqds.h
 F:	configs/ls1028aqds_tfa_defconfig
@@ -10,7 +10,7 @@ F:	configs/ls1028aqds_tfa_lpuart_defconfig
 LS1028ARDB BOARD
 M:	Tang Yuantian <andy.tang@nxp.com>
 S:	Maintained
-F:	board/freescale/ls1028a/
+F:	board/nxp/ls1028a/
 F:	include/configs/ls1028a_common.h
 F:	include/configs/ls1028ardb.h
 F:	configs/ls1028ardb_tfa_defconfig
diff --git a/board/freescale/ls1028a/Makefile b/board/nxp/ls1028a/Makefile
index 9bc144cbfea..9bc144cbfea 100644
--- a/board/freescale/ls1028a/Makefile
+++ b/board/nxp/ls1028a/Makefile
diff --git a/board/freescale/ls1028a/README b/board/nxp/ls1028a/README
index 323881faa50..323881faa50 100644
--- a/board/freescale/ls1028a/README
+++ b/board/nxp/ls1028a/README
diff --git a/board/freescale/ls1028a/ddr.c b/board/nxp/ls1028a/ddr.c
index c406f2436d1..c406f2436d1 100644
--- a/board/freescale/ls1028a/ddr.c
+++ b/board/nxp/ls1028a/ddr.c
diff --git a/board/freescale/ls1028a/ls1028a.c b/board/nxp/ls1028a/ls1028a.c
index db94d9c1fa8..db94d9c1fa8 100644
--- a/board/freescale/ls1028a/ls1028a.c
+++ b/board/nxp/ls1028a/ls1028a.c
diff --git a/board/freescale/ls1043aqds/Kconfig b/board/nxp/ls1043aqds/Kconfig
index 7e27f8f5b13..7261a270f9a 100644
--- a/board/freescale/ls1043aqds/Kconfig
+++ b/board/nxp/ls1043aqds/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "ls1043aqds"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_SOC
 	default "fsl-layerscape"
diff --git a/board/freescale/ls1043aqds/MAINTAINERS b/board/nxp/ls1043aqds/MAINTAINERS
index f7420ecd303..daea64483d2 100644
--- a/board/freescale/ls1043aqds/MAINTAINERS
+++ b/board/nxp/ls1043aqds/MAINTAINERS
@@ -1,7 +1,7 @@
 LS1043AQDS BOARD
 M:	Mingkai Hu <mingkai.hu@nxp.com>
 S:	Maintained
-F:	board/freescale/ls1043aqds/
+F:	board/nxp/ls1043aqds/
 F:	include/configs/ls1043aqds.h
 F:	configs/ls1043aqds_defconfig
 F:	configs/ls1043aqds_nor_ddr3_defconfig
diff --git a/board/freescale/ls1043aqds/Makefile b/board/nxp/ls1043aqds/Makefile
index ff830788fd7..ff830788fd7 100644
--- a/board/freescale/ls1043aqds/Makefile
+++ b/board/nxp/ls1043aqds/Makefile
diff --git a/board/freescale/ls1043aqds/README b/board/nxp/ls1043aqds/README
index f5aa51da87e..f5aa51da87e 100644
--- a/board/freescale/ls1043aqds/README
+++ b/board/nxp/ls1043aqds/README
diff --git a/board/freescale/ls1043aqds/ddr.c b/board/nxp/ls1043aqds/ddr.c
index 137ad7395ad..137ad7395ad 100644
--- a/board/freescale/ls1043aqds/ddr.c
+++ b/board/nxp/ls1043aqds/ddr.c
diff --git a/board/freescale/ls1043aqds/ddr.h b/board/nxp/ls1043aqds/ddr.h
index 65b0250d370..65b0250d370 100644
--- a/board/freescale/ls1043aqds/ddr.h
+++ b/board/nxp/ls1043aqds/ddr.h
diff --git a/board/freescale/ls1043aqds/eth.c b/board/nxp/ls1043aqds/eth.c
index 5a8ca27b327..5a8ca27b327 100644
--- a/board/freescale/ls1043aqds/eth.c
+++ b/board/nxp/ls1043aqds/eth.c
diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/nxp/ls1043aqds/ls1043aqds.c
index f043599fbb8..f043599fbb8 100644
--- a/board/freescale/ls1043aqds/ls1043aqds.c
+++ b/board/nxp/ls1043aqds/ls1043aqds.c
diff --git a/board/freescale/ls1043aqds/ls1043aqds_pbi.cfg b/board/nxp/ls1043aqds/ls1043aqds_pbi.cfg
index f072274f474..f072274f474 100644
--- a/board/freescale/ls1043aqds/ls1043aqds_pbi.cfg
+++ b/board/nxp/ls1043aqds/ls1043aqds_pbi.cfg
diff --git a/board/freescale/ls1043aqds/ls1043aqds_qixis.h b/board/nxp/ls1043aqds/ls1043aqds_qixis.h
index bba494ae413..bba494ae413 100644
--- a/board/freescale/ls1043aqds/ls1043aqds_qixis.h
+++ b/board/nxp/ls1043aqds/ls1043aqds_qixis.h
diff --git a/board/freescale/ls1043aqds/ls1043aqds_rcw_nand.cfg b/board/nxp/ls1043aqds/ls1043aqds_rcw_nand.cfg
index d87058b7efe..d87058b7efe 100644
--- a/board/freescale/ls1043aqds/ls1043aqds_rcw_nand.cfg
+++ b/board/nxp/ls1043aqds/ls1043aqds_rcw_nand.cfg
diff --git a/board/freescale/ls1043aqds/ls1043aqds_rcw_sd_ifc.cfg b/board/nxp/ls1043aqds/ls1043aqds_rcw_sd_ifc.cfg
index b6b5e0b1018..b6b5e0b1018 100644
--- a/board/freescale/ls1043aqds/ls1043aqds_rcw_sd_ifc.cfg
+++ b/board/nxp/ls1043aqds/ls1043aqds_rcw_sd_ifc.cfg
diff --git a/board/freescale/ls1043aqds/ls1043aqds_rcw_sd_qspi.cfg b/board/nxp/ls1043aqds/ls1043aqds_rcw_sd_qspi.cfg
index 7783521b95b..7783521b95b 100644
--- a/board/freescale/ls1043aqds/ls1043aqds_rcw_sd_qspi.cfg
+++ b/board/nxp/ls1043aqds/ls1043aqds_rcw_sd_qspi.cfg
diff --git a/board/freescale/ls1043ardb/Kconfig b/board/nxp/ls1043ardb/Kconfig
index 51818ec5801..92b55496c62 100644
--- a/board/freescale/ls1043ardb/Kconfig
+++ b/board/nxp/ls1043ardb/Kconfig
@@ -5,7 +5,7 @@ config SYS_BOARD
 	default "ls1043ardb"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_SOC
 	default "fsl-layerscape"
diff --git a/board/freescale/ls1043ardb/MAINTAINERS b/board/nxp/ls1043ardb/MAINTAINERS
index 06b23889f6d..4df5940ab71 100644
--- a/board/freescale/ls1043ardb/MAINTAINERS
+++ b/board/nxp/ls1043ardb/MAINTAINERS
@@ -1,7 +1,7 @@
 LS1043A BOARD
 M:	Mingkai Hu <mingkai.hu@nxp.com>
 S:	Maintained
-F:	board/freescale/ls1043ardb/
+F:	board/nxp/ls1043ardb/
 F:	include/configs/ls1043ardb.h
 F:	configs/ls1043ardb_defconfig
 F:	configs/ls1043ardb_nand_defconfig
diff --git a/board/freescale/ls1043ardb/Makefile b/board/nxp/ls1043ardb/Makefile
index 95745bf3a9c..95745bf3a9c 100644
--- a/board/freescale/ls1043ardb/Makefile
+++ b/board/nxp/ls1043ardb/Makefile
diff --git a/board/freescale/ls1043ardb/README b/board/nxp/ls1043ardb/README
index 66ee578e99d..66ee578e99d 100644
--- a/board/freescale/ls1043ardb/README
+++ b/board/nxp/ls1043ardb/README
diff --git a/board/freescale/ls1043ardb/cpld.c b/board/nxp/ls1043ardb/cpld.c
index 39b6c6449cf..39b6c6449cf 100644
--- a/board/freescale/ls1043ardb/cpld.c
+++ b/board/nxp/ls1043ardb/cpld.c
diff --git a/board/freescale/ls1043ardb/cpld.h b/board/nxp/ls1043ardb/cpld.h
index eed34d63546..eed34d63546 100644
--- a/board/freescale/ls1043ardb/cpld.h
+++ b/board/nxp/ls1043ardb/cpld.h
diff --git a/board/freescale/ls1043ardb/ddr.c b/board/nxp/ls1043ardb/ddr.c
index 231b60d1b3d..231b60d1b3d 100644
--- a/board/freescale/ls1043ardb/ddr.c
+++ b/board/nxp/ls1043ardb/ddr.c
diff --git a/board/freescale/ls1043ardb/ddr.h b/board/nxp/ls1043ardb/ddr.h
index 85ed920ca6d..85ed920ca6d 100644
--- a/board/freescale/ls1043ardb/ddr.h
+++ b/board/nxp/ls1043ardb/ddr.h
diff --git a/board/freescale/ls1043ardb/eth.c b/board/nxp/ls1043ardb/eth.c
index cacc49c0584..cacc49c0584 100644
--- a/board/freescale/ls1043ardb/eth.c
+++ b/board/nxp/ls1043ardb/eth.c
diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/nxp/ls1043ardb/ls1043ardb.c
index bba041065b5..bba041065b5 100644
--- a/board/freescale/ls1043ardb/ls1043ardb.c
+++ b/board/nxp/ls1043ardb/ls1043ardb.c
diff --git a/board/freescale/ls1043ardb/ls1043ardb_pbi.cfg b/board/nxp/ls1043ardb/ls1043ardb_pbi.cfg
index f072274f474..f072274f474 100644
--- a/board/freescale/ls1043ardb/ls1043ardb_pbi.cfg
+++ b/board/nxp/ls1043ardb/ls1043ardb_pbi.cfg
diff --git a/board/freescale/ls1043ardb/ls1043ardb_rcw_nand.cfg b/board/nxp/ls1043ardb/ls1043ardb_rcw_nand.cfg
index d87058b7efe..d87058b7efe 100644
--- a/board/freescale/ls1043ardb/ls1043ardb_rcw_nand.cfg
+++ b/board/nxp/ls1043ardb/ls1043ardb_rcw_nand.cfg
diff --git a/board/freescale/ls1043ardb/ls1043ardb_rcw_sd.cfg b/board/nxp/ls1043ardb/ls1043ardb_rcw_sd.cfg
index e2ee34b7dfc..e2ee34b7dfc 100644
--- a/board/freescale/ls1043ardb/ls1043ardb_rcw_sd.cfg
+++ b/board/nxp/ls1043ardb/ls1043ardb_rcw_sd.cfg
diff --git a/board/freescale/ls1046afrwy/Kconfig b/board/nxp/ls1046afrwy/Kconfig
index 68329d78caf..0f73485af7e 100644
--- a/board/freescale/ls1046afrwy/Kconfig
+++ b/board/nxp/ls1046afrwy/Kconfig
@@ -5,7 +5,7 @@ config SYS_BOARD
 	default "ls1046afrwy"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_SOC
 	default "fsl-layerscape"
diff --git a/board/freescale/ls1046afrwy/MAINTAINERS b/board/nxp/ls1046afrwy/MAINTAINERS
index 8f360e1820f..abfd3e937b5 100644
--- a/board/freescale/ls1046afrwy/MAINTAINERS
+++ b/board/nxp/ls1046afrwy/MAINTAINERS
@@ -1,8 +1,8 @@
 LS1046AFRWY BOARD
 M:	Pramod Kumar <pramod.kumar_1@nxp.com>
 S:	Maintained
-F:	board/freescale/ls1046afrwy/
-F:	board/freescale/ls1046afrwy/ls1046afrwy.c
+F:	board/nxp/ls1046afrwy/
+F:	board/nxp/ls1046afrwy/ls1046afrwy.c
 F:	include/configs/ls1046afrwy.h
 F:	configs/ls1046afrwy_tfa_defconfig
 F:	configs/ls1046afrwy_tfa_SECURE_BOOT_defconfig
diff --git a/board/freescale/ls1046afrwy/Makefile b/board/nxp/ls1046afrwy/Makefile
index c70f5cda797..c70f5cda797 100644
--- a/board/freescale/ls1046afrwy/Makefile
+++ b/board/nxp/ls1046afrwy/Makefile
diff --git a/board/freescale/ls1046afrwy/README b/board/nxp/ls1046afrwy/README
index 2c7c797a879..2c7c797a879 100644
--- a/board/freescale/ls1046afrwy/README
+++ b/board/nxp/ls1046afrwy/README
diff --git a/board/freescale/ls1046afrwy/ddr.c b/board/nxp/ls1046afrwy/ddr.c
index b08caee1d97..b08caee1d97 100644
--- a/board/freescale/ls1046afrwy/ddr.c
+++ b/board/nxp/ls1046afrwy/ddr.c
diff --git a/board/freescale/ls1046afrwy/eth.c b/board/nxp/ls1046afrwy/eth.c
index 8efc7f68424..8efc7f68424 100644
--- a/board/freescale/ls1046afrwy/eth.c
+++ b/board/nxp/ls1046afrwy/eth.c
diff --git a/board/freescale/ls1046afrwy/ls1046afrwy.c b/board/nxp/ls1046afrwy/ls1046afrwy.c
index 8889c24f1f0..8889c24f1f0 100644
--- a/board/freescale/ls1046afrwy/ls1046afrwy.c
+++ b/board/nxp/ls1046afrwy/ls1046afrwy.c
diff --git a/board/freescale/ls1046aqds/Kconfig b/board/nxp/ls1046aqds/Kconfig
index 723f4ba90a0..b886c55576a 100644
--- a/board/freescale/ls1046aqds/Kconfig
+++ b/board/nxp/ls1046aqds/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "ls1046aqds"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_SOC
 	default "fsl-layerscape"
diff --git a/board/freescale/ls1046aqds/MAINTAINERS b/board/nxp/ls1046aqds/MAINTAINERS
index e1db2aaa8e4..792531f7f3a 100644
--- a/board/freescale/ls1046aqds/MAINTAINERS
+++ b/board/nxp/ls1046aqds/MAINTAINERS
@@ -1,7 +1,7 @@
 LS1046AQDS BOARD
 M:	Mingkai Hu <Mingkai.Hu@nxp.com>
 S:	Maintained
-F:	board/freescale/ls1046aqds/
+F:	board/nxp/ls1046aqds/
 F:	include/configs/ls1046aqds.h
 F:	configs/ls1046aqds_defconfig
 F:	configs/ls1046aqds_nand_defconfig
diff --git a/board/freescale/ls1046aqds/Makefile b/board/nxp/ls1046aqds/Makefile
index 365247d92bc..365247d92bc 100644
--- a/board/freescale/ls1046aqds/Makefile
+++ b/board/nxp/ls1046aqds/Makefile
diff --git a/board/freescale/ls1046aqds/README b/board/nxp/ls1046aqds/README
index cb694735a46..cb694735a46 100644
--- a/board/freescale/ls1046aqds/README
+++ b/board/nxp/ls1046aqds/README
diff --git a/board/freescale/ls1046aqds/ddr.c b/board/nxp/ls1046aqds/ddr.c
index 57790335f0a..57790335f0a 100644
--- a/board/freescale/ls1046aqds/ddr.c
+++ b/board/nxp/ls1046aqds/ddr.c
diff --git a/board/freescale/ls1046aqds/ddr.h b/board/nxp/ls1046aqds/ddr.h
index e55446f2b29..e55446f2b29 100644
--- a/board/freescale/ls1046aqds/ddr.h
+++ b/board/nxp/ls1046aqds/ddr.h
diff --git a/board/freescale/ls1046aqds/eth.c b/board/nxp/ls1046aqds/eth.c
index cd3500c2e96..cd3500c2e96 100644
--- a/board/freescale/ls1046aqds/eth.c
+++ b/board/nxp/ls1046aqds/eth.c
diff --git a/board/freescale/ls1046aqds/ls1046aqds.c b/board/nxp/ls1046aqds/ls1046aqds.c
index 7df12550868..7df12550868 100644
--- a/board/freescale/ls1046aqds/ls1046aqds.c
+++ b/board/nxp/ls1046aqds/ls1046aqds.c
diff --git a/board/freescale/ls1046aqds/ls1046aqds_pbi.cfg b/board/nxp/ls1046aqds/ls1046aqds_pbi.cfg
index 5a6b7b84a4c..5a6b7b84a4c 100644
--- a/board/freescale/ls1046aqds/ls1046aqds_pbi.cfg
+++ b/board/nxp/ls1046aqds/ls1046aqds_pbi.cfg
diff --git a/board/freescale/ls1046aqds/ls1046aqds_qixis.h b/board/nxp/ls1046aqds/ls1046aqds_qixis.h
index f371056e37a..f371056e37a 100644
--- a/board/freescale/ls1046aqds/ls1046aqds_qixis.h
+++ b/board/nxp/ls1046aqds/ls1046aqds_qixis.h
diff --git a/board/freescale/ls1046aqds/ls1046aqds_rcw_nand.cfg b/board/nxp/ls1046aqds/ls1046aqds_rcw_nand.cfg
index b5fc08ce2ab..b5fc08ce2ab 100644
--- a/board/freescale/ls1046aqds/ls1046aqds_rcw_nand.cfg
+++ b/board/nxp/ls1046aqds/ls1046aqds_rcw_nand.cfg
diff --git a/board/freescale/ls1046aqds/ls1046aqds_rcw_sd_ifc.cfg b/board/nxp/ls1046aqds/ls1046aqds_rcw_sd_ifc.cfg
index 59d24d67908..59d24d67908 100644
--- a/board/freescale/ls1046aqds/ls1046aqds_rcw_sd_ifc.cfg
+++ b/board/nxp/ls1046aqds/ls1046aqds_rcw_sd_ifc.cfg
diff --git a/board/freescale/ls1046aqds/ls1046aqds_rcw_sd_qspi.cfg b/board/nxp/ls1046aqds/ls1046aqds_rcw_sd_qspi.cfg
index 9401a6f0f4f..9401a6f0f4f 100644
--- a/board/freescale/ls1046aqds/ls1046aqds_rcw_sd_qspi.cfg
+++ b/board/nxp/ls1046aqds/ls1046aqds_rcw_sd_qspi.cfg
diff --git a/board/freescale/ls1046ardb/Kconfig b/board/nxp/ls1046ardb/Kconfig
index a62255c78db..7cb7e0eb01e 100644
--- a/board/freescale/ls1046ardb/Kconfig
+++ b/board/nxp/ls1046ardb/Kconfig
@@ -5,7 +5,7 @@ config SYS_BOARD
 	default "ls1046ardb"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_SOC
 	default "fsl-layerscape"
diff --git a/board/freescale/ls1046ardb/MAINTAINERS b/board/nxp/ls1046ardb/MAINTAINERS
index d5a6b261519..bb5f6a64d7b 100644
--- a/board/freescale/ls1046ardb/MAINTAINERS
+++ b/board/nxp/ls1046ardb/MAINTAINERS
@@ -1,8 +1,8 @@
 LS1046A BOARD
 M:	Mingkai Hu <mingkai.hu@nxp.com>
 S:	Maintained
-F:	board/freescale/ls1046ardb/
-F:	board/freescale/ls1046ardb/ls1046ardb.c
+F:	board/nxp/ls1046ardb/
+F:	board/nxp/ls1046ardb/ls1046ardb.c
 F:	include/configs/ls1046ardb.h
 F:	configs/ls1046ardb_qspi_defconfig
 F:	configs/ls1046ardb_qspi_spl_defconfig
diff --git a/board/freescale/ls1046ardb/Makefile b/board/nxp/ls1046ardb/Makefile
index 9e5d24f53c8..9e5d24f53c8 100644
--- a/board/freescale/ls1046ardb/Makefile
+++ b/board/nxp/ls1046ardb/Makefile
diff --git a/board/freescale/ls1046ardb/cpld.c b/board/nxp/ls1046ardb/cpld.c
index 26a5962bd6e..26a5962bd6e 100644
--- a/board/freescale/ls1046ardb/cpld.c
+++ b/board/nxp/ls1046ardb/cpld.c
diff --git a/board/freescale/ls1046ardb/cpld.h b/board/nxp/ls1046ardb/cpld.h
index e87044f5c0d..e87044f5c0d 100644
--- a/board/freescale/ls1046ardb/cpld.h
+++ b/board/nxp/ls1046ardb/cpld.h
diff --git a/board/freescale/ls1046ardb/ddr.c b/board/nxp/ls1046ardb/ddr.c
index 4170666c420..4170666c420 100644
--- a/board/freescale/ls1046ardb/ddr.c
+++ b/board/nxp/ls1046ardb/ddr.c
diff --git a/board/freescale/ls1046ardb/ddr.h b/board/nxp/ls1046ardb/ddr.h
index 05baef232ab..05baef232ab 100644
--- a/board/freescale/ls1046ardb/ddr.h
+++ b/board/nxp/ls1046ardb/ddr.h
diff --git a/board/freescale/ls1046ardb/eth.c b/board/nxp/ls1046ardb/eth.c
index fee8e0e21d4..fee8e0e21d4 100644
--- a/board/freescale/ls1046ardb/eth.c
+++ b/board/nxp/ls1046ardb/eth.c
diff --git a/board/freescale/ls1046ardb/ls1046ardb.c b/board/nxp/ls1046ardb/ls1046ardb.c
index 83b280f7646..83b280f7646 100644
--- a/board/freescale/ls1046ardb/ls1046ardb.c
+++ b/board/nxp/ls1046ardb/ls1046ardb.c
diff --git a/board/freescale/ls1046ardb/ls1046ardb_pbi.cfg b/board/nxp/ls1046ardb/ls1046ardb_pbi.cfg
index 5478217524d..5478217524d 100644
--- a/board/freescale/ls1046ardb/ls1046ardb_pbi.cfg
+++ b/board/nxp/ls1046ardb/ls1046ardb_pbi.cfg
diff --git a/board/freescale/ls1046ardb/ls1046ardb_qspi_pbi.cfg b/board/nxp/ls1046ardb/ls1046ardb_qspi_pbi.cfg
index 735d46c9f9b..735d46c9f9b 100644
--- a/board/freescale/ls1046ardb/ls1046ardb_qspi_pbi.cfg
+++ b/board/nxp/ls1046ardb/ls1046ardb_qspi_pbi.cfg
diff --git a/board/freescale/ls1046ardb/ls1046ardb_rcw_emmc.cfg b/board/nxp/ls1046ardb/ls1046ardb_rcw_emmc.cfg
index ccedf87e849..ccedf87e849 100644
--- a/board/freescale/ls1046ardb/ls1046ardb_rcw_emmc.cfg
+++ b/board/nxp/ls1046ardb/ls1046ardb_rcw_emmc.cfg
diff --git a/board/freescale/ls1046ardb/ls1046ardb_rcw_qspi.cfg b/board/nxp/ls1046ardb/ls1046ardb_rcw_qspi.cfg
index 7b9be0ad3f8..7b9be0ad3f8 100644
--- a/board/freescale/ls1046ardb/ls1046ardb_rcw_qspi.cfg
+++ b/board/nxp/ls1046ardb/ls1046ardb_rcw_qspi.cfg
diff --git a/board/freescale/ls1046ardb/ls1046ardb_rcw_sd.cfg b/board/nxp/ls1046ardb/ls1046ardb_rcw_sd.cfg
index d3b152282f2..d3b152282f2 100644
--- a/board/freescale/ls1046ardb/ls1046ardb_rcw_sd.cfg
+++ b/board/nxp/ls1046ardb/ls1046ardb_rcw_sd.cfg
diff --git a/board/freescale/ls1088a/Kconfig b/board/nxp/ls1088a/Kconfig
index 1ada661743e..976fd3ae748 100644
--- a/board/freescale/ls1088a/Kconfig
+++ b/board/nxp/ls1088a/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "ls1088a"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_SOC
 	default "fsl-layerscape"
@@ -20,7 +20,7 @@ config SYS_BOARD
 	default "ls1088a"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_SOC
 	default "fsl-layerscape"
diff --git a/board/freescale/ls1088a/MAINTAINERS b/board/nxp/ls1088a/MAINTAINERS
index 95a14149e4f..85f38fcf0c7 100644
--- a/board/freescale/ls1088a/MAINTAINERS
+++ b/board/nxp/ls1088a/MAINTAINERS
@@ -1,7 +1,7 @@
 LS1088ARDB BOARD
 M:	Ashish Kumar <Ashish.Kumar@nxp.com>
 S:	Maintained
-F:	board/freescale/ls1088a/
+F:	board/nxp/ls1088a/
 F:	include/configs/ls1088ardb.h
 F:	configs/ls1088ardb_qspi_defconfig
 F:	configs/ls1088ardb_sdcard_qspi_defconfig
@@ -11,7 +11,7 @@ F:	configs/ls1088ardb_tfa_SECURE_BOOT_defconfig
 LS1088AQDS BOARD
 M:	Ashish Kumar <Ashish.Kumar@nxp.com>
 S:	Maintained
-F:	board/freescale/ls1088a/
+F:	board/nxp/ls1088a/
 F:	include/configs/ls1088aqds.h
 F:	configs/ls1088aqds_qspi_defconfig
 F:	configs/ls1088aqds_sdcard_qspi_defconfig
diff --git a/board/freescale/ls1088a/Makefile b/board/nxp/ls1088a/Makefile
index e54d6cad9e1..e54d6cad9e1 100644
--- a/board/freescale/ls1088a/Makefile
+++ b/board/nxp/ls1088a/Makefile
diff --git a/board/freescale/ls1088a/README b/board/nxp/ls1088a/README
index 5315909defc..5315909defc 100644
--- a/board/freescale/ls1088a/README
+++ b/board/nxp/ls1088a/README
diff --git a/board/freescale/ls1088a/ddr.c b/board/nxp/ls1088a/ddr.c
index cd590af9534..cd590af9534 100644
--- a/board/freescale/ls1088a/ddr.c
+++ b/board/nxp/ls1088a/ddr.c
diff --git a/board/freescale/ls1088a/ddr.h b/board/nxp/ls1088a/ddr.h
index b35c4ae2dad..b35c4ae2dad 100644
--- a/board/freescale/ls1088a/ddr.h
+++ b/board/nxp/ls1088a/ddr.h
diff --git a/board/freescale/ls1088a/eth_ls1088aqds.c b/board/nxp/ls1088a/eth_ls1088aqds.c
index e6033d251c5..e6033d251c5 100644
--- a/board/freescale/ls1088a/eth_ls1088aqds.c
+++ b/board/nxp/ls1088a/eth_ls1088aqds.c
diff --git a/board/freescale/ls1088a/eth_ls1088ardb.c b/board/nxp/ls1088a/eth_ls1088ardb.c
index fb6f9c1a813..fb6f9c1a813 100644
--- a/board/freescale/ls1088a/eth_ls1088ardb.c
+++ b/board/nxp/ls1088a/eth_ls1088ardb.c
diff --git a/board/freescale/ls1088a/ls1088a.c b/board/nxp/ls1088a/ls1088a.c
index 51ec055be63..51ec055be63 100644
--- a/board/freescale/ls1088a/ls1088a.c
+++ b/board/nxp/ls1088a/ls1088a.c
diff --git a/board/freescale/ls1088a/ls1088a_qixis.h b/board/nxp/ls1088a/ls1088a_qixis.h
index e3502eb1d19..e3502eb1d19 100644
--- a/board/freescale/ls1088a/ls1088a_qixis.h
+++ b/board/nxp/ls1088a/ls1088a_qixis.h
diff --git a/board/freescale/ls2080aqds/Kconfig b/board/nxp/ls2080aqds/Kconfig
index 2f997e9de1a..dc2a5f83134 100644
--- a/board/freescale/ls2080aqds/Kconfig
+++ b/board/nxp/ls2080aqds/Kconfig
@@ -5,7 +5,7 @@ config SYS_BOARD
 	default "ls2080aqds"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_SOC
 	default "fsl-layerscape"
diff --git a/board/freescale/ls2080aqds/MAINTAINERS b/board/nxp/ls2080aqds/MAINTAINERS
index fdad199ec25..3659cec4cd8 100644
--- a/board/freescale/ls2080aqds/MAINTAINERS
+++ b/board/nxp/ls2080aqds/MAINTAINERS
@@ -2,8 +2,8 @@ LS2080A BOARD
 M:	Priyanka Jain <priyanka.jain@nxp.com>
 M:	Wasim Khan <wasim.khan@nxp.com>
 S:	Maintained
-F:	board/freescale/ls2080aqds/
-F:	board/freescale/ls2080a/ls2080aqds.c
+F:	board/nxp/ls2080aqds/
+F:	board/nxp/ls2080a/ls2080aqds.c
 F:	include/configs/ls2080aqds.h
 F:	configs/ls2080aqds_defconfig
 F:	configs/ls2080aqds_nand_defconfig
diff --git a/board/freescale/ls2080aqds/Makefile b/board/nxp/ls2080aqds/Makefile
index efc51b4a34d..efc51b4a34d 100644
--- a/board/freescale/ls2080aqds/Makefile
+++ b/board/nxp/ls2080aqds/Makefile
diff --git a/board/freescale/ls2080aqds/README b/board/nxp/ls2080aqds/README
index a4cb1a6cac4..a4cb1a6cac4 100644
--- a/board/freescale/ls2080aqds/README
+++ b/board/nxp/ls2080aqds/README
diff --git a/board/freescale/ls2080aqds/ddr.c b/board/nxp/ls2080aqds/ddr.c
index 31ed72c949b..31ed72c949b 100644
--- a/board/freescale/ls2080aqds/ddr.c
+++ b/board/nxp/ls2080aqds/ddr.c
diff --git a/board/freescale/ls2080aqds/ddr.h b/board/nxp/ls2080aqds/ddr.h
index 465155e56bf..465155e56bf 100644
--- a/board/freescale/ls2080aqds/ddr.h
+++ b/board/nxp/ls2080aqds/ddr.h
diff --git a/board/freescale/ls2080aqds/eth.c b/board/nxp/ls2080aqds/eth.c
index b47e2ec5a79..b47e2ec5a79 100644
--- a/board/freescale/ls2080aqds/eth.c
+++ b/board/nxp/ls2080aqds/eth.c
diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/nxp/ls2080aqds/ls2080aqds.c
index aba0560181a..aba0560181a 100644
--- a/board/freescale/ls2080aqds/ls2080aqds.c
+++ b/board/nxp/ls2080aqds/ls2080aqds.c
diff --git a/board/freescale/ls2080aqds/ls2080aqds_qixis.h b/board/nxp/ls2080aqds/ls2080aqds_qixis.h
index 7b2607b8daa..7b2607b8daa 100644
--- a/board/freescale/ls2080aqds/ls2080aqds_qixis.h
+++ b/board/nxp/ls2080aqds/ls2080aqds_qixis.h
diff --git a/board/freescale/ls2080ardb/Kconfig b/board/nxp/ls2080ardb/Kconfig
index 671eead5f7f..1f057a7690b 100644
--- a/board/freescale/ls2080ardb/Kconfig
+++ b/board/nxp/ls2080ardb/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "ls2080ardb"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_SOC
 	default "fsl-layerscape"
diff --git a/board/freescale/ls2080ardb/MAINTAINERS b/board/nxp/ls2080ardb/MAINTAINERS
index f2f834ffbd9..867ebe99cac 100644
--- a/board/freescale/ls2080ardb/MAINTAINERS
+++ b/board/nxp/ls2080ardb/MAINTAINERS
@@ -2,8 +2,8 @@ LS2080A BOARD
 M:	Priyanka Jain <priyanka.jain@nxp.com>
 M:	Wasim Khan <wasim.khan@nxp.com>
 S:	Maintained
-F:	board/freescale/ls2080ardb/
-F:	board/freescale/ls2080a/ls2080ardb.c
+F:	board/nxp/ls2080ardb/
+F:	board/nxp/ls2080a/ls2080ardb.c
 F:	include/configs/ls2080ardb.h
 F:	configs/ls2080ardb_defconfig
 F:	configs/ls2080ardb_nand_defconfig
diff --git a/board/freescale/ls2080ardb/Makefile b/board/nxp/ls2080ardb/Makefile
index ed44d459f01..ed44d459f01 100644
--- a/board/freescale/ls2080ardb/Makefile
+++ b/board/nxp/ls2080ardb/Makefile
diff --git a/board/freescale/ls2080ardb/README b/board/nxp/ls2080ardb/README
index 4c1c36ea3a5..4c1c36ea3a5 100644
--- a/board/freescale/ls2080ardb/README
+++ b/board/nxp/ls2080ardb/README
diff --git a/board/freescale/ls2080ardb/ddr.c b/board/nxp/ls2080ardb/ddr.c
index e56667c846f..e56667c846f 100644
--- a/board/freescale/ls2080ardb/ddr.c
+++ b/board/nxp/ls2080ardb/ddr.c
diff --git a/board/freescale/ls2080ardb/ddr.h b/board/nxp/ls2080ardb/ddr.h
index 43301dc72a3..43301dc72a3 100644
--- a/board/freescale/ls2080ardb/ddr.h
+++ b/board/nxp/ls2080ardb/ddr.h
diff --git a/board/freescale/ls2080ardb/eth_ls2080rdb.c b/board/nxp/ls2080ardb/eth_ls2080rdb.c
index 7d5beb32417..7d5beb32417 100644
--- a/board/freescale/ls2080ardb/eth_ls2080rdb.c
+++ b/board/nxp/ls2080ardb/eth_ls2080rdb.c
diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/nxp/ls2080ardb/ls2080ardb.c
index 6f824f57c47..6f824f57c47 100644
--- a/board/freescale/ls2080ardb/ls2080ardb.c
+++ b/board/nxp/ls2080ardb/ls2080ardb.c
diff --git a/board/freescale/ls2080ardb/ls2080ardb_qixis.h b/board/nxp/ls2080ardb/ls2080ardb_qixis.h
index db3c6dc2a2a..db3c6dc2a2a 100644
--- a/board/freescale/ls2080ardb/ls2080ardb_qixis.h
+++ b/board/nxp/ls2080ardb/ls2080ardb_qixis.h
diff --git a/board/freescale/lx2160a/Kconfig b/board/nxp/lx2160a/Kconfig
index 0e4b4158a7f..5764c83ab08 100644
--- a/board/freescale/lx2160a/Kconfig
+++ b/board/nxp/lx2160a/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "lx2160a"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_SOC
 	default "fsl-layerscape"
@@ -20,7 +20,7 @@ config SYS_BOARD
 	default "lx2160a"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_SOC
 	default "fsl-layerscape"
@@ -36,7 +36,7 @@ config SYS_BOARD
 	default "lx2160a"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_SOC
 	default "fsl-layerscape"
diff --git a/board/freescale/lx2160a/MAINTAINERS b/board/nxp/lx2160a/MAINTAINERS
index c60b2af6e42..abdac1372d2 100644
--- a/board/freescale/lx2160a/MAINTAINERS
+++ b/board/nxp/lx2160a/MAINTAINERS
@@ -3,7 +3,7 @@ M:	Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
 M:	Priyanka Jain <priyanka.jain@nxp.com>
 M:	Wasim Khan <wasim.khan@nxp.com>
 S:	Maintained
-F:	board/freescale/lx2160a/
+F:	board/nxp/lx2160a/
 F:	include/configs/lx2160a_common.h
 F:	include/configs/lx2160ardb.h
 F:	configs/lx2160ardb_tfa_defconfig
@@ -19,7 +19,7 @@ LX2160AQDS BOARD
 M:	Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
 M:	Wasim Khan <wasim.khan@nxp.com>
 S:	Maintained
-F:	board/freescale/lx2160a/eth_lx2160aqds.h
+F:	board/nxp/lx2160a/eth_lx2160aqds.h
 F:	include/configs/lx2160aqds.h
 F:	configs/lx2160aqds_tfa_defconfig
 F:	arch/arm/dts/fsl-lx2160a-qds.dts
@@ -33,7 +33,7 @@ LX2162AQDS BOARD
 M:	Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
 M:	Wasim Khan <wasim.khan@nxp.com>
 S:	Maintained
-F:	board/freescale/lx2160a/eth_lx2162aqds.h
+F:	board/nxp/lx2160a/eth_lx2162aqds.h
 F:	include/configs/lx2162aqds.h
 F:	configs/lx2162aqds_tfa_defconfig
 F:	arch/arm/dts/fsl-lx2162a-qds.dts
diff --git a/board/freescale/lx2160a/Makefile b/board/nxp/lx2160a/Makefile
index c9561bfadea..c9561bfadea 100644
--- a/board/freescale/lx2160a/Makefile
+++ b/board/nxp/lx2160a/Makefile
diff --git a/board/freescale/lx2160a/README b/board/nxp/lx2160a/README
index 7bca98dd3d7..7bca98dd3d7 100644
--- a/board/freescale/lx2160a/README
+++ b/board/nxp/lx2160a/README
diff --git a/board/freescale/lx2160a/ddr.c b/board/nxp/lx2160a/ddr.c
index 637e43a22be..637e43a22be 100644
--- a/board/freescale/lx2160a/ddr.c
+++ b/board/nxp/lx2160a/ddr.c
diff --git a/board/freescale/lx2160a/eth_lx2160aqds.c b/board/nxp/lx2160a/eth_lx2160aqds.c
index 9939bb6f89e..9939bb6f89e 100644
--- a/board/freescale/lx2160a/eth_lx2160aqds.c
+++ b/board/nxp/lx2160a/eth_lx2160aqds.c
diff --git a/board/freescale/lx2160a/eth_lx2160ardb.c b/board/nxp/lx2160a/eth_lx2160ardb.c
index 90e7c9100e1..90e7c9100e1 100644
--- a/board/freescale/lx2160a/eth_lx2160ardb.c
+++ b/board/nxp/lx2160a/eth_lx2160ardb.c
diff --git a/board/freescale/lx2160a/eth_lx2162aqds.c b/board/nxp/lx2160a/eth_lx2162aqds.c
index 805aa705be9..805aa705be9 100644
--- a/board/freescale/lx2160a/eth_lx2162aqds.c
+++ b/board/nxp/lx2160a/eth_lx2162aqds.c
diff --git a/board/freescale/lx2160a/lx2160a.c b/board/nxp/lx2160a/lx2160a.c
index 341f82ce724..341f82ce724 100644
--- a/board/freescale/lx2160a/lx2160a.c
+++ b/board/nxp/lx2160a/lx2160a.c
diff --git a/board/freescale/lx2160a/lx2160a.h b/board/nxp/lx2160a/lx2160a.h
index 61a8bb95906..61a8bb95906 100644
--- a/board/freescale/lx2160a/lx2160a.h
+++ b/board/nxp/lx2160a/lx2160a.h
diff --git a/board/freescale/m5208evbe/Kconfig b/board/nxp/m5208evbe/Kconfig
index 9b416afbdc7..a87b57222df 100644
--- a/board/freescale/m5208evbe/Kconfig
+++ b/board/nxp/m5208evbe/Kconfig
@@ -7,7 +7,7 @@ config SYS_BOARD
 	default "m5208evbe"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "M5208EVBE"
diff --git a/board/freescale/m5208evbe/MAINTAINERS b/board/nxp/m5208evbe/MAINTAINERS
index ff153034a4f..77fd91fe126 100644
--- a/board/freescale/m5208evbe/MAINTAINERS
+++ b/board/nxp/m5208evbe/MAINTAINERS
@@ -1,6 +1,6 @@
 M5208EVBE BOARD
 M:      Angelo Dureghello <angelo@kernel-space.org>
 S:	Maintained
-F:	board/freescale/m5208evbe/
+F:	board/nxp/m5208evbe/
 F:	include/configs/M5208EVBE.h
 F:	configs/M5208EVBE_defconfig
diff --git a/board/freescale/m5208evbe/Makefile b/board/nxp/m5208evbe/Makefile
index b7a7c3e6471..b7a7c3e6471 100644
--- a/board/freescale/m5208evbe/Makefile
+++ b/board/nxp/m5208evbe/Makefile
diff --git a/board/freescale/m5208evbe/m5208evbe.c b/board/nxp/m5208evbe/m5208evbe.c
index b202b8094d9..b202b8094d9 100644
--- a/board/freescale/m5208evbe/m5208evbe.c
+++ b/board/nxp/m5208evbe/m5208evbe.c
diff --git a/board/freescale/m5235evb/Kconfig b/board/nxp/m5235evb/Kconfig
index f0d4c8c7964..dd1bbea92eb 100644
--- a/board/freescale/m5235evb/Kconfig
+++ b/board/nxp/m5235evb/Kconfig
@@ -7,7 +7,7 @@ config SYS_BOARD
 	default "m5235evb"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "M5235EVB"
diff --git a/board/freescale/m5235evb/MAINTAINERS b/board/nxp/m5235evb/MAINTAINERS
index b15ac5f14ab..9716b78c36d 100644
--- a/board/freescale/m5235evb/MAINTAINERS
+++ b/board/nxp/m5235evb/MAINTAINERS
@@ -1,7 +1,7 @@
 M5235EVB BOARD
 M:	TsiChung Liew <Tsi-Chung.Liew@nxp.com>
 S:	Maintained
-F:	board/freescale/m5235evb/
+F:	board/nxp/m5235evb/
 F:	include/configs/M5235EVB.h
 F:	configs/M5235EVB_defconfig
 F:	configs/M5235EVB_Flash32_defconfig
diff --git a/board/freescale/m5235evb/Makefile b/board/nxp/m5235evb/Makefile
index b7067e4581b..b7067e4581b 100644
--- a/board/freescale/m5235evb/Makefile
+++ b/board/nxp/m5235evb/Makefile
diff --git a/board/freescale/m5235evb/m5235evb.c b/board/nxp/m5235evb/m5235evb.c
index 65cde56fb2d..65cde56fb2d 100644
--- a/board/freescale/m5235evb/m5235evb.c
+++ b/board/nxp/m5235evb/m5235evb.c
diff --git a/board/freescale/m5249evb/Kconfig b/board/nxp/m5249evb/Kconfig
index 0f624776b55..2757e411936 100644
--- a/board/freescale/m5249evb/Kconfig
+++ b/board/nxp/m5249evb/Kconfig
@@ -7,7 +7,7 @@ config SYS_BOARD
 	default "m5249evb"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "M5249EVB"
diff --git a/board/freescale/m5249evb/MAINTAINERS b/board/nxp/m5249evb/MAINTAINERS
index 619e0cd20da..126fb27a848 100644
--- a/board/freescale/m5249evb/MAINTAINERS
+++ b/board/nxp/m5249evb/MAINTAINERS
@@ -1,6 +1,6 @@
 M5249EVB BOARD
 M:      Angelo Dureghello <angelo@kernel-space.org>
 S:	Maintained
-F:	board/freescale/m5249evb/
+F:	board/nxp/m5249evb/
 F:	include/configs/M5249EVB.h
 F:	configs/M5249EVB_defconfig
diff --git a/board/freescale/m5249evb/Makefile b/board/nxp/m5249evb/Makefile
index 497bc722908..497bc722908 100644
--- a/board/freescale/m5249evb/Makefile
+++ b/board/nxp/m5249evb/Makefile
diff --git a/board/freescale/m5249evb/m5249evb.c b/board/nxp/m5249evb/m5249evb.c
index 68524e5e682..68524e5e682 100644
--- a/board/freescale/m5249evb/m5249evb.c
+++ b/board/nxp/m5249evb/m5249evb.c
diff --git a/board/freescale/m5253demo/Kconfig b/board/nxp/m5253demo/Kconfig
index 0ecce875d14..987bcf9f3b0 100644
--- a/board/freescale/m5253demo/Kconfig
+++ b/board/nxp/m5253demo/Kconfig
@@ -11,7 +11,7 @@ config SYS_BOARD
 	default "m5253demo"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "M5253DEMO"
diff --git a/board/freescale/m5253demo/MAINTAINERS b/board/nxp/m5253demo/MAINTAINERS
index 9b27f4382ea..dfc12012e79 100644
--- a/board/freescale/m5253demo/MAINTAINERS
+++ b/board/nxp/m5253demo/MAINTAINERS
@@ -1,6 +1,6 @@
 M5253DEMO BOARD
 M:	TsiChung Liew <Tsi-Chung.Liew@nxp.com>
 S:	Maintained
-F:	board/freescale/m5253demo/
+F:	board/nxp/m5253demo/
 F:	include/configs/M5253DEMO.h
 F:	configs/M5253DEMO_defconfig
diff --git a/board/freescale/m5253demo/Makefile b/board/nxp/m5253demo/Makefile
index 00d395d1a3c..00d395d1a3c 100644
--- a/board/freescale/m5253demo/Makefile
+++ b/board/nxp/m5253demo/Makefile
diff --git a/board/freescale/m5253demo/flash.c b/board/nxp/m5253demo/flash.c
index ab5d2ebff64..ab5d2ebff64 100644
--- a/board/freescale/m5253demo/flash.c
+++ b/board/nxp/m5253demo/flash.c
diff --git a/board/freescale/m5253demo/m5253demo.c b/board/nxp/m5253demo/m5253demo.c
index 50c5320b55c..50c5320b55c 100644
--- a/board/freescale/m5253demo/m5253demo.c
+++ b/board/nxp/m5253demo/m5253demo.c
diff --git a/board/freescale/m5272c3/Kconfig b/board/nxp/m5272c3/Kconfig
index aee0b239b3b..7a5a0f29085 100644
--- a/board/freescale/m5272c3/Kconfig
+++ b/board/nxp/m5272c3/Kconfig
@@ -7,7 +7,7 @@ config SYS_BOARD
 	default "m5272c3"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "M5272C3"
diff --git a/board/freescale/m5272c3/MAINTAINERS b/board/nxp/m5272c3/MAINTAINERS
index 692ab5b5829..723f6db1716 100644
--- a/board/freescale/m5272c3/MAINTAINERS
+++ b/board/nxp/m5272c3/MAINTAINERS
@@ -1,6 +1,6 @@
 M5272C3 BOARD
 M:      Angelo Dureghello <angelo@kernel-space.org>
 S:	Maintained
-F:	board/freescale/m5272c3/
+F:	board/nxp/m5272c3/
 F:	include/configs/M5272C3.h
 F:	configs/M5272C3_defconfig
diff --git a/board/freescale/m5272c3/Makefile b/board/nxp/m5272c3/Makefile
index 1df8f7003e4..1df8f7003e4 100644
--- a/board/freescale/m5272c3/Makefile
+++ b/board/nxp/m5272c3/Makefile
diff --git a/board/freescale/m5272c3/m5272c3.c b/board/nxp/m5272c3/m5272c3.c
index d1286badc61..d1286badc61 100644
--- a/board/freescale/m5272c3/m5272c3.c
+++ b/board/nxp/m5272c3/m5272c3.c
diff --git a/board/freescale/m5275evb/Kconfig b/board/nxp/m5275evb/Kconfig
index 5a6de9c1c9e..99c9f192769 100644
--- a/board/freescale/m5275evb/Kconfig
+++ b/board/nxp/m5275evb/Kconfig
@@ -7,7 +7,7 @@ config SYS_BOARD
 	default "m5275evb"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "M5275EVB"
diff --git a/board/freescale/m5275evb/MAINTAINERS b/board/nxp/m5275evb/MAINTAINERS
index 065ae7bb1df..61a4cf3e324 100644
--- a/board/freescale/m5275evb/MAINTAINERS
+++ b/board/nxp/m5275evb/MAINTAINERS
@@ -1,6 +1,6 @@
 M5275EVB BOARD
 M:      Angelo Dureghello <angelo@kernel-space.org>
 S:	Maintained
-F:	board/freescale/m5275evb/
+F:	board/nxp/m5275evb/
 F:	include/configs/M5275EVB.h
 F:	configs/M5275EVB_defconfig
diff --git a/board/freescale/m5275evb/Makefile b/board/nxp/m5275evb/Makefile
index 83e3b10f0ed..83e3b10f0ed 100644
--- a/board/freescale/m5275evb/Makefile
+++ b/board/nxp/m5275evb/Makefile
diff --git a/board/freescale/m5275evb/m5275evb.c b/board/nxp/m5275evb/m5275evb.c
index 8b986d42425..8b986d42425 100644
--- a/board/freescale/m5275evb/m5275evb.c
+++ b/board/nxp/m5275evb/m5275evb.c
diff --git a/board/freescale/m5282evb/Kconfig b/board/nxp/m5282evb/Kconfig
index 2ffdd528f63..06e43400ac4 100644
--- a/board/freescale/m5282evb/Kconfig
+++ b/board/nxp/m5282evb/Kconfig
@@ -7,7 +7,7 @@ config SYS_BOARD
 	default "m5282evb"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "M5282EVB"
diff --git a/board/freescale/m5282evb/MAINTAINERS b/board/nxp/m5282evb/MAINTAINERS
index f141c89c3a5..8306581d3f0 100644
--- a/board/freescale/m5282evb/MAINTAINERS
+++ b/board/nxp/m5282evb/MAINTAINERS
@@ -1,6 +1,6 @@
 M5282EVB BOARD
 M:      Angelo Dureghello <angelo@kernel-space.org>
 S:	Maintained
-F:	board/freescale/m5282evb/
+F:	board/nxp/m5282evb/
 F:	include/configs/M5282EVB.h
 F:	configs/M5282EVB_defconfig
diff --git a/board/freescale/m5282evb/Makefile b/board/nxp/m5282evb/Makefile
index e898f39330b..e898f39330b 100644
--- a/board/freescale/m5282evb/Makefile
+++ b/board/nxp/m5282evb/Makefile
diff --git a/board/freescale/m5282evb/m5282evb.c b/board/nxp/m5282evb/m5282evb.c
index 81da6e2abd4..81da6e2abd4 100644
--- a/board/freescale/m5282evb/m5282evb.c
+++ b/board/nxp/m5282evb/m5282evb.c
diff --git a/board/freescale/m53017evb/Kconfig b/board/nxp/m53017evb/Kconfig
index 8ab89e52b2e..3650134e742 100644
--- a/board/freescale/m53017evb/Kconfig
+++ b/board/nxp/m53017evb/Kconfig
@@ -7,7 +7,7 @@ config SYS_BOARD
 	default "m53017evb"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "M53017EVB"
diff --git a/board/freescale/m53017evb/MAINTAINERS b/board/nxp/m53017evb/MAINTAINERS
index ad5f0cea664..d07c409bc49 100644
--- a/board/freescale/m53017evb/MAINTAINERS
+++ b/board/nxp/m53017evb/MAINTAINERS
@@ -1,6 +1,6 @@
 M53017EVB BOARD
 M:	TsiChung Liew <Tsi-Chung.Liew@nxp.com>
 S:	Maintained
-F:	board/freescale/m53017evb/
+F:	board/nxp/m53017evb/
 F:	include/configs/M53017EVB.h
 F:	configs/M53017EVB_defconfig
diff --git a/board/freescale/m53017evb/Makefile b/board/nxp/m53017evb/Makefile
index 4eeb3a860b9..4eeb3a860b9 100644
--- a/board/freescale/m53017evb/Makefile
+++ b/board/nxp/m53017evb/Makefile
diff --git a/board/freescale/m53017evb/README b/board/nxp/m53017evb/README
index 34f05f3fdc7..25831629266 100644
--- a/board/freescale/m53017evb/README
+++ b/board/nxp/m53017evb/README
@@ -9,11 +9,11 @@ Created 10/22/08
 Changed files:
 ==============
 
-- board/freescale/m53017evb/m53017evb.c	Dram setup
-- board/freescale/m53017evb/mii.c	Mii access
-- board/freescale/m53017evb/Makefile	Makefile
-- board/freescale/m53017evb/config.mk	config make
-- board/freescale/m53017evb/u-boot.lds	Linker description
+- board/nxp/m53017evb/m53017evb.c	Dram setup
+- board/nxp/m53017evb/mii.c	Mii access
+- board/nxp/m53017evb/Makefile	Makefile
+- board/nxp/m53017evb/config.mk	config make
+- board/nxp/m53017evb/u-boot.lds	Linker description
 
 - arch/m68k/cpu/mcf532x/cpu.c			cpu specific code
 - arch/m68k/cpu/mcf532x/cpu_init.c		FBCS, Mux pins, icache and RTC extra regs
@@ -23,7 +23,7 @@ Changed files:
 - arch/m68k/cpu/mcf532x/config.mk			config make
 - arch/m68k/cpu/mcf532x/start.S			start up assembly code
 
-- board/freescale/m53017evb/README	his readme file
+- board/nxp/m53017evb/README	his readme file
 
 - drivers/net/mcffec.c			ColdFire common FEC driver
 - drivers/net/mcfmii.c			ColdFire common Mii driver
diff --git a/board/freescale/m53017evb/m53017evb.c b/board/nxp/m53017evb/m53017evb.c
index 196d56dc17d..196d56dc17d 100644
--- a/board/freescale/m53017evb/m53017evb.c
+++ b/board/nxp/m53017evb/m53017evb.c
diff --git a/board/freescale/m5329evb/Kconfig b/board/nxp/m5329evb/Kconfig
index 930fbba246d..73e4b42b201 100644
--- a/board/freescale/m5329evb/Kconfig
+++ b/board/nxp/m5329evb/Kconfig
@@ -7,7 +7,7 @@ config SYS_BOARD
 	default "m5329evb"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "M5329EVB"
diff --git a/board/freescale/m5329evb/MAINTAINERS b/board/nxp/m5329evb/MAINTAINERS
index 2f7dd2d4560..b9b07545156 100644
--- a/board/freescale/m5329evb/MAINTAINERS
+++ b/board/nxp/m5329evb/MAINTAINERS
@@ -1,7 +1,7 @@
 M5329EVB BOARD
 M:	TsiChung Liew <Tsi-Chung.Liew@nxp.com>
 S:	Maintained
-F:	board/freescale/m5329evb/
+F:	board/nxp/m5329evb/
 F:	include/configs/M5329EVB.h
 F:	configs/M5329AFEE_defconfig
 F:	configs/M5329BFEE_defconfig
diff --git a/board/freescale/m5329evb/Makefile b/board/nxp/m5329evb/Makefile
index 19796c213fb..19796c213fb 100644
--- a/board/freescale/m5329evb/Makefile
+++ b/board/nxp/m5329evb/Makefile
diff --git a/board/freescale/m5329evb/m5329evb.c b/board/nxp/m5329evb/m5329evb.c
index 26d5f3bf58c..26d5f3bf58c 100644
--- a/board/freescale/m5329evb/m5329evb.c
+++ b/board/nxp/m5329evb/m5329evb.c
diff --git a/board/freescale/m5329evb/nand.c b/board/nxp/m5329evb/nand.c
index a250d61ef36..a250d61ef36 100644
--- a/board/freescale/m5329evb/nand.c
+++ b/board/nxp/m5329evb/nand.c
diff --git a/board/freescale/m5373evb/Kconfig b/board/nxp/m5373evb/Kconfig
index 67d049d79eb..5ac013771f1 100644
--- a/board/freescale/m5373evb/Kconfig
+++ b/board/nxp/m5373evb/Kconfig
@@ -7,7 +7,7 @@ config SYS_BOARD
 	default "m5373evb"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "M5373EVB"
diff --git a/board/freescale/m5373evb/MAINTAINERS b/board/nxp/m5373evb/MAINTAINERS
index acb7a43ed64..5a185d1220a 100644
--- a/board/freescale/m5373evb/MAINTAINERS
+++ b/board/nxp/m5373evb/MAINTAINERS
@@ -1,6 +1,6 @@
 M5373EVB BOARD
 M:	TsiChung Liew <Tsi-Chung.Liew@nxp.com>
 S:	Maintained
-F:	board/freescale/m5373evb/
+F:	board/nxp/m5373evb/
 F:	include/configs/M5373EVB.h
 F:	configs/M5373EVB_defconfig
diff --git a/board/freescale/m5373evb/Makefile b/board/nxp/m5373evb/Makefile
index 20efa7b8432..20efa7b8432 100644
--- a/board/freescale/m5373evb/Makefile
+++ b/board/nxp/m5373evb/Makefile
diff --git a/board/freescale/m5373evb/README b/board/nxp/m5373evb/README
index 7240648796b..c7130b32251 100644
--- a/board/freescale/m5373evb/README
+++ b/board/nxp/m5373evb/README
@@ -9,11 +9,11 @@ Created 11/08/07
 Changed files:
 ==============
 
-- board/freescale/m5373evb/m5373evb.c	Dram setup
-- board/freescale/m5373evb/mii.c	Mii access
-- board/freescale/m5373evb/Makefile	Makefile
-- board/freescale/m5373evb/config.mk	config make
-- board/freescale/m5373evb/u-boot.lds	Linker description
+- board/nxp/m5373evb/m5373evb.c	Dram setup
+- board/nxp/m5373evb/mii.c	Mii access
+- board/nxp/m5373evb/Makefile	Makefile
+- board/nxp/m5373evb/config.mk	config make
+- board/nxp/m5373evb/u-boot.lds	Linker description
 
 - arch/m68k/cpu/mcf532x/cpu.c		cpu specific code
 - arch/m68k/cpu/mcf532x/cpu_init.c	FBCS, Mux pins, icache and RTC extra regs
@@ -23,7 +23,7 @@ Changed files:
 - arch/m68k/cpu/mcf532x/config.mk		config make
 - arch/m68k/cpu/mcf532x/start.S		start up assembly code
 
-- board/freescale/m5373evb/README	This readme file
+- board/nxp/m5373evb/README	This readme file
 
 - drivers/net/mcffec.c		ColdFire common FEC driver
 - drivers/serial/mcfuart.c	ColdFire common UART driver
diff --git a/board/freescale/m5373evb/m5373evb.c b/board/nxp/m5373evb/m5373evb.c
index d6fdf41bab4..d6fdf41bab4 100644
--- a/board/freescale/m5373evb/m5373evb.c
+++ b/board/nxp/m5373evb/m5373evb.c
diff --git a/board/freescale/m5373evb/nand.c b/board/nxp/m5373evb/nand.c
index e7c08d22e6b..e7c08d22e6b 100644
--- a/board/freescale/m5373evb/nand.c
+++ b/board/nxp/m5373evb/nand.c
diff --git a/board/freescale/mpc837xerdb/Kconfig b/board/nxp/mpc837xerdb/Kconfig
index 3779625edd5..f11f6f5bfea 100644
--- a/board/freescale/mpc837xerdb/Kconfig
+++ b/board/nxp/mpc837xerdb/Kconfig
@@ -7,7 +7,7 @@ config SYS_BOARD
 	default "mpc837xerdb"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "MPC837XERDB"
diff --git a/board/freescale/mpc837xerdb/MAINTAINERS b/board/nxp/mpc837xerdb/MAINTAINERS
index 9f44a37a0d9..9b05a6ad421 100644
--- a/board/freescale/mpc837xerdb/MAINTAINERS
+++ b/board/nxp/mpc837xerdb/MAINTAINERS
@@ -1,7 +1,7 @@
 MPC837XERDB BOARD
 M:	Sinan Akman <sinan@writeme.com>
 S:	Maintained
-F:	board/freescale/mpc837xerdb/
+F:	board/nxp/mpc837xerdb/
 F:	include/configs/MPC837XERDB.h
 F:	configs/MPC837XERDB_defconfig
 F:	configs/MPC837XERDB_SLAVE_defconfig
diff --git a/board/freescale/mpc837xerdb/Makefile b/board/nxp/mpc837xerdb/Makefile
index 4661e4cf232..4661e4cf232 100644
--- a/board/freescale/mpc837xerdb/Makefile
+++ b/board/nxp/mpc837xerdb/Makefile
diff --git a/board/freescale/mpc837xerdb/README b/board/nxp/mpc837xerdb/README
index 12df2f2e756..12df2f2e756 100644
--- a/board/freescale/mpc837xerdb/README
+++ b/board/nxp/mpc837xerdb/README
diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/nxp/mpc837xerdb/mpc837xerdb.c
index 55299745a3c..55299745a3c 100644
--- a/board/freescale/mpc837xerdb/mpc837xerdb.c
+++ b/board/nxp/mpc837xerdb/mpc837xerdb.c
diff --git a/board/freescale/mpc8548cds/Kconfig b/board/nxp/mpc8548cds/Kconfig
index bb0a0758964..e43c2030e00 100644
--- a/board/freescale/mpc8548cds/Kconfig
+++ b/board/nxp/mpc8548cds/Kconfig
@@ -13,7 +13,7 @@ config SYS_BOARD
 	default "mpc8548cds"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "MPC8548CDS"
diff --git a/board/freescale/mpc8548cds/MAINTAINERS b/board/nxp/mpc8548cds/MAINTAINERS
index fbbedb1d1d1..51e62a34365 100644
--- a/board/freescale/mpc8548cds/MAINTAINERS
+++ b/board/nxp/mpc8548cds/MAINTAINERS
@@ -1,7 +1,7 @@
 MPC8548CDS BOARD
 M:	Priyanka Jain <priyanka.jain@nxp.com>
 S:	Maintained
-F:	board/freescale/mpc8548cds/
+F:	board/nxp/mpc8548cds/
 F:	include/configs/MPC8548CDS.h
 F:	configs/MPC8548CDS_defconfig
 F:	configs/MPC8548CDS_36BIT_defconfig
diff --git a/board/freescale/mpc8548cds/Makefile b/board/nxp/mpc8548cds/Makefile
index 5ed40e92eb9..5ed40e92eb9 100644
--- a/board/freescale/mpc8548cds/Makefile
+++ b/board/nxp/mpc8548cds/Makefile
diff --git a/board/freescale/mpc8548cds/ddr.c b/board/nxp/mpc8548cds/ddr.c
index 4b8ddcc3ae4..4b8ddcc3ae4 100644
--- a/board/freescale/mpc8548cds/ddr.c
+++ b/board/nxp/mpc8548cds/ddr.c
diff --git a/board/freescale/mpc8548cds/law.c b/board/nxp/mpc8548cds/law.c
index 2334870fda0..2334870fda0 100644
--- a/board/freescale/mpc8548cds/law.c
+++ b/board/nxp/mpc8548cds/law.c
diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/nxp/mpc8548cds/mpc8548cds.c
index 7810010fd04..7810010fd04 100644
--- a/board/freescale/mpc8548cds/mpc8548cds.c
+++ b/board/nxp/mpc8548cds/mpc8548cds.c
diff --git a/board/freescale/mpc8548cds/tlb.c b/board/nxp/mpc8548cds/tlb.c
index 0b2afa8054d..0b2afa8054d 100644
--- a/board/freescale/mpc8548cds/tlb.c
+++ b/board/nxp/mpc8548cds/tlb.c
diff --git a/board/freescale/mx23evk/Kconfig b/board/nxp/mx23evk/Kconfig
index 51a8f9f773c..9f57590386b 100644
--- a/board/freescale/mx23evk/Kconfig
+++ b/board/nxp/mx23evk/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "mx23evk"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_SOC
 	default "mxs"
diff --git a/board/freescale/mx23evk/MAINTAINERS b/board/nxp/mx23evk/MAINTAINERS
index 122b70cd719..5ac8c3e8a86 100644
--- a/board/freescale/mx23evk/MAINTAINERS
+++ b/board/nxp/mx23evk/MAINTAINERS
@@ -2,7 +2,7 @@ MX23EVK BOARD
 M:	Fabio Estevam <festevam@gmail.com>
 M:	Otavio Salvador <otavio@ossystems.com.br>
 S:	Maintained
-F:	board/freescale/mx23evk/
+F:	board/nxp/mx23evk/
 F:	arch/arm/dts/imx23-evk.dts
 F:	include/configs/mx23evk.h
 F:	configs/mx23evk_defconfig
diff --git a/board/freescale/mx23evk/Makefile b/board/nxp/mx23evk/Makefile
index 5cc99ab1836..5cc99ab1836 100644
--- a/board/freescale/mx23evk/Makefile
+++ b/board/nxp/mx23evk/Makefile
diff --git a/board/freescale/mx23evk/mx23evk.c b/board/nxp/mx23evk/mx23evk.c
index fbc8fbdbf59..fbc8fbdbf59 100644
--- a/board/freescale/mx23evk/mx23evk.c
+++ b/board/nxp/mx23evk/mx23evk.c
diff --git a/board/freescale/mx23evk/spl_boot.c b/board/nxp/mx23evk/spl_boot.c
index a4c39a35221..a4c39a35221 100644
--- a/board/freescale/mx23evk/spl_boot.c
+++ b/board/nxp/mx23evk/spl_boot.c
diff --git a/board/freescale/mx28evk/Kconfig b/board/nxp/mx28evk/Kconfig
index 39777bd70fa..1643196af86 100644
--- a/board/freescale/mx28evk/Kconfig
+++ b/board/nxp/mx28evk/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "mx28evk"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_SOC
 	default "mxs"
diff --git a/board/freescale/mx28evk/MAINTAINERS b/board/nxp/mx28evk/MAINTAINERS
index f20baa91c67..4e6441a8bf5 100644
--- a/board/freescale/mx28evk/MAINTAINERS
+++ b/board/nxp/mx28evk/MAINTAINERS
@@ -1,7 +1,7 @@
 MX28EVK BOARD
 M:	Fabio Estevam <festevam@gmail.com>
 S:	Maintained
-F:	board/freescale/mx28evk/
+F:	board/nxp/mx28evk/
 F:	arch/arm/dts/imx28-evk.dts
 F:	include/configs/mx28evk.h
 F:	configs/mx28evk_defconfig
diff --git a/board/freescale/mx28evk/Makefile b/board/nxp/mx28evk/Makefile
index 1fd2a439f7a..1fd2a439f7a 100644
--- a/board/freescale/mx28evk/Makefile
+++ b/board/nxp/mx28evk/Makefile
diff --git a/board/freescale/mx28evk/README b/board/nxp/mx28evk/README
index d32f0efb332..dfe83b7a7a7 100644
--- a/board/freescale/mx28evk/README
+++ b/board/nxp/mx28evk/README
@@ -8,7 +8,7 @@ Files of the MX28EVK port
 
 arch/arm/cpu/arm926ejs/mxs/	- The CPU support code for the Freescale i.MX28
 arch/arm/include/asm/arch-mxs/	- Header files for the Freescale i.MX28
-board/freescale/mx28evk/	- MX28EVK board specific files
+board/nxp/mx28evk/	- MX28EVK board specific files
 include/configs/mx28evk.h	- MX28EVK configuration file
 
 Jumper configuration
diff --git a/board/freescale/mx28evk/iomux.c b/board/nxp/mx28evk/iomux.c
index b84b045bd1f..b84b045bd1f 100644
--- a/board/freescale/mx28evk/iomux.c
+++ b/board/nxp/mx28evk/iomux.c
diff --git a/board/freescale/mx28evk/mx28evk.c b/board/nxp/mx28evk/mx28evk.c
index ada572912da..ada572912da 100644
--- a/board/freescale/mx28evk/mx28evk.c
+++ b/board/nxp/mx28evk/mx28evk.c
diff --git a/board/freescale/mx51evk/Kconfig b/board/nxp/mx51evk/Kconfig
index a26b539536e..58f22cf77b0 100644
--- a/board/freescale/mx51evk/Kconfig
+++ b/board/nxp/mx51evk/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "mx51evk"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_SOC
 	default "mx5"
@@ -13,6 +13,6 @@ config SYS_CONFIG_NAME
 	default "mx51evk"
 
 config IMX_CONFIG
-	default "board/freescale/mx51evk/imximage.cfg"
+	default "board/nxp/mx51evk/imximage.cfg"
 
 endif
diff --git a/board/freescale/mx51evk/MAINTAINERS b/board/nxp/mx51evk/MAINTAINERS
index 025a5f8b582..1b44fc419dd 100644
--- a/board/freescale/mx51evk/MAINTAINERS
+++ b/board/nxp/mx51evk/MAINTAINERS
@@ -1,6 +1,6 @@
 MX51EVK BOARD
 M:	Fabio Estevam <festevam@gmail.com>
 S:	Maintained
-F:	board/freescale/mx51evk/
+F:	board/nxp/mx51evk/
 F:	include/configs/mx51evk.h
 F:	configs/mx51evk_defconfig
diff --git a/board/freescale/mx51evk/Makefile b/board/nxp/mx51evk/Makefile
index 808e35015e8..808e35015e8 100644
--- a/board/freescale/mx51evk/Makefile
+++ b/board/nxp/mx51evk/Makefile
diff --git a/board/freescale/mx51evk/imximage.cfg b/board/nxp/mx51evk/imximage.cfg
index ff2ec4aa273..ff2ec4aa273 100644
--- a/board/freescale/mx51evk/imximage.cfg
+++ b/board/nxp/mx51evk/imximage.cfg
diff --git a/board/freescale/mx51evk/mx51evk.c b/board/nxp/mx51evk/mx51evk.c
index 69456842302..69456842302 100644
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/nxp/mx51evk/mx51evk.c
diff --git a/board/freescale/mx53loco/Kconfig b/board/nxp/mx53loco/Kconfig
index 5dcdcd9f725..e9f56cdc76a 100644
--- a/board/freescale/mx53loco/Kconfig
+++ b/board/nxp/mx53loco/Kconfig
@@ -7,7 +7,7 @@ config SYS_BOARD
 	default "mx53loco"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_SOC
 	default "mx5"
@@ -16,6 +16,6 @@ config SYS_CONFIG_NAME
 	default "mx53loco"
 
 config IMX_CONFIG
-	default "board/freescale/mx53loco/imximage.cfg"
+	default "board/nxp/mx53loco/imximage.cfg"
 
 endif
diff --git a/board/freescale/mx53loco/MAINTAINERS b/board/nxp/mx53loco/MAINTAINERS
index 6c237518773..dbc85045a1c 100644
--- a/board/freescale/mx53loco/MAINTAINERS
+++ b/board/nxp/mx53loco/MAINTAINERS
@@ -2,6 +2,6 @@ MX53LOCO BOARD
 M:	Fabio Estevam <festevam@gmail.com>
 M:	Jason Liu <jason.hui.liu@nxp.com>
 S:	Maintained
-F:	board/freescale/mx53loco/
+F:	board/nxp/mx53loco/
 F:	include/configs/mx53loco.h
 F:	configs/mx53loco_defconfig
diff --git a/board/freescale/mx53loco/Makefile b/board/nxp/mx53loco/Makefile
index 9befe426957..9befe426957 100644
--- a/board/freescale/mx53loco/Makefile
+++ b/board/nxp/mx53loco/Makefile
diff --git a/board/freescale/mx53loco/imximage.cfg b/board/nxp/mx53loco/imximage.cfg
index d12801d19f2..d12801d19f2 100644
--- a/board/freescale/mx53loco/imximage.cfg
+++ b/board/nxp/mx53loco/imximage.cfg
diff --git a/board/freescale/mx53loco/mx53loco.c b/board/nxp/mx53loco/mx53loco.c
index 2d8f5da9906..2d8f5da9906 100644
--- a/board/freescale/mx53loco/mx53loco.c
+++ b/board/nxp/mx53loco/mx53loco.c
diff --git a/board/freescale/mx6memcal/Kconfig b/board/nxp/mx6memcal/Kconfig
index 2d5c206ae45..a6c39d5e4d1 100644
--- a/board/freescale/mx6memcal/Kconfig
+++ b/board/nxp/mx6memcal/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "mx6memcal"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "mx6memcal"
diff --git a/board/freescale/mx6memcal/MAINTAINERS b/board/nxp/mx6memcal/MAINTAINERS
index 5da38f7109b..a5fbe62bb39 100644
--- a/board/freescale/mx6memcal/MAINTAINERS
+++ b/board/nxp/mx6memcal/MAINTAINERS
@@ -1,7 +1,7 @@
 MX6MEMCAL BOARD
 M:	Eric Nelson <eric@nelint.com>
 S:	Maintained
-F:	board/freescale/mx6memcal/
+F:	board/nxp/mx6memcal/
 F:	include/configs/mx6memcal.h
 F:	configs/mx6memcal_defconfig
 
diff --git a/board/freescale/mx6memcal/Makefile b/board/nxp/mx6memcal/Makefile
index b4088b9f2ec..b4088b9f2ec 100644
--- a/board/freescale/mx6memcal/Makefile
+++ b/board/nxp/mx6memcal/Makefile
diff --git a/board/freescale/mx6memcal/README b/board/nxp/mx6memcal/README
index 9fe2fe2d043..9fe2fe2d043 100644
--- a/board/freescale/mx6memcal/README
+++ b/board/nxp/mx6memcal/README
diff --git a/board/freescale/mx6memcal/mx6memcal.c b/board/nxp/mx6memcal/mx6memcal.c
index a58ab93f27d..a58ab93f27d 100644
--- a/board/freescale/mx6memcal/mx6memcal.c
+++ b/board/nxp/mx6memcal/mx6memcal.c
diff --git a/board/freescale/mx6memcal/spl.c b/board/nxp/mx6memcal/spl.c
index bc9c4259f07..bc9c4259f07 100644
--- a/board/freescale/mx6memcal/spl.c
+++ b/board/nxp/mx6memcal/spl.c
diff --git a/board/freescale/mx6sabreauto/Kconfig b/board/nxp/mx6sabreauto/Kconfig
index 5b4faf6d5fd..145ed6e2958 100644
--- a/board/freescale/mx6sabreauto/Kconfig
+++ b/board/nxp/mx6sabreauto/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "mx6sabreauto"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "mx6sabreauto"
diff --git a/board/freescale/mx6sabreauto/MAINTAINERS b/board/nxp/mx6sabreauto/MAINTAINERS
index 6179d672c39..4942e4d5bca 100644
--- a/board/freescale/mx6sabreauto/MAINTAINERS
+++ b/board/nxp/mx6sabreauto/MAINTAINERS
@@ -2,6 +2,6 @@ MX6SABREAUTO BOARD
 M:	Fabio Estevam <festevam@gmail.com>
 M:	Peng Fan <peng.fan@nxp.com>
 S:	Maintained
-F:	board/freescale/mx6sabreauto/
+F:	board/nxp/mx6sabreauto/
 F:	include/configs/mx6sabreauto.h
 F:	configs/mx6sabreauto_defconfig
diff --git a/board/freescale/mx6sabreauto/Makefile b/board/nxp/mx6sabreauto/Makefile
index 7ecdb6b4ad2..7ecdb6b4ad2 100644
--- a/board/freescale/mx6sabreauto/Makefile
+++ b/board/nxp/mx6sabreauto/Makefile
diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/nxp/mx6sabreauto/mx6sabreauto.c
index 8ca57e0b2ac..8ca57e0b2ac 100644
--- a/board/freescale/mx6sabreauto/mx6sabreauto.c
+++ b/board/nxp/mx6sabreauto/mx6sabreauto.c
diff --git a/board/freescale/mx6sabresd/Kconfig b/board/nxp/mx6sabresd/Kconfig
index e87dea0d7a2..f657401c37e 100644
--- a/board/freescale/mx6sabresd/Kconfig
+++ b/board/nxp/mx6sabresd/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "mx6sabresd"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "mx6sabresd"
diff --git a/board/freescale/mx6sabresd/MAINTAINERS b/board/nxp/mx6sabresd/MAINTAINERS
index 5e256ef163e..3839dee1a17 100644
--- a/board/freescale/mx6sabresd/MAINTAINERS
+++ b/board/nxp/mx6sabresd/MAINTAINERS
@@ -1,6 +1,6 @@
 MX6SABRESD BOARD
 M:	Fabio Estevam <festevam@gmail.com>
 S:	Maintained
-F:	board/freescale/mx6sabresd/
+F:	board/nxp/mx6sabresd/
 F:	include/configs/mx6sabresd.h
 F:	configs/mx6sabresd_defconfig
diff --git a/board/freescale/mx6sabresd/Makefile b/board/nxp/mx6sabresd/Makefile
index 92e1ff72a4f..92e1ff72a4f 100644
--- a/board/freescale/mx6sabresd/Makefile
+++ b/board/nxp/mx6sabresd/Makefile
diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/nxp/mx6sabresd/mx6sabresd.c
index dff3a9c33bf..dff3a9c33bf 100644
--- a/board/freescale/mx6sabresd/mx6sabresd.c
+++ b/board/nxp/mx6sabresd/mx6sabresd.c
diff --git a/board/freescale/mx6slevk/Kconfig b/board/nxp/mx6slevk/Kconfig
index e6bbb4194f4..862bc8396cd 100644
--- a/board/freescale/mx6slevk/Kconfig
+++ b/board/nxp/mx6slevk/Kconfig
@@ -4,12 +4,12 @@ config SYS_BOARD
 	default "mx6slevk"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "mx6slevk"
 
 config IMX_CONFIG
-	default "board/freescale/mx6slevk/imximage.cfg"
+	default "board/nxp/mx6slevk/imximage.cfg"
 
 endif
diff --git a/board/freescale/mx6slevk/MAINTAINERS b/board/nxp/mx6slevk/MAINTAINERS
index ae87fe472bc..4410358ea08 100644
--- a/board/freescale/mx6slevk/MAINTAINERS
+++ b/board/nxp/mx6slevk/MAINTAINERS
@@ -2,7 +2,7 @@ MX6SLEVK BOARD
 M:	Fabio Estevam <festevam@gmail.com>
 M:	Peng Fan <peng.fan@nxp.com>
 S:	Maintained
-F:	board/freescale/mx6slevk/
+F:	board/nxp/mx6slevk/
 F:	include/configs/mx6slevk.h
 F:	configs/mx6slevk_defconfig
 F:	configs/mx6slevk_spl_defconfig
diff --git a/board/freescale/mx6slevk/Makefile b/board/nxp/mx6slevk/Makefile
index 770f7aac6b9..770f7aac6b9 100644
--- a/board/freescale/mx6slevk/Makefile
+++ b/board/nxp/mx6slevk/Makefile
diff --git a/board/freescale/mx6slevk/imximage.cfg b/board/nxp/mx6slevk/imximage.cfg
index 64be101d6ec..64be101d6ec 100644
--- a/board/freescale/mx6slevk/imximage.cfg
+++ b/board/nxp/mx6slevk/imximage.cfg
diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/nxp/mx6slevk/mx6slevk.c
index fb145fa6aac..fb145fa6aac 100644
--- a/board/freescale/mx6slevk/mx6slevk.c
+++ b/board/nxp/mx6slevk/mx6slevk.c
diff --git a/board/freescale/mx6sllevk/Kconfig b/board/nxp/mx6sllevk/Kconfig
index d47f1fa9096..a2bfaca9c29 100644
--- a/board/freescale/mx6sllevk/Kconfig
+++ b/board/nxp/mx6sllevk/Kconfig
@@ -4,12 +4,12 @@ config SYS_BOARD
 	default "mx6sllevk"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "mx6sllevk"
 
 config IMX_CONFIG
-	default "board/freescale/mx6sllevk/imximage.cfg"
+	default "board/nxp/mx6sllevk/imximage.cfg"
 
 endif
diff --git a/board/freescale/mx6sllevk/MAINTAINERS b/board/nxp/mx6sllevk/MAINTAINERS
index b82273c0162..a11a5a6653e 100644
--- a/board/freescale/mx6sllevk/MAINTAINERS
+++ b/board/nxp/mx6sllevk/MAINTAINERS
@@ -1,7 +1,7 @@
 MX6SLLEVK BOARD
 M:	Peng Fan <peng.fan@nxp.com>
 S:	Maintained
-F:	board/freescale/mx6sllevk/
+F:	board/nxp/mx6sllevk/
 F:	include/configs/mx6sllevk.h
 F:	configs/mx6sllevk_defconfig
 F:	configs/mx6sllevk_plugin_defconfig
diff --git a/board/freescale/mx6sllevk/Makefile b/board/nxp/mx6sllevk/Makefile
index 8f724ccfc92..8f724ccfc92 100644
--- a/board/freescale/mx6sllevk/Makefile
+++ b/board/nxp/mx6sllevk/Makefile
diff --git a/board/freescale/mx6sllevk/imximage.cfg b/board/nxp/mx6sllevk/imximage.cfg
index 550be3f6c12..7bb91015688 100644
--- a/board/freescale/mx6sllevk/imximage.cfg
+++ b/board/nxp/mx6sllevk/imximage.cfg
@@ -23,7 +23,7 @@ BOOT_FROM	sd
 
 #ifdef CONFIG_USE_IMXIMG_PLUGIN
 /*PLUGIN    plugin-binary-file    IRAM_FREE_START_ADDR*/
-PLUGIN	board/freescale/mx6sllevk/plugin.bin 0x00907000
+PLUGIN	board/nxp/mx6sllevk/plugin.bin 0x00907000
 #else
 
 #ifdef CONFIG_IMX_HAB
diff --git a/board/freescale/mx6sllevk/mx6sllevk.c b/board/nxp/mx6sllevk/mx6sllevk.c
index 9e39e39ac90..9e39e39ac90 100644
--- a/board/freescale/mx6sllevk/mx6sllevk.c
+++ b/board/nxp/mx6sllevk/mx6sllevk.c
diff --git a/board/freescale/mx6sllevk/plugin.S b/board/nxp/mx6sllevk/plugin.S
index dcf5e14d48a..dcf5e14d48a 100644
--- a/board/freescale/mx6sllevk/plugin.S
+++ b/board/nxp/mx6sllevk/plugin.S
diff --git a/board/freescale/mx6sxsabreauto/Kconfig b/board/nxp/mx6sxsabreauto/Kconfig
index e6da7b38f91..6d1ae40adb7 100644
--- a/board/freescale/mx6sxsabreauto/Kconfig
+++ b/board/nxp/mx6sxsabreauto/Kconfig
@@ -4,12 +4,12 @@ config SYS_BOARD
 	default "mx6sxsabreauto"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "mx6sxsabreauto"
 
 config IMX_CONFIG
-	default "board/freescale/mx6sxsabreauto/imximage.cfg"
+	default "board/nxp/mx6sxsabreauto/imximage.cfg"
 
 endif
diff --git a/board/freescale/mx6sxsabreauto/MAINTAINERS b/board/nxp/mx6sxsabreauto/MAINTAINERS
index 8dc62e5e3e5..70036f8e3d6 100644
--- a/board/freescale/mx6sxsabreauto/MAINTAINERS
+++ b/board/nxp/mx6sxsabreauto/MAINTAINERS
@@ -1,6 +1,6 @@
 MX6SXSABREAUTO BOARD
 M:	Peng Fan <peng.fan@nxp.com>
 S:	Maintained
-F:	board/freescale/mx6sxsabreauto/
+F:	board/nxp/mx6sxsabreauto/
 F:	include/configs/mx6sxsabreauto.h
 F:	configs/mx6sxsabreauto_defconfig
diff --git a/board/freescale/mx6sxsabreauto/Makefile b/board/nxp/mx6sxsabreauto/Makefile
index 50f29a9dd02..50f29a9dd02 100644
--- a/board/freescale/mx6sxsabreauto/Makefile
+++ b/board/nxp/mx6sxsabreauto/Makefile
diff --git a/board/freescale/mx6sxsabreauto/imximage.cfg b/board/nxp/mx6sxsabreauto/imximage.cfg
index da703093aa6..da703093aa6 100644
--- a/board/freescale/mx6sxsabreauto/imximage.cfg
+++ b/board/nxp/mx6sxsabreauto/imximage.cfg
diff --git a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c b/board/nxp/mx6sxsabreauto/mx6sxsabreauto.c
index d80cfd4ab27..d80cfd4ab27 100644
--- a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
+++ b/board/nxp/mx6sxsabreauto/mx6sxsabreauto.c
diff --git a/board/freescale/mx6sxsabresd/Kconfig b/board/nxp/mx6sxsabresd/Kconfig
index 88ac7ee8050..90f4978d24c 100644
--- a/board/freescale/mx6sxsabresd/Kconfig
+++ b/board/nxp/mx6sxsabresd/Kconfig
@@ -4,12 +4,12 @@ config SYS_BOARD
 	default "mx6sxsabresd"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "mx6sxsabresd"
 
 config IMX_CONFIG
-	default "board/freescale/mx6sxsabresd/imximage.cfg"
+	default "board/nxp/mx6sxsabresd/imximage.cfg"
 
 endif
diff --git a/board/freescale/mx6sxsabresd/MAINTAINERS b/board/nxp/mx6sxsabresd/MAINTAINERS
index b3c8b56f1f1..1dd21fc3c69 100644
--- a/board/freescale/mx6sxsabresd/MAINTAINERS
+++ b/board/nxp/mx6sxsabresd/MAINTAINERS
@@ -1,6 +1,6 @@
 MX6SXSABRESD BOARD
 M:	Fabio Estevam <festevam@gmail.com>
 S:	Maintained
-F:	board/freescale/mx6sxsabresd/
+F:	board/nxp/mx6sxsabresd/
 F:	include/configs/mx6sxsabresd.h
 F:	configs/mx6sxsabresd_defconfig
diff --git a/board/freescale/mx6sxsabresd/Makefile b/board/nxp/mx6sxsabresd/Makefile
index 266bd4ac495..266bd4ac495 100644
--- a/board/freescale/mx6sxsabresd/Makefile
+++ b/board/nxp/mx6sxsabresd/Makefile
diff --git a/board/freescale/mx6sxsabresd/imximage.cfg b/board/nxp/mx6sxsabresd/imximage.cfg
index 313ab589505..313ab589505 100644
--- a/board/freescale/mx6sxsabresd/imximage.cfg
+++ b/board/nxp/mx6sxsabresd/imximage.cfg
diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/nxp/mx6sxsabresd/mx6sxsabresd.c
index e3353feec68..e3353feec68 100644
--- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
+++ b/board/nxp/mx6sxsabresd/mx6sxsabresd.c
diff --git a/board/freescale/mx6ul_14x14_evk/Kconfig b/board/nxp/mx6ul_14x14_evk/Kconfig
index 8210cd3cb88..03b5318d5da 100644
--- a/board/freescale/mx6ul_14x14_evk/Kconfig
+++ b/board/nxp/mx6ul_14x14_evk/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "mx6ul_14x14_evk"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "mx6ul_14x14_evk"
diff --git a/board/freescale/mx6ul_14x14_evk/MAINTAINERS b/board/nxp/mx6ul_14x14_evk/MAINTAINERS
index 7c7a196d22c..4aa5e8e4702 100644
--- a/board/freescale/mx6ul_14x14_evk/MAINTAINERS
+++ b/board/nxp/mx6ul_14x14_evk/MAINTAINERS
@@ -1,7 +1,7 @@
 MX6ULEVK BOARD
 M:	Peng Fan <peng.fan@nxp.com>
 S:	Maintained
-F:	board/freescale/mx6ul_14x14_evk/
+F:	board/nxp/mx6ul_14x14_evk/
 F:	include/configs/mx6ul_14x14_evk.h
 F:	configs/mx6ul_14x14_evk_defconfig
 F:	configs/mx6ul_9x9_evk_defconfig
diff --git a/board/freescale/mx6ul_14x14_evk/Makefile b/board/nxp/mx6ul_14x14_evk/Makefile
index 272ada720e1..272ada720e1 100644
--- a/board/freescale/mx6ul_14x14_evk/Makefile
+++ b/board/nxp/mx6ul_14x14_evk/Makefile
diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/nxp/mx6ul_14x14_evk/mx6ul_14x14_evk.c
index fbb5a12212d..fbb5a12212d 100644
--- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
+++ b/board/nxp/mx6ul_14x14_evk/mx6ul_14x14_evk.c
diff --git a/board/freescale/mx6ullevk/Kconfig b/board/nxp/mx6ullevk/Kconfig
index 49aa302553e..33b24577df5 100644
--- a/board/freescale/mx6ullevk/Kconfig
+++ b/board/nxp/mx6ullevk/Kconfig
@@ -4,12 +4,12 @@ config SYS_BOARD
 	default "mx6ullevk"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "mx6ullevk"
 
 config IMX_CONFIG
-	default "board/freescale/mx6ullevk/imximage.cfg"
+	default "board/nxp/mx6ullevk/imximage.cfg"
 
 endif
diff --git a/board/freescale/mx6ullevk/MAINTAINERS b/board/nxp/mx6ullevk/MAINTAINERS
index 3d1b2560363..c210c6f41e6 100644
--- a/board/freescale/mx6ullevk/MAINTAINERS
+++ b/board/nxp/mx6ullevk/MAINTAINERS
@@ -1,7 +1,7 @@
 MX6ULLEVK BOARD
 M:	Peng Fan <peng.fan@nxp.com>
 S:	Maintained
-F:	board/freescale/mx6ullevk/
+F:	board/nxp/mx6ullevk/
 F:	include/configs/mx6ullevk.h
 F:	configs/mx6ull_14x14_evk_defconfig
 F:	configs/mx6ull_14x14_evk_plugin_defconfig
diff --git a/board/freescale/mx6ullevk/Makefile b/board/nxp/mx6ullevk/Makefile
index 1ff03b5f1cd..1ff03b5f1cd 100644
--- a/board/freescale/mx6ullevk/Makefile
+++ b/board/nxp/mx6ullevk/Makefile
diff --git a/board/freescale/mx6ullevk/imximage.cfg b/board/nxp/mx6ullevk/imximage.cfg
index 0c6f444a7a3..f1d532bcc55 100644
--- a/board/freescale/mx6ullevk/imximage.cfg
+++ b/board/nxp/mx6ullevk/imximage.cfg
@@ -29,7 +29,7 @@ BOOT_FROM	sd
 
 #ifdef CONFIG_USE_IMXIMG_PLUGIN
 /*PLUGIN    plugin-binary-file    IRAM_FREE_START_ADDR*/
-PLUGIN	board/freescale/mx6ullevk/plugin.bin 0x00907000
+PLUGIN	board/nxp/mx6ullevk/plugin.bin 0x00907000
 #else
 
 #ifdef CONFIG_IMX_HAB
diff --git a/board/freescale/mx6ullevk/mx6ullevk.c b/board/nxp/mx6ullevk/mx6ullevk.c
index 189eddefea3..189eddefea3 100644
--- a/board/freescale/mx6ullevk/mx6ullevk.c
+++ b/board/nxp/mx6ullevk/mx6ullevk.c
diff --git a/board/freescale/mx6ullevk/plugin.S b/board/nxp/mx6ullevk/plugin.S
index 1f631ff5e3e..1f631ff5e3e 100644
--- a/board/freescale/mx6ullevk/plugin.S
+++ b/board/nxp/mx6ullevk/plugin.S
diff --git a/board/freescale/mx7dsabresd/Kconfig b/board/nxp/mx7dsabresd/Kconfig
index bf3ceafe2b4..dcebe4cdb62 100644
--- a/board/freescale/mx7dsabresd/Kconfig
+++ b/board/nxp/mx7dsabresd/Kconfig
@@ -4,12 +4,12 @@ config SYS_BOARD
 	default "mx7dsabresd"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "mx7dsabresd"
 
 config IMX_CONFIG
-	default "board/freescale/mx7dsabresd/imximage.cfg"
+	default "board/nxp/mx7dsabresd/imximage.cfg"
 
 endif
diff --git a/board/freescale/mx7dsabresd/MAINTAINERS b/board/nxp/mx7dsabresd/MAINTAINERS
index 721321c9cca..5dea074f940 100644
--- a/board/freescale/mx7dsabresd/MAINTAINERS
+++ b/board/nxp/mx7dsabresd/MAINTAINERS
@@ -2,7 +2,7 @@ MX7DSABRESD BOARD
 M:	Adrian Alonso <adrian.alonso@nxp.com>
 M:	Fabio Estevam <festevam@gmail.com>
 S:	Maintained
-F:	board/freescale/mx7dsabresd
+F:	board/nxp/mx7dsabresd
 F:	include/configs/mx7dsabresd.h
 F:	configs/mx7dsabresd_defconfig
 F:	configs/mx7dsabresd_qspi_defconfig
diff --git a/board/freescale/mx7dsabresd/Makefile b/board/nxp/mx7dsabresd/Makefile
index 852b3d87ad5..852b3d87ad5 100644
--- a/board/freescale/mx7dsabresd/Makefile
+++ b/board/nxp/mx7dsabresd/Makefile
diff --git a/board/freescale/mx7dsabresd/imximage.cfg b/board/nxp/mx7dsabresd/imximage.cfg
index 59e66fbda16..59e66fbda16 100644
--- a/board/freescale/mx7dsabresd/imximage.cfg
+++ b/board/nxp/mx7dsabresd/imximage.cfg
diff --git a/board/freescale/mx7dsabresd/mx7dsabresd.c b/board/nxp/mx7dsabresd/mx7dsabresd.c
index bef4f901ff7..bef4f901ff7 100644
--- a/board/freescale/mx7dsabresd/mx7dsabresd.c
+++ b/board/nxp/mx7dsabresd/mx7dsabresd.c
diff --git a/board/freescale/mx7ulp_evk/Kconfig b/board/nxp/mx7ulp_evk/Kconfig
index 591697041dd..a2b3ad0e5b8 100644
--- a/board/freescale/mx7ulp_evk/Kconfig
+++ b/board/nxp/mx7ulp_evk/Kconfig
@@ -4,12 +4,12 @@ config SYS_BOARD
 	default "mx7ulp_evk"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "mx7ulp_evk"
 
 config IMX_CONFIG
-	default "board/freescale/mx7ulp_evk/imximage.cfg"
+	default "board/nxp/mx7ulp_evk/imximage.cfg"
 
 endif
diff --git a/board/freescale/mx7ulp_evk/MAINTAINERS b/board/nxp/mx7ulp_evk/MAINTAINERS
index 1aa26445632..37944d43d50 100644
--- a/board/freescale/mx7ulp_evk/MAINTAINERS
+++ b/board/nxp/mx7ulp_evk/MAINTAINERS
@@ -1,7 +1,7 @@
 MX7ULPEVK BOARD
 M:	Peng Fan <peng.fan@nxp.com>
 S:	Maintained
-F:	board/freescale/mx7ulp_evk/
+F:	board/nxp/mx7ulp_evk/
 F:	include/configs/mx7ulp_evk.h
 F:	configs/mx7ulp_evk_defconfig
 F:	configs/mx7ulp_evk_plugin_defconfig
diff --git a/board/freescale/mx7ulp_evk/Makefile b/board/nxp/mx7ulp_evk/Makefile
index 9f33c61f03b..9f33c61f03b 100644
--- a/board/freescale/mx7ulp_evk/Makefile
+++ b/board/nxp/mx7ulp_evk/Makefile
diff --git a/board/freescale/mx7ulp_evk/imximage.cfg b/board/nxp/mx7ulp_evk/imximage.cfg
index 62fd79afd6c..116e71c279a 100644
--- a/board/freescale/mx7ulp_evk/imximage.cfg
+++ b/board/nxp/mx7ulp_evk/imximage.cfg
@@ -23,7 +23,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
diff --git a/board/freescale/mx7ulp_evk/mx7ulp_evk.c b/board/nxp/mx7ulp_evk/mx7ulp_evk.c
index af68e57854e..af68e57854e 100644
--- a/board/freescale/mx7ulp_evk/mx7ulp_evk.c
+++ b/board/nxp/mx7ulp_evk/mx7ulp_evk.c
diff --git a/board/freescale/mx7ulp_evk/plugin.S b/board/nxp/mx7ulp_evk/plugin.S
index 2cc93dbdd57..2cc93dbdd57 100644
--- a/board/freescale/mx7ulp_evk/plugin.S
+++ b/board/nxp/mx7ulp_evk/plugin.S
diff --git a/board/freescale/p1010rdb/Kconfig b/board/nxp/p1010rdb/Kconfig
index 159bcc4f54d..fa376fc058c 100644
--- a/board/freescale/p1010rdb/Kconfig
+++ b/board/nxp/p1010rdb/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "p1010rdb"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "P1010RDB"
diff --git a/board/freescale/p1010rdb/MAINTAINERS b/board/nxp/p1010rdb/MAINTAINERS
index 6e940dd8759..f7543942754 100644
--- a/board/freescale/p1010rdb/MAINTAINERS
+++ b/board/nxp/p1010rdb/MAINTAINERS
@@ -1,7 +1,7 @@
 P1010RDB BOARD
 M:	Qiang Zhao <qiang.zhao@nxp.com>
 S:	Maintained
-F:	board/freescale/p1010rdb/
+F:	board/nxp/p1010rdb/
 F:	include/configs/P1010RDB.h
 F:	configs/P1010RDB-PA_36BIT_NAND_defconfig
 F:	configs/P1010RDB-PA_36BIT_NOR_defconfig
diff --git a/board/freescale/p1010rdb/Makefile b/board/nxp/p1010rdb/Makefile
index df4e8001d38..df4e8001d38 100644
--- a/board/freescale/p1010rdb/Makefile
+++ b/board/nxp/p1010rdb/Makefile
diff --git a/board/freescale/p1010rdb/README.P1010RDB-PA b/board/nxp/p1010rdb/README.P1010RDB-PA
index 0cb950d845e..0cb950d845e 100644
--- a/board/freescale/p1010rdb/README.P1010RDB-PA
+++ b/board/nxp/p1010rdb/README.P1010RDB-PA
diff --git a/board/freescale/p1010rdb/README.P1010RDB-PB b/board/nxp/p1010rdb/README.P1010RDB-PB
index 4a3b389877f..4a3b389877f 100644
--- a/board/freescale/p1010rdb/README.P1010RDB-PB
+++ b/board/nxp/p1010rdb/README.P1010RDB-PB
diff --git a/board/freescale/p1010rdb/ddr.c b/board/nxp/p1010rdb/ddr.c
index 43a0936bc9a..43a0936bc9a 100644
--- a/board/freescale/p1010rdb/ddr.c
+++ b/board/nxp/p1010rdb/ddr.c
diff --git a/board/freescale/p1010rdb/law.c b/board/nxp/p1010rdb/law.c
index a7d80f28521..a7d80f28521 100644
--- a/board/freescale/p1010rdb/law.c
+++ b/board/nxp/p1010rdb/law.c
diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/nxp/p1010rdb/p1010rdb.c
index 9b4b6f34f46..9b4b6f34f46 100644
--- a/board/freescale/p1010rdb/p1010rdb.c
+++ b/board/nxp/p1010rdb/p1010rdb.c
diff --git a/board/freescale/p1010rdb/spl.c b/board/nxp/p1010rdb/spl.c
index fc26cef2cc8..fc26cef2cc8 100644
--- a/board/freescale/p1010rdb/spl.c
+++ b/board/nxp/p1010rdb/spl.c
diff --git a/board/freescale/p1010rdb/spl_minimal.c b/board/nxp/p1010rdb/spl_minimal.c
index 8cd79c6fb5f..8cd79c6fb5f 100644
--- a/board/freescale/p1010rdb/spl_minimal.c
+++ b/board/nxp/p1010rdb/spl_minimal.c
diff --git a/board/freescale/p1010rdb/tlb.c b/board/nxp/p1010rdb/tlb.c
index aa130ccf78b..aa130ccf78b 100644
--- a/board/freescale/p1010rdb/tlb.c
+++ b/board/nxp/p1010rdb/tlb.c
diff --git a/board/freescale/p1_p2_rdb_pc/Kconfig b/board/nxp/p1_p2_rdb_pc/Kconfig
index cd36150f637..2ab46d99434 100644
--- a/board/freescale/p1_p2_rdb_pc/Kconfig
+++ b/board/nxp/p1_p2_rdb_pc/Kconfig
@@ -6,7 +6,7 @@ config SYS_BOARD
 	default "p1_p2_rdb_pc"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "p1_p2_rdb_pc"
diff --git a/board/freescale/p1_p2_rdb_pc/MAINTAINERS b/board/nxp/p1_p2_rdb_pc/MAINTAINERS
index 0004d717d1d..1ce3501f379 100644
--- a/board/freescale/p1_p2_rdb_pc/MAINTAINERS
+++ b/board/nxp/p1_p2_rdb_pc/MAINTAINERS
@@ -1,7 +1,7 @@
 P1_P2_RDB_PC BOARD
 M:	Priyanka Jain <priyanka.jain@nxp.com>
 S:	Maintained
-F:	board/freescale/p1_p2_rdb_pc/
+F:	board/nxp/p1_p2_rdb_pc/
 F:	include/configs/p1_p2_rdb_pc.h
 F:	configs/P1020RDB-PC_defconfig
 F:	configs/P1020RDB-PC_36BIT_defconfig
diff --git a/board/freescale/p1_p2_rdb_pc/Makefile b/board/nxp/p1_p2_rdb_pc/Makefile
index 8c13813e3b0..8c13813e3b0 100644
--- a/board/freescale/p1_p2_rdb_pc/Makefile
+++ b/board/nxp/p1_p2_rdb_pc/Makefile
diff --git a/board/freescale/p1_p2_rdb_pc/README b/board/nxp/p1_p2_rdb_pc/README
index fd849bfc29a..fd849bfc29a 100644
--- a/board/freescale/p1_p2_rdb_pc/README
+++ b/board/nxp/p1_p2_rdb_pc/README
diff --git a/board/freescale/p1_p2_rdb_pc/ddr.c b/board/nxp/p1_p2_rdb_pc/ddr.c
index 8622a5a610a..8622a5a610a 100644
--- a/board/freescale/p1_p2_rdb_pc/ddr.c
+++ b/board/nxp/p1_p2_rdb_pc/ddr.c
diff --git a/board/freescale/p1_p2_rdb_pc/law.c b/board/nxp/p1_p2_rdb_pc/law.c
index 49594070b83..49594070b83 100644
--- a/board/freescale/p1_p2_rdb_pc/law.c
+++ b/board/nxp/p1_p2_rdb_pc/law.c
diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/nxp/p1_p2_rdb_pc/p1_p2_rdb_pc.c
index a19a98dd0d1..a19a98dd0d1 100644
--- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c
+++ b/board/nxp/p1_p2_rdb_pc/p1_p2_rdb_pc.c
diff --git a/board/freescale/p1_p2_rdb_pc/spl.c b/board/nxp/p1_p2_rdb_pc/spl.c
index b07f481fbf9..b07f481fbf9 100644
--- a/board/freescale/p1_p2_rdb_pc/spl.c
+++ b/board/nxp/p1_p2_rdb_pc/spl.c
diff --git a/board/freescale/p1_p2_rdb_pc/spl_minimal.c b/board/nxp/p1_p2_rdb_pc/spl_minimal.c
index 511bcf5506b..511bcf5506b 100644
--- a/board/freescale/p1_p2_rdb_pc/spl_minimal.c
+++ b/board/nxp/p1_p2_rdb_pc/spl_minimal.c
diff --git a/board/freescale/p1_p2_rdb_pc/tlb.c b/board/nxp/p1_p2_rdb_pc/tlb.c
index f27821418eb..f27821418eb 100644
--- a/board/freescale/p1_p2_rdb_pc/tlb.c
+++ b/board/nxp/p1_p2_rdb_pc/tlb.c
diff --git a/board/freescale/p2041rdb/Kconfig b/board/nxp/p2041rdb/Kconfig
index 78e11214a5b..47c93b6eb55 100644
--- a/board/freescale/p2041rdb/Kconfig
+++ b/board/nxp/p2041rdb/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "p2041rdb"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "P2041RDB"
diff --git a/board/freescale/p2041rdb/MAINTAINERS b/board/nxp/p2041rdb/MAINTAINERS
index 2121243e148..f0d5c1192ac 100644
--- a/board/freescale/p2041rdb/MAINTAINERS
+++ b/board/nxp/p2041rdb/MAINTAINERS
@@ -1,7 +1,7 @@
 P2041RDB BOARD
 M:	Priyanka Jain <priyanka.jain@nxp.com>
 S:	Maintained
-F:	board/freescale/p2041rdb/
+F:	board/nxp/p2041rdb/
 F:	include/configs/P2041RDB.h
 F:	configs/P2041RDB_defconfig
 F:	configs/P2041RDB_NAND_defconfig
diff --git a/board/freescale/p2041rdb/Makefile b/board/nxp/p2041rdb/Makefile
index ebd0982b5db..ebd0982b5db 100644
--- a/board/freescale/p2041rdb/Makefile
+++ b/board/nxp/p2041rdb/Makefile
diff --git a/board/freescale/p2041rdb/README b/board/nxp/p2041rdb/README
index ae770277372..ae770277372 100644
--- a/board/freescale/p2041rdb/README
+++ b/board/nxp/p2041rdb/README
diff --git a/board/freescale/p2041rdb/cpld.c b/board/nxp/p2041rdb/cpld.c
index 2bba377d4d4..2bba377d4d4 100644
--- a/board/freescale/p2041rdb/cpld.c
+++ b/board/nxp/p2041rdb/cpld.c
diff --git a/board/freescale/p2041rdb/cpld.h b/board/nxp/p2041rdb/cpld.h
index 8c90c1ccf32..8c90c1ccf32 100644
--- a/board/freescale/p2041rdb/cpld.h
+++ b/board/nxp/p2041rdb/cpld.h
diff --git a/board/freescale/p2041rdb/ddr.c b/board/nxp/p2041rdb/ddr.c
index b8b765a85ef..b8b765a85ef 100644
--- a/board/freescale/p2041rdb/ddr.c
+++ b/board/nxp/p2041rdb/ddr.c
diff --git a/board/freescale/p2041rdb/eth.c b/board/nxp/p2041rdb/eth.c
index 65850866777..65850866777 100644
--- a/board/freescale/p2041rdb/eth.c
+++ b/board/nxp/p2041rdb/eth.c
diff --git a/board/freescale/p2041rdb/p2041rdb.c b/board/nxp/p2041rdb/p2041rdb.c
index d5b71f78430..d5b71f78430 100644
--- a/board/freescale/p2041rdb/p2041rdb.c
+++ b/board/nxp/p2041rdb/p2041rdb.c
diff --git a/board/freescale/p2041rdb/pbi.cfg b/board/nxp/p2041rdb/pbi.cfg
index 75dfc321626..75dfc321626 100644
--- a/board/freescale/p2041rdb/pbi.cfg
+++ b/board/nxp/p2041rdb/pbi.cfg
diff --git a/board/freescale/p2041rdb/rcw_p2041rdb.cfg b/board/nxp/p2041rdb/rcw_p2041rdb.cfg
index 8df19dd3fe4..8df19dd3fe4 100644
--- a/board/freescale/p2041rdb/rcw_p2041rdb.cfg
+++ b/board/nxp/p2041rdb/rcw_p2041rdb.cfg
diff --git a/board/freescale/t102xrdb/Kconfig b/board/nxp/t102xrdb/Kconfig
index d538386d434..925a984677e 100644
--- a/board/freescale/t102xrdb/Kconfig
+++ b/board/nxp/t102xrdb/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "t102xrdb"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "T102xRDB"
diff --git a/board/freescale/t102xrdb/MAINTAINERS b/board/nxp/t102xrdb/MAINTAINERS
index df1f0bed939..030dc3f950e 100644
--- a/board/freescale/t102xrdb/MAINTAINERS
+++ b/board/nxp/t102xrdb/MAINTAINERS
@@ -1,7 +1,7 @@
 T102XRDB BOARD
 M:	Priyanka Jain <priyanka.jain@nxp.com>
 S:	Maintained
-F:	board/freescale/t102xrdb/
+F:	board/nxp/t102xrdb/
 F:	include/configs/T102xRDB.h
 F:	configs/T1024RDB_defconfig
 F:	configs/T1024RDB_NAND_defconfig
diff --git a/board/freescale/t102xrdb/Makefile b/board/nxp/t102xrdb/Makefile
index b0f27c47191..b0f27c47191 100644
--- a/board/freescale/t102xrdb/Makefile
+++ b/board/nxp/t102xrdb/Makefile
diff --git a/board/freescale/t102xrdb/README b/board/nxp/t102xrdb/README
index de170f52b4d..de170f52b4d 100644
--- a/board/freescale/t102xrdb/README
+++ b/board/nxp/t102xrdb/README
diff --git a/board/freescale/t102xrdb/cpld.c b/board/nxp/t102xrdb/cpld.c
index 00ea9d8f503..00ea9d8f503 100644
--- a/board/freescale/t102xrdb/cpld.c
+++ b/board/nxp/t102xrdb/cpld.c
diff --git a/board/freescale/t102xrdb/cpld.h b/board/nxp/t102xrdb/cpld.h
index b504c3fcc47..b504c3fcc47 100644
--- a/board/freescale/t102xrdb/cpld.h
+++ b/board/nxp/t102xrdb/cpld.h
diff --git a/board/freescale/t102xrdb/ddr.c b/board/nxp/t102xrdb/ddr.c
index 1a8a131cdcc..1a8a131cdcc 100644
--- a/board/freescale/t102xrdb/ddr.c
+++ b/board/nxp/t102xrdb/ddr.c
diff --git a/board/freescale/t102xrdb/eth_t102xrdb.c b/board/nxp/t102xrdb/eth_t102xrdb.c
index 7185a0abd52..7185a0abd52 100644
--- a/board/freescale/t102xrdb/eth_t102xrdb.c
+++ b/board/nxp/t102xrdb/eth_t102xrdb.c
diff --git a/board/freescale/t102xrdb/law.c b/board/nxp/t102xrdb/law.c
index 81caa961897..81caa961897 100644
--- a/board/freescale/t102xrdb/law.c
+++ b/board/nxp/t102xrdb/law.c
diff --git a/board/freescale/t102xrdb/spl.c b/board/nxp/t102xrdb/spl.c
index de6cdda194e..de6cdda194e 100644
--- a/board/freescale/t102xrdb/spl.c
+++ b/board/nxp/t102xrdb/spl.c
diff --git a/board/freescale/t102xrdb/t1023_nand_rcw.cfg b/board/nxp/t102xrdb/t1023_nand_rcw.cfg
index f8f72826b16..f8f72826b16 100644
--- a/board/freescale/t102xrdb/t1023_nand_rcw.cfg
+++ b/board/nxp/t102xrdb/t1023_nand_rcw.cfg
diff --git a/board/freescale/t102xrdb/t1023_sd_rcw.cfg b/board/nxp/t102xrdb/t1023_sd_rcw.cfg
index dbf8fba5535..dbf8fba5535 100644
--- a/board/freescale/t102xrdb/t1023_sd_rcw.cfg
+++ b/board/nxp/t102xrdb/t1023_sd_rcw.cfg
diff --git a/board/freescale/t102xrdb/t1023_spi_rcw.cfg b/board/nxp/t102xrdb/t1023_spi_rcw.cfg
index 5edcdb50ea9..5edcdb50ea9 100644
--- a/board/freescale/t102xrdb/t1023_spi_rcw.cfg
+++ b/board/nxp/t102xrdb/t1023_spi_rcw.cfg
diff --git a/board/freescale/t102xrdb/t1024_nand_rcw.cfg b/board/nxp/t102xrdb/t1024_nand_rcw.cfg
index cd6f906396e..cd6f906396e 100644
--- a/board/freescale/t102xrdb/t1024_nand_rcw.cfg
+++ b/board/nxp/t102xrdb/t1024_nand_rcw.cfg
diff --git a/board/freescale/t102xrdb/t1024_pbi.cfg b/board/nxp/t102xrdb/t1024_pbi.cfg
index 98efca25a29..98efca25a29 100644
--- a/board/freescale/t102xrdb/t1024_pbi.cfg
+++ b/board/nxp/t102xrdb/t1024_pbi.cfg
diff --git a/board/freescale/t102xrdb/t1024_sd_rcw.cfg b/board/nxp/t102xrdb/t1024_sd_rcw.cfg
index 05b3f377636..05b3f377636 100644
--- a/board/freescale/t102xrdb/t1024_sd_rcw.cfg
+++ b/board/nxp/t102xrdb/t1024_sd_rcw.cfg
diff --git a/board/freescale/t102xrdb/t1024_spi_rcw.cfg b/board/nxp/t102xrdb/t1024_spi_rcw.cfg
index 8b695b4ab7b..8b695b4ab7b 100644
--- a/board/freescale/t102xrdb/t1024_spi_rcw.cfg
+++ b/board/nxp/t102xrdb/t1024_spi_rcw.cfg
diff --git a/board/freescale/t102xrdb/t102xrdb.c b/board/nxp/t102xrdb/t102xrdb.c
index 0a29e27b42c..0a29e27b42c 100644
--- a/board/freescale/t102xrdb/t102xrdb.c
+++ b/board/nxp/t102xrdb/t102xrdb.c
diff --git a/board/freescale/t102xrdb/t102xrdb.h b/board/nxp/t102xrdb/t102xrdb.h
index 33df0f24df8..33df0f24df8 100644
--- a/board/freescale/t102xrdb/t102xrdb.h
+++ b/board/nxp/t102xrdb/t102xrdb.h
diff --git a/board/freescale/t102xrdb/tlb.c b/board/nxp/t102xrdb/tlb.c
index 8e99c2c7022..8e99c2c7022 100644
--- a/board/freescale/t102xrdb/tlb.c
+++ b/board/nxp/t102xrdb/tlb.c
diff --git a/board/freescale/t104xrdb/Kconfig b/board/nxp/t104xrdb/Kconfig
index e4814915e33..fb26b7c9256 100644
--- a/board/freescale/t104xrdb/Kconfig
+++ b/board/nxp/t104xrdb/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "t104xrdb"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "T104xRDB"
diff --git a/board/freescale/t104xrdb/MAINTAINERS b/board/nxp/t104xrdb/MAINTAINERS
index 55fdb600a16..5542530698d 100644
--- a/board/freescale/t104xrdb/MAINTAINERS
+++ b/board/nxp/t104xrdb/MAINTAINERS
@@ -1,7 +1,7 @@
 T104XRDB BOARD
 M:	Priyanka Jain <priyanka.jain@nxp.com>
 S:	Maintained
-F:	board/freescale/t104xrdb/
+F:	board/nxp/t104xrdb/
 F:	include/configs/T104xRDB.h
 F:	configs/T1040RDB_defconfig
 F:	configs/T1040RDB_NAND_defconfig
diff --git a/board/freescale/t104xrdb/Makefile b/board/nxp/t104xrdb/Makefile
index 9bca1a1fbcc..9bca1a1fbcc 100644
--- a/board/freescale/t104xrdb/Makefile
+++ b/board/nxp/t104xrdb/Makefile
diff --git a/board/freescale/t104xrdb/README b/board/nxp/t104xrdb/README
index f312e6a3e32..b852f72998d 100644
--- a/board/freescale/t104xrdb/README
+++ b/board/nxp/t104xrdb/README
@@ -339,7 +339,7 @@ For SD-boot
 1. Set RCW[192:195], PBI_SRC bits as 6 in RCW file (t1040d4_rcw.cfg type files)
 
 example:
- RCW file: board/freescale/t104xrdb/t1040d4_rcw.cfg
+ RCW file: board/nxp/t104xrdb/t1040d4_rcw.cfg
 
 Change
 66000002 40000002 ec027000 01000000
@@ -355,7 +355,7 @@ For SPI-boot
 1. Set RCW[192:195], PBI_SRC bits as 5 in RCW file (t1040d4_rcw.cfg type files)
 
 example:
- RCW file: board/freescale/t104xrdb/t1040d4_rcw.cfg
+ RCW file: board/nxp/t104xrdb/t1040d4_rcw.cfg
 
 Change
 66000002 40000002 ec027000 01000000
diff --git a/board/freescale/t104xrdb/cpld.c b/board/nxp/t104xrdb/cpld.c
index 038e40e2fae..038e40e2fae 100644
--- a/board/freescale/t104xrdb/cpld.c
+++ b/board/nxp/t104xrdb/cpld.c
diff --git a/board/freescale/t104xrdb/cpld.h b/board/nxp/t104xrdb/cpld.h
index 0384202fbcb..0384202fbcb 100644
--- a/board/freescale/t104xrdb/cpld.h
+++ b/board/nxp/t104xrdb/cpld.h
diff --git a/board/freescale/t104xrdb/ddr.c b/board/nxp/t104xrdb/ddr.c
index 6c066480b46..6c066480b46 100644
--- a/board/freescale/t104xrdb/ddr.c
+++ b/board/nxp/t104xrdb/ddr.c
diff --git a/board/freescale/t104xrdb/ddr.h b/board/nxp/t104xrdb/ddr.h
index f9d667f6174..f9d667f6174 100644
--- a/board/freescale/t104xrdb/ddr.h
+++ b/board/nxp/t104xrdb/ddr.h
diff --git a/board/freescale/t104xrdb/eth.c b/board/nxp/t104xrdb/eth.c
index c35ec368a45..c35ec368a45 100644
--- a/board/freescale/t104xrdb/eth.c
+++ b/board/nxp/t104xrdb/eth.c
diff --git a/board/freescale/t104xrdb/law.c b/board/nxp/t104xrdb/law.c
index d34641c2397..d34641c2397 100644
--- a/board/freescale/t104xrdb/law.c
+++ b/board/nxp/t104xrdb/law.c
diff --git a/board/freescale/t104xrdb/spl.c b/board/nxp/t104xrdb/spl.c
index e02a1f95d4c..e02a1f95d4c 100644
--- a/board/freescale/t104xrdb/spl.c
+++ b/board/nxp/t104xrdb/spl.c
diff --git a/board/freescale/t104xrdb/t1040_nand_rcw.cfg b/board/nxp/t104xrdb/t1040_nand_rcw.cfg
index 3300c184a1a..3300c184a1a 100644
--- a/board/freescale/t104xrdb/t1040_nand_rcw.cfg
+++ b/board/nxp/t104xrdb/t1040_nand_rcw.cfg
diff --git a/board/freescale/t104xrdb/t1040_sd_rcw.cfg b/board/nxp/t104xrdb/t1040_sd_rcw.cfg
index fd3e8c5bbf5..fd3e8c5bbf5 100644
--- a/board/freescale/t104xrdb/t1040_sd_rcw.cfg
+++ b/board/nxp/t104xrdb/t1040_sd_rcw.cfg
diff --git a/board/freescale/t104xrdb/t1040_spi_rcw.cfg b/board/nxp/t104xrdb/t1040_spi_rcw.cfg
index fccde5e01fe..fccde5e01fe 100644
--- a/board/freescale/t104xrdb/t1040_spi_rcw.cfg
+++ b/board/nxp/t104xrdb/t1040_spi_rcw.cfg
diff --git a/board/freescale/t104xrdb/t1040d4_nand_rcw.cfg b/board/nxp/t104xrdb/t1040d4_nand_rcw.cfg
index c1034b3dfa3..c1034b3dfa3 100644
--- a/board/freescale/t104xrdb/t1040d4_nand_rcw.cfg
+++ b/board/nxp/t104xrdb/t1040d4_nand_rcw.cfg
diff --git a/board/freescale/t104xrdb/t1040d4_sd_rcw.cfg b/board/nxp/t104xrdb/t1040d4_sd_rcw.cfg
index e6f7585bb02..e6f7585bb02 100644
--- a/board/freescale/t104xrdb/t1040d4_sd_rcw.cfg
+++ b/board/nxp/t104xrdb/t1040d4_sd_rcw.cfg
diff --git a/board/freescale/t104xrdb/t1040d4_spi_rcw.cfg b/board/nxp/t104xrdb/t1040d4_spi_rcw.cfg
index cde862dff5c..cde862dff5c 100644
--- a/board/freescale/t104xrdb/t1040d4_spi_rcw.cfg
+++ b/board/nxp/t104xrdb/t1040d4_spi_rcw.cfg
diff --git a/board/freescale/t104xrdb/t1042_nand_rcw.cfg b/board/nxp/t104xrdb/t1042_nand_rcw.cfg
index db4d52f397d..db4d52f397d 100644
--- a/board/freescale/t104xrdb/t1042_nand_rcw.cfg
+++ b/board/nxp/t104xrdb/t1042_nand_rcw.cfg
diff --git a/board/freescale/t104xrdb/t1042_pi_nand_rcw.cfg b/board/nxp/t104xrdb/t1042_pi_nand_rcw.cfg
index 57de89ad0e7..57de89ad0e7 100644
--- a/board/freescale/t104xrdb/t1042_pi_nand_rcw.cfg
+++ b/board/nxp/t104xrdb/t1042_pi_nand_rcw.cfg
diff --git a/board/freescale/t104xrdb/t1042_pi_sd_rcw.cfg b/board/nxp/t104xrdb/t1042_pi_sd_rcw.cfg
index bbce9a36930..bbce9a36930 100644
--- a/board/freescale/t104xrdb/t1042_pi_sd_rcw.cfg
+++ b/board/nxp/t104xrdb/t1042_pi_sd_rcw.cfg
diff --git a/board/freescale/t104xrdb/t1042_pi_spi_rcw.cfg b/board/nxp/t104xrdb/t1042_pi_spi_rcw.cfg
index b1d8b4c65af..b1d8b4c65af 100644
--- a/board/freescale/t104xrdb/t1042_pi_spi_rcw.cfg
+++ b/board/nxp/t104xrdb/t1042_pi_spi_rcw.cfg
diff --git a/board/freescale/t104xrdb/t1042_sd_rcw.cfg b/board/nxp/t104xrdb/t1042_sd_rcw.cfg
index d77bf189b22..d77bf189b22 100644
--- a/board/freescale/t104xrdb/t1042_sd_rcw.cfg
+++ b/board/nxp/t104xrdb/t1042_sd_rcw.cfg
diff --git a/board/freescale/t104xrdb/t1042_spi_rcw.cfg b/board/nxp/t104xrdb/t1042_spi_rcw.cfg
index e8a3ad12804..e8a3ad12804 100644
--- a/board/freescale/t104xrdb/t1042_spi_rcw.cfg
+++ b/board/nxp/t104xrdb/t1042_spi_rcw.cfg
diff --git a/board/freescale/t104xrdb/t1042d4_nand_rcw.cfg b/board/nxp/t104xrdb/t1042d4_nand_rcw.cfg
index 9e0ee2795f8..9e0ee2795f8 100644
--- a/board/freescale/t104xrdb/t1042d4_nand_rcw.cfg
+++ b/board/nxp/t104xrdb/t1042d4_nand_rcw.cfg
diff --git a/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg b/board/nxp/t104xrdb/t1042d4_sd_rcw.cfg
index 9d9046d6549..9d9046d6549 100644
--- a/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
+++ b/board/nxp/t104xrdb/t1042d4_sd_rcw.cfg
diff --git a/board/freescale/t104xrdb/t1042d4_spi_rcw.cfg b/board/nxp/t104xrdb/t1042d4_spi_rcw.cfg
index f1ec98932f8..f1ec98932f8 100644
--- a/board/freescale/t104xrdb/t1042d4_spi_rcw.cfg
+++ b/board/nxp/t104xrdb/t1042d4_spi_rcw.cfg
diff --git a/board/freescale/t104xrdb/t104x_pbi.cfg b/board/nxp/t104xrdb/t104x_pbi.cfg
index 51945b47489..51945b47489 100644
--- a/board/freescale/t104xrdb/t104x_pbi.cfg
+++ b/board/nxp/t104xrdb/t104x_pbi.cfg
diff --git a/board/freescale/t104xrdb/t104x_pbi_sb.cfg b/board/nxp/t104xrdb/t104x_pbi_sb.cfg
index 98dc8e4c240..98dc8e4c240 100644
--- a/board/freescale/t104xrdb/t104x_pbi_sb.cfg
+++ b/board/nxp/t104xrdb/t104x_pbi_sb.cfg
diff --git a/board/freescale/t104xrdb/t104xrdb.c b/board/nxp/t104xrdb/t104xrdb.c
index ef4dfef4965..ef4dfef4965 100644
--- a/board/freescale/t104xrdb/t104xrdb.c
+++ b/board/nxp/t104xrdb/t104xrdb.c
diff --git a/board/freescale/t104xrdb/t104xrdb.h b/board/nxp/t104xrdb/t104xrdb.h
index 678724c7e2b..678724c7e2b 100644
--- a/board/freescale/t104xrdb/t104xrdb.h
+++ b/board/nxp/t104xrdb/t104xrdb.h
diff --git a/board/freescale/t104xrdb/tlb.c b/board/nxp/t104xrdb/tlb.c
index 7b2183da8b0..7b2183da8b0 100644
--- a/board/freescale/t104xrdb/tlb.c
+++ b/board/nxp/t104xrdb/tlb.c
diff --git a/board/freescale/t208xqds/Kconfig b/board/nxp/t208xqds/Kconfig
index c419a59dbb6..a7d1e0a1e30 100644
--- a/board/freescale/t208xqds/Kconfig
+++ b/board/nxp/t208xqds/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "t208xqds"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "T208xQDS"
diff --git a/board/freescale/t208xqds/MAINTAINERS b/board/nxp/t208xqds/MAINTAINERS
index 790b009c516..56911e8fd15 100644
--- a/board/freescale/t208xqds/MAINTAINERS
+++ b/board/nxp/t208xqds/MAINTAINERS
@@ -1,7 +1,7 @@
 T208XQDS BOARD
 M:	Shengzhou Liu <Shengzhou.Liu@nxp.com>
 S:	Maintained
-F:	board/freescale/t208xqds/
+F:	board/nxp/t208xqds/
 F:	include/configs/T208xQDS.h
 F:	configs/T2080QDS_defconfig
 F:	configs/T2080QDS_NAND_defconfig
diff --git a/board/freescale/t208xqds/Makefile b/board/nxp/t208xqds/Makefile
index eb99d921b4a..eb99d921b4a 100644
--- a/board/freescale/t208xqds/Makefile
+++ b/board/nxp/t208xqds/Makefile
diff --git a/board/freescale/t208xqds/README b/board/nxp/t208xqds/README
index 0d80c6901fb..0d80c6901fb 100644
--- a/board/freescale/t208xqds/README
+++ b/board/nxp/t208xqds/README
diff --git a/board/freescale/t208xqds/ddr.c b/board/nxp/t208xqds/ddr.c
index 77c8ce0c870..77c8ce0c870 100644
--- a/board/freescale/t208xqds/ddr.c
+++ b/board/nxp/t208xqds/ddr.c
diff --git a/board/freescale/t208xqds/ddr.h b/board/nxp/t208xqds/ddr.h
index 9dd39813bf0..9dd39813bf0 100644
--- a/board/freescale/t208xqds/ddr.h
+++ b/board/nxp/t208xqds/ddr.h
diff --git a/board/freescale/t208xqds/eth_t208xqds.c b/board/nxp/t208xqds/eth_t208xqds.c
index b55078c8fe1..b55078c8fe1 100644
--- a/board/freescale/t208xqds/eth_t208xqds.c
+++ b/board/nxp/t208xqds/eth_t208xqds.c
diff --git a/board/freescale/t208xqds/law.c b/board/nxp/t208xqds/law.c
index 287f4650e05..287f4650e05 100644
--- a/board/freescale/t208xqds/law.c
+++ b/board/nxp/t208xqds/law.c
diff --git a/board/freescale/t208xqds/spl.c b/board/nxp/t208xqds/spl.c
index 44ad4e68d9f..44ad4e68d9f 100644
--- a/board/freescale/t208xqds/spl.c
+++ b/board/nxp/t208xqds/spl.c
diff --git a/board/freescale/t208xqds/t2080_nand_rcw.cfg b/board/nxp/t208xqds/t2080_nand_rcw.cfg
index 52a1652a222..52a1652a222 100644
--- a/board/freescale/t208xqds/t2080_nand_rcw.cfg
+++ b/board/nxp/t208xqds/t2080_nand_rcw.cfg
diff --git a/board/freescale/t208xqds/t2080_sd_rcw.cfg b/board/nxp/t208xqds/t2080_sd_rcw.cfg
index 73f53faa259..73f53faa259 100644
--- a/board/freescale/t208xqds/t2080_sd_rcw.cfg
+++ b/board/nxp/t208xqds/t2080_sd_rcw.cfg
diff --git a/board/freescale/t208xqds/t2080_spi_rcw.cfg b/board/nxp/t208xqds/t2080_spi_rcw.cfg
index 8474c8ef7ce..8474c8ef7ce 100644
--- a/board/freescale/t208xqds/t2080_spi_rcw.cfg
+++ b/board/nxp/t208xqds/t2080_spi_rcw.cfg
diff --git a/board/freescale/t208xqds/t2081_nand_rcw.cfg b/board/nxp/t208xqds/t2081_nand_rcw.cfg
index a2d5ecf4adc..a2d5ecf4adc 100644
--- a/board/freescale/t208xqds/t2081_nand_rcw.cfg
+++ b/board/nxp/t208xqds/t2081_nand_rcw.cfg
diff --git a/board/freescale/t208xqds/t2081_sd_rcw.cfg b/board/nxp/t208xqds/t2081_sd_rcw.cfg
index daced6796ba..daced6796ba 100644
--- a/board/freescale/t208xqds/t2081_sd_rcw.cfg
+++ b/board/nxp/t208xqds/t2081_sd_rcw.cfg
diff --git a/board/freescale/t208xqds/t2081_spi_rcw.cfg b/board/nxp/t208xqds/t2081_spi_rcw.cfg
index 79ba1f1ab77..79ba1f1ab77 100644
--- a/board/freescale/t208xqds/t2081_spi_rcw.cfg
+++ b/board/nxp/t208xqds/t2081_spi_rcw.cfg
diff --git a/board/freescale/t208xqds/t208x_pbi.cfg b/board/nxp/t208xqds/t208x_pbi.cfg
index 43be8a864e3..43be8a864e3 100644
--- a/board/freescale/t208xqds/t208x_pbi.cfg
+++ b/board/nxp/t208xqds/t208x_pbi.cfg
diff --git a/board/freescale/t208xqds/t208xqds.c b/board/nxp/t208xqds/t208xqds.c
index 5e71da0e163..5e71da0e163 100644
--- a/board/freescale/t208xqds/t208xqds.c
+++ b/board/nxp/t208xqds/t208xqds.c
diff --git a/board/freescale/t208xqds/t208xqds.h b/board/nxp/t208xqds/t208xqds.h
index 50ebb6f6f98..50ebb6f6f98 100644
--- a/board/freescale/t208xqds/t208xqds.h
+++ b/board/nxp/t208xqds/t208xqds.h
diff --git a/board/freescale/t208xqds/t208xqds_qixis.h b/board/nxp/t208xqds/t208xqds_qixis.h
index 66651422031..66651422031 100644
--- a/board/freescale/t208xqds/t208xqds_qixis.h
+++ b/board/nxp/t208xqds/t208xqds_qixis.h
diff --git a/board/freescale/t208xqds/tlb.c b/board/nxp/t208xqds/tlb.c
index 08c140afc68..08c140afc68 100644
--- a/board/freescale/t208xqds/tlb.c
+++ b/board/nxp/t208xqds/tlb.c
diff --git a/board/freescale/t208xrdb/Kconfig b/board/nxp/t208xrdb/Kconfig
index 35d884e6ccb..cf3c73f9100 100644
--- a/board/freescale/t208xrdb/Kconfig
+++ b/board/nxp/t208xrdb/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "t208xrdb"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "T208xRDB"
diff --git a/board/freescale/t208xrdb/MAINTAINERS b/board/nxp/t208xrdb/MAINTAINERS
index 5be7a25c03b..db58c79c254 100644
--- a/board/freescale/t208xrdb/MAINTAINERS
+++ b/board/nxp/t208xrdb/MAINTAINERS
@@ -1,7 +1,7 @@
 T208XRDB BOARD
 M:	Shengzhou Liu <Shengzhou.Liu@nxp.com>
 S:	Maintained
-F:	board/freescale/t208xrdb/
+F:	board/nxp/t208xrdb/
 F:	include/configs/T208xRDB.h
 F:	configs/T2080RDB_defconfig
 F:	configs/T2080RDB_NAND_defconfig
diff --git a/board/freescale/t208xrdb/Makefile b/board/nxp/t208xrdb/Makefile
index e5ef250c8b2..e5ef250c8b2 100644
--- a/board/freescale/t208xrdb/Makefile
+++ b/board/nxp/t208xrdb/Makefile
diff --git a/board/freescale/t208xrdb/README b/board/nxp/t208xrdb/README
index 533054bfe19..533054bfe19 100644
--- a/board/freescale/t208xrdb/README
+++ b/board/nxp/t208xrdb/README
diff --git a/board/freescale/t208xrdb/cpld.c b/board/nxp/t208xrdb/cpld.c
index 838d88d977e..838d88d977e 100644
--- a/board/freescale/t208xrdb/cpld.c
+++ b/board/nxp/t208xrdb/cpld.c
diff --git a/board/freescale/t208xrdb/cpld.h b/board/nxp/t208xrdb/cpld.h
index 3139c2b85fd..3139c2b85fd 100644
--- a/board/freescale/t208xrdb/cpld.h
+++ b/board/nxp/t208xrdb/cpld.h
diff --git a/board/freescale/t208xrdb/ddr.c b/board/nxp/t208xrdb/ddr.c
index cc9586eaa14..cc9586eaa14 100644
--- a/board/freescale/t208xrdb/ddr.c
+++ b/board/nxp/t208xrdb/ddr.c
diff --git a/board/freescale/t208xrdb/ddr.h b/board/nxp/t208xrdb/ddr.h
index c00f1781667..c00f1781667 100644
--- a/board/freescale/t208xrdb/ddr.h
+++ b/board/nxp/t208xrdb/ddr.h
diff --git a/board/freescale/t208xrdb/eth_t208xrdb.c b/board/nxp/t208xrdb/eth_t208xrdb.c
index 5223eccb280..5223eccb280 100644
--- a/board/freescale/t208xrdb/eth_t208xrdb.c
+++ b/board/nxp/t208xrdb/eth_t208xrdb.c
diff --git a/board/freescale/t208xrdb/law.c b/board/nxp/t208xrdb/law.c
index e1f570a8935..e1f570a8935 100644
--- a/board/freescale/t208xrdb/law.c
+++ b/board/nxp/t208xrdb/law.c
diff --git a/board/freescale/t208xrdb/spl.c b/board/nxp/t208xrdb/spl.c
index df3b9c6fe40..df3b9c6fe40 100644
--- a/board/freescale/t208xrdb/spl.c
+++ b/board/nxp/t208xrdb/spl.c
diff --git a/board/freescale/t208xrdb/t2080_nand_rcw.cfg b/board/nxp/t208xrdb/t2080_nand_rcw.cfg
index 8096ff9f372..8096ff9f372 100644
--- a/board/freescale/t208xrdb/t2080_nand_rcw.cfg
+++ b/board/nxp/t208xrdb/t2080_nand_rcw.cfg
diff --git a/board/freescale/t208xrdb/t2080_pbi.cfg b/board/nxp/t208xrdb/t2080_pbi.cfg
index 43be8a864e3..43be8a864e3 100644
--- a/board/freescale/t208xrdb/t2080_pbi.cfg
+++ b/board/nxp/t208xrdb/t2080_pbi.cfg
diff --git a/board/freescale/t208xrdb/t2080_sd_rcw.cfg b/board/nxp/t208xrdb/t2080_sd_rcw.cfg
index 6309b1d2200..6309b1d2200 100644
--- a/board/freescale/t208xrdb/t2080_sd_rcw.cfg
+++ b/board/nxp/t208xrdb/t2080_sd_rcw.cfg
diff --git a/board/freescale/t208xrdb/t2080_spi_rcw.cfg b/board/nxp/t208xrdb/t2080_spi_rcw.cfg
index f1674958870..f1674958870 100644
--- a/board/freescale/t208xrdb/t2080_spi_rcw.cfg
+++ b/board/nxp/t208xrdb/t2080_spi_rcw.cfg
diff --git a/board/freescale/t208xrdb/t208xrdb.c b/board/nxp/t208xrdb/t208xrdb.c
index d93edf007ad..d93edf007ad 100644
--- a/board/freescale/t208xrdb/t208xrdb.c
+++ b/board/nxp/t208xrdb/t208xrdb.c
diff --git a/board/freescale/t208xrdb/t208xrdb.h b/board/nxp/t208xrdb/t208xrdb.h
index 26998898e82..26998898e82 100644
--- a/board/freescale/t208xrdb/t208xrdb.h
+++ b/board/nxp/t208xrdb/t208xrdb.h
diff --git a/board/freescale/t208xrdb/tlb.c b/board/nxp/t208xrdb/tlb.c
index a3f283548f3..a3f283548f3 100644
--- a/board/freescale/t208xrdb/tlb.c
+++ b/board/nxp/t208xrdb/tlb.c
diff --git a/board/freescale/t4rdb/Kconfig b/board/nxp/t4rdb/Kconfig
index d93e4532ac4..1a6874ab562 100644
--- a/board/freescale/t4rdb/Kconfig
+++ b/board/nxp/t4rdb/Kconfig
@@ -4,7 +4,7 @@ config SYS_BOARD
 	default "t4rdb"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "T4240RDB"
diff --git a/board/freescale/t4rdb/MAINTAINERS b/board/nxp/t4rdb/MAINTAINERS
index 844a15259c0..6d328595d39 100644
--- a/board/freescale/t4rdb/MAINTAINERS
+++ b/board/nxp/t4rdb/MAINTAINERS
@@ -1,7 +1,7 @@
 T4RDB BOARD
 M:	Priyanka Jain <priyanka.jain@nxp.com>
 S:	Maintained
-F:	board/freescale/t4rdb/
+F:	board/nxp/t4rdb/
 F:	include/configs/T4240RDB.h
 F:	configs/T4240RDB_defconfig
 F:	configs/T4240RDB_SDCARD_defconfig
diff --git a/board/freescale/t4rdb/Makefile b/board/nxp/t4rdb/Makefile
index 8d94faaba1c..8d94faaba1c 100644
--- a/board/freescale/t4rdb/Makefile
+++ b/board/nxp/t4rdb/Makefile
diff --git a/board/freescale/t4rdb/cpld.c b/board/nxp/t4rdb/cpld.c
index 258581eee96..258581eee96 100644
--- a/board/freescale/t4rdb/cpld.c
+++ b/board/nxp/t4rdb/cpld.c
diff --git a/board/freescale/t4rdb/cpld.h b/board/nxp/t4rdb/cpld.h
index fcac9244c8a..fcac9244c8a 100644
--- a/board/freescale/t4rdb/cpld.h
+++ b/board/nxp/t4rdb/cpld.h
diff --git a/board/freescale/t4rdb/ddr.c b/board/nxp/t4rdb/ddr.c
index 1ce70962264..1ce70962264 100644
--- a/board/freescale/t4rdb/ddr.c
+++ b/board/nxp/t4rdb/ddr.c
diff --git a/board/freescale/t4rdb/ddr.h b/board/nxp/t4rdb/ddr.h
index 241b13475da..241b13475da 100644
--- a/board/freescale/t4rdb/ddr.h
+++ b/board/nxp/t4rdb/ddr.h
diff --git a/board/freescale/t4rdb/eth.c b/board/nxp/t4rdb/eth.c
index e7646365d7d..e7646365d7d 100644
--- a/board/freescale/t4rdb/eth.c
+++ b/board/nxp/t4rdb/eth.c
diff --git a/board/freescale/t4rdb/law.c b/board/nxp/t4rdb/law.c
index c43ac0f30d7..c43ac0f30d7 100644
--- a/board/freescale/t4rdb/law.c
+++ b/board/nxp/t4rdb/law.c
diff --git a/board/freescale/t4rdb/spl.c b/board/nxp/t4rdb/spl.c
index 9d2472dec25..9d2472dec25 100644
--- a/board/freescale/t4rdb/spl.c
+++ b/board/nxp/t4rdb/spl.c
diff --git a/board/freescale/t4rdb/t4240rdb.c b/board/nxp/t4rdb/t4240rdb.c
index 5cacfd27380..5cacfd27380 100644
--- a/board/freescale/t4rdb/t4240rdb.c
+++ b/board/nxp/t4rdb/t4240rdb.c
diff --git a/board/freescale/t4rdb/t4_pbi.cfg b/board/nxp/t4rdb/t4_pbi.cfg
index 0b326fa1635..0b326fa1635 100644
--- a/board/freescale/t4rdb/t4_pbi.cfg
+++ b/board/nxp/t4rdb/t4_pbi.cfg
diff --git a/board/freescale/t4rdb/t4_sd_rcw.cfg b/board/nxp/t4rdb/t4_sd_rcw.cfg
index cc2bff68269..cc2bff68269 100644
--- a/board/freescale/t4rdb/t4_sd_rcw.cfg
+++ b/board/nxp/t4rdb/t4_sd_rcw.cfg
diff --git a/board/freescale/t4rdb/t4rdb.h b/board/nxp/t4rdb/t4rdb.h
index bb3ce216d7d..bb3ce216d7d 100644
--- a/board/freescale/t4rdb/t4rdb.h
+++ b/board/nxp/t4rdb/t4rdb.h
diff --git a/board/freescale/t4rdb/tlb.c b/board/nxp/t4rdb/tlb.c
index 7c58c14f3b6..7c58c14f3b6 100644
--- a/board/freescale/t4rdb/tlb.c
+++ b/board/nxp/t4rdb/tlb.c
diff --git a/board/freescale/vf610twr/Kconfig b/board/nxp/vf610twr/Kconfig
index 208c7ae2f42..4d9433cd929 100644
--- a/board/freescale/vf610twr/Kconfig
+++ b/board/nxp/vf610twr/Kconfig
@@ -4,12 +4,12 @@ config SYS_BOARD
 	default "vf610twr"
 
 config SYS_VENDOR
-	default "freescale"
+	default "nxp"
 
 config SYS_CONFIG_NAME
 	default "vf610twr"
 
 config IMX_CONFIG
-	default "board/freescale/vf610twr/imximage.cfg"
+	default "board/nxp/vf610twr/imximage.cfg"
 
 endif
diff --git a/board/freescale/vf610twr/MAINTAINERS b/board/nxp/vf610twr/MAINTAINERS
index b2eef8e24be..b8d4cb9a784 100644
--- a/board/freescale/vf610twr/MAINTAINERS
+++ b/board/nxp/vf610twr/MAINTAINERS
@@ -1,7 +1,7 @@
 VF610TWR BOARD
 M:	Alison Wang <alison.wang@nxp.com>
 S:	Maintained
-F:	board/freescale/vf610twr/
+F:	board/nxp/vf610twr/
 F:	include/configs/vf610twr.h
 F:	configs/vf610twr_defconfig
 F:	configs/vf610twr_nand_defconfig
diff --git a/board/freescale/vf610twr/Makefile b/board/nxp/vf610twr/Makefile
index 43934e8b2ae..43934e8b2ae 100644
--- a/board/freescale/vf610twr/Makefile
+++ b/board/nxp/vf610twr/Makefile
diff --git a/board/freescale/vf610twr/imximage.cfg b/board/nxp/vf610twr/imximage.cfg
index e2fa1a582d2..e2fa1a582d2 100644
--- a/board/freescale/vf610twr/imximage.cfg
+++ b/board/nxp/vf610twr/imximage.cfg
diff --git a/board/freescale/vf610twr/vf610twr.c b/board/nxp/vf610twr/vf610twr.c
index bfb49ad8604..bfb49ad8604 100644
--- a/board/freescale/vf610twr/vf610twr.c
+++ b/board/nxp/vf610twr/vf610twr.c
diff --git a/board/phytec/imx8mp-libra-fpsc/MAINTAINERS b/board/phytec/imx8mp-libra-fpsc/MAINTAINERS
index 1fd99888a2e..c2d24b7c386 100644
--- a/board/phytec/imx8mp-libra-fpsc/MAINTAINERS
+++ b/board/phytec/imx8mp-libra-fpsc/MAINTAINERS
@@ -1,5 +1,6 @@
 Libra-i.MX 8M Plus
 M:	Teresa Remmet <t.remmet@phytec.de>
+L:	upstream@lists.phytec.de
 W:	https://www.phytec.eu/en/produkte/system-on-modules/phycore-imx-8m-plus-fpsc/
 S:	Maintained
 F:	arch/arm/dts/imx8mp-libra-rdk-fpsc-u-boot.dtsi
diff --git a/board/phytec/phycore_am62ax/MAINTAINERS b/board/phytec/phycore_am62ax/MAINTAINERS
index feb1e0b39dc..ded4a88d199 100644
--- a/board/phytec/phycore_am62ax/MAINTAINERS
+++ b/board/phytec/phycore_am62ax/MAINTAINERS
@@ -1,6 +1,7 @@
 phyCORE-AM62ax
 M:	Garrett Giordano <ggiordano@phytec.com>
 M:	Wadim Egorov <w.egorov@phytec.de>
+L:	upstream@lists.phytec.de
 W:	https://www.phytec.com/product/phycore-am62a
 S:	Maintained
 F:	arch/arm/dts/k3-am62a-phycore-som-binman.dtsi
diff --git a/board/phytec/phycore_am62x/MAINTAINERS b/board/phytec/phycore_am62x/MAINTAINERS
index 274dc0cbb81..7274e6aa376 100644
--- a/board/phytec/phycore_am62x/MAINTAINERS
+++ b/board/phytec/phycore_am62x/MAINTAINERS
@@ -1,5 +1,6 @@
 phyCORE-AM62x
 M:	Wadim Egorov <w.egorov@phytec.de>
+L:	upstream@lists.phytec.de
 W:	https://www.phytec.com/product/phycore-am62x
 S:	Maintained
 F:	arch/arm/dts/k3-am62-phycore-som-ddr4-2gb.dtsi
diff --git a/board/phytec/phycore_am64x/MAINTAINERS b/board/phytec/phycore_am64x/MAINTAINERS
index f5294db9916..0ba503934c8 100644
--- a/board/phytec/phycore_am64x/MAINTAINERS
+++ b/board/phytec/phycore_am64x/MAINTAINERS
@@ -1,5 +1,6 @@
 phyCORE-AM64x
 M:	Wadim Egorov <w.egorov@phytec.de>
+L:	upstream@lists.phytec.de
 W:	https://www.phytec.com/product/phycore-am64x
 S:	Maintained
 F:	arch/arm/dts/k3-am64-phycore-som-ddr4-2gb.dtsi
diff --git a/board/phytec/phycore_imx8mm/MAINTAINERS b/board/phytec/phycore_imx8mm/MAINTAINERS
index 58c5e2d0af9..5cada15ac4b 100644
--- a/board/phytec/phycore_imx8mm/MAINTAINERS
+++ b/board/phytec/phycore_imx8mm/MAINTAINERS
@@ -1,5 +1,6 @@
 phyCORE-i.MX8M Mini
 M:      Teresa Remmet <t.remmet@phytec.de>
+L:      upstream@lists.phytec.de
 W:      https://www.phytec.eu/product-eu/system-on-modules/phycore-imx-8m-mini-nano/
 S:      Maintained
 F:      arch/arm/dts/imx8mm-phyboard-polis-rdk-u-boot.dtsi
diff --git a/board/phytec/phycore_imx8mp/MAINTAINERS b/board/phytec/phycore_imx8mp/MAINTAINERS
index 645476ae30a..9343e3b550d 100644
--- a/board/phytec/phycore_imx8mp/MAINTAINERS
+++ b/board/phytec/phycore_imx8mp/MAINTAINERS
@@ -1,5 +1,6 @@
 phyCORE-i.MX8M Plus
 M:      Teresa Remmet <t.remmet@phytec.de>
+L:      upstream@lists.phytec.de
 W:      https://www.phytec.eu/product-eu/system-on-modules/phycore-imx-8m-plus/
 S:      Maintained
 F:      arch/arm/dts/imx8mp-phyboard-pollux-rdk-u-boot.dtsi
diff --git a/board/phytec/phycore_imx93/MAINTAINERS b/board/phytec/phycore_imx93/MAINTAINERS
index 7393061707d..0b087bf1ef2 100644
--- a/board/phytec/phycore_imx93/MAINTAINERS
+++ b/board/phytec/phycore_imx93/MAINTAINERS
@@ -1,6 +1,7 @@
 phyCORE-i.MX93
 M:      Mathieu Othacehe <m.othacehe@gmail.com>
 R:      Christoph Stoidner <c.stoidner@phytec.de>
+L:      upstream@lists.phytec.de
 W:      https://www.phytec.eu/en/produkte/system-on-modules/phycore-imx-91-93/
 S:      Maintained
 F:      arch/arm/dts/imx93-phyboard-segin-u-boot.dtsi
diff --git a/board/phytec/phycore_rk3288/MAINTAINERS b/board/phytec/phycore_rk3288/MAINTAINERS
index e3b0af98e9a..a7ab023ff32 100644
--- a/board/phytec/phycore_rk3288/MAINTAINERS
+++ b/board/phytec/phycore_rk3288/MAINTAINERS
@@ -1,5 +1,6 @@
 phyCORE-RK3288
 M:	Wadim Egorov <w.egorov@phytec.de>
+L:	upstream@lists.phytec.de
 S:	Maintained
 F:	arch/arm/dts/rk3288-phycore-rdk-u-boot.dtsi
 F:	board/phytec/phycore_rk3288
diff --git a/board/qualcomm/google-pixel.config b/board/qualcomm/google-pixel.config
new file mode 100644
index 00000000000..999d4e45268
--- /dev/null
+++ b/board/qualcomm/google-pixel.config
@@ -0,0 +1,5 @@
+# Enables chainloading of U-Boot on Google Pixel phones using
+# newer bootloaders (Android Q/R)
+# Use for following devices: Pixel 3 (blueline), Pixel 3 XL (crosshatch),
+# Pixel 5 (redfin)...
+CONFIG_TEXT_BASE=0x80080000
diff --git a/board/samsung/common/exynos-uboot-spl.lds b/board/samsung/common/exynos-uboot-spl.lds
index 9d3b57e98db..62e150bcf33 100644
--- a/board/samsung/common/exynos-uboot-spl.lds
+++ b/board/samsung/common/exynos-uboot-spl.lds
@@ -48,7 +48,10 @@ SECTIONS
 		. = ALIGN(4);
 		__bss_start = .;
 		*(.bss*)
-		. = ALIGN(4);
+		. = ALIGN(8);
 		__bss_end = .;
 	} >.sram
 }
+
+ASSERT(__bss_end % 8 == 0, \
+       "__bss_end must be 8-byte aligned for device tree");
diff --git a/board/sifive/unmatched/hifive-platform-i2c-eeprom.c b/board/sifive/unmatched/hifive-platform-i2c-eeprom.c
index d25c24b08b3..7ad34fe8d20 100644
--- a/board/sifive/unmatched/hifive-platform-i2c-eeprom.c
+++ b/board/sifive/unmatched/hifive-platform-i2c-eeprom.c
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2020 SiFive, Inc.
  *
- * Based on board/freescale/common/sys_eeprom.c:
+ * Based on board/nxp/common/sys_eeprom.c:
  * Copyright 2006, 2008-2009, 2011 Freescale Semiconductor
  * York Sun (yorksun@freescale.com)
  * Haiying Wang (haiying.wang@freescale.com)
diff --git a/board/st/stm32mp2/stm32mp2.c b/board/st/stm32mp2/stm32mp2.c
index 7bc7d2a608f..43bc583378e 100644
--- a/board/st/stm32mp2/stm32mp2.c
+++ b/board/st/stm32mp2/stm32mp2.c
@@ -188,3 +188,24 @@ void board_quiesce_devices(void)
 {
 	led_boot_off();
 }
+
+#if defined(CONFIG_FWU_MULTI_BANK_UPDATE)
+
+#include <fwu.h>
+
+/**
+ * fwu_plat_get_bootidx() - Get the value of the boot index
+ * @boot_idx: Boot index value
+ *
+ * Get the value of the bank(partition) from which the platform
+ * has booted. This value is passed to U-Boot from the earlier
+ * stage bootloader which loads and boots all the relevant
+ * firmware images
+ *
+ */
+void fwu_plat_get_bootidx(uint *boot_idx)
+{
+	*boot_idx = (readl(TAMP_FWU_BOOT_INFO_REG) >>
+		    TAMP_FWU_BOOT_IDX_OFFSET) & TAMP_FWU_BOOT_IDX_MASK;
+}
+#endif /* CONFIG_FWU_MULTI_BANK_UPDATE */
diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS
index c52e8a34c85..775d0f7ae83 100644
--- a/board/sunxi/MAINTAINERS
+++ b/board/sunxi/MAINTAINERS
@@ -611,6 +611,11 @@ M:	Andre Przywara <andre.przywara@arm.com>
 S:	Maintained
 F:	configs/x96_mate_defconfig
 
+X96Q TV BOX
+M:	J. Neuschäfer <j.ne@posteo.net>
+S:	Maintained
+F:	configs/x96q_defconfig
+
 X96Q PRO+ TV BOX
 M:	Andre Przywara <andre.przywara@arm.com>
 S:	Maintained
diff --git a/board/sunxi/board.c b/board/sunxi/board.c
index 2929bc17f08..e9e3fb9a571 100644
--- a/board/sunxi/board.c
+++ b/board/sunxi/board.c
@@ -834,9 +834,12 @@ int misc_init_r(void)
 	/* Set fdtfile to match the FIT configuration chosen in SPL. */
 	spl_dt_name = get_spl_dt_name();
 	if (spl_dt_name) {
-		char *prefix = IS_ENABLED(CONFIG_ARM64) ? "allwinner/" : "";
+		const char *prefix = "";
 		char str[64];
 
+		if (IS_ENABLED(CONFIG_ARM64) && !IS_ENABLED(CONFIG_OF_UPSTREAM))
+			prefix = "allwinner/";
+
 		snprintf(str, sizeof(str), "%s%s.dtb", prefix, spl_dt_name);
 		env_set("fdtfile", str);
 	}
diff --git a/board/technexion/pico-imx6ul/pico-imx6ul.c b/board/technexion/pico-imx6ul/pico-imx6ul.c
index 10dcf8077e2..57d514853b1 100644
--- a/board/technexion/pico-imx6ul/pico-imx6ul.c
+++ b/board/technexion/pico-imx6ul/pico-imx6ul.c
@@ -23,7 +23,7 @@
 #include <usb.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
-#include "../../freescale/common/pfuze.h"
+#include "../../nxp/common/pfuze.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/technexion/pico-imx7d/Makefile b/board/technexion/pico-imx7d/Makefile
index 61b55fcc55a..cb6e1626a7d 100644
--- a/board/technexion/pico-imx7d/Makefile
+++ b/board/technexion/pico-imx7d/Makefile
@@ -1,4 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0+
 # (C) Copyright 2017 NXP Semiconductors
 
-obj-y  := pico-imx7d.o spl.o ../../freescale/common/mmc.o
+obj-y  := pico-imx7d.o spl.o ../../nxp/common/mmc.o
diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c
index cf6b7fcbd95..63b8b29d097 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -19,7 +19,7 @@
 #include <miiphy.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
-#include "../../freescale/common/pfuze.h"
+#include "../../nxp/common/pfuze.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
diff --git a/board/ti/am62ax/evm.c b/board/ti/am62ax/evm.c
index da6c31176cd..4916eec3b2b 100644
--- a/board/ti/am62ax/evm.c
+++ b/board/ti/am62ax/evm.c
@@ -15,6 +15,7 @@
 #include <asm/arch/k3-ddr.h>
 
 #include "../common/fdt_ops.h"
+#include "../common/k3_32k_lfosc.h"
 
 #if defined(CONFIG_XPL_BUILD)
 void spl_perform_board_fixups(struct spl_image_info *spl_image)
@@ -26,6 +27,12 @@ void spl_perform_board_fixups(struct spl_image_info *spl_image)
 		fixup_memory_node(spl_image);
 	}
 }
+
+void spl_board_init(void)
+{
+	if (IS_ENABLED(CONFIG_TI_K3_BOARD_LFOSC))
+		enable_32k_lfosc();
+}
 #endif
 
 #ifdef CONFIG_BOARD_LATE_INIT
diff --git a/board/ti/am62dx/evm.c b/board/ti/am62dx/evm.c
index 0924954c738..94d6043200a 100644
--- a/board/ti/am62dx/evm.c
+++ b/board/ti/am62dx/evm.c
@@ -15,6 +15,7 @@
 #include <asm/arch/k3-ddr.h>
 
 #include "../common/fdt_ops.h"
+#include "../common/k3_32k_lfosc.h"
 
 #if defined(CONFIG_XPL_BUILD)
 void spl_perform_board_fixups(struct spl_image_info *spl_image)
@@ -26,6 +27,12 @@ void spl_perform_board_fixups(struct spl_image_info *spl_image)
 		fixup_memory_node(spl_image);
 	}
 }
+
+void spl_board_init(void)
+{
+	if (IS_ENABLED(CONFIG_TI_K3_BOARD_LFOSC))
+		enable_32k_lfosc();
+}
 #endif
 
 #ifdef CONFIG_BOARD_LATE_INIT
diff --git a/board/ti/am62px/evm.c b/board/ti/am62px/evm.c
index 85c332b9339..8fde47fb1be 100644
--- a/board/ti/am62px/evm.c
+++ b/board/ti/am62px/evm.c
@@ -16,6 +16,7 @@
 #include <spl.h>
 #include <asm/arch/k3-ddr.h>
 #include "../common/fdt_ops.h"
+#include "../common/k3_32k_lfosc.h"
 
 struct efi_fw_image fw_images[] = {
 	{
@@ -45,6 +46,9 @@ struct efi_capsule_update_info update_info = {
 #if IS_ENABLED(CONFIG_SPL_BUILD)
 void spl_board_init(void)
 {
+	if (IS_ENABLED(CONFIG_TI_K3_BOARD_LFOSC))
+		enable_32k_lfosc();
+
 	enable_caches();
 }
 #endif
diff --git a/board/ti/am62x/evm.c b/board/ti/am62x/evm.c
index e9eba57eba7..2e8336900d1 100644
--- a/board/ti/am62x/evm.c
+++ b/board/ti/am62x/evm.c
@@ -24,6 +24,7 @@
 
 #include "../common/board_detect.h"
 #include "../common/fdt_ops.h"
+#include "../common/k3_32k_lfosc.h"
 
 #define board_is_am62x_skevm()  (board_ti_k3_is("AM62-SKEVM") || \
 				 board_ti_k3_is("AM62B-SKEVM"))
@@ -139,6 +140,9 @@ int board_late_init(void)
 #if defined(CONFIG_XPL_BUILD)
 void spl_board_init(void)
 {
+	if (IS_ENABLED(CONFIG_TI_K3_BOARD_LFOSC))
+		enable_32k_lfosc();
+
 	enable_caches();
 	if (IS_ENABLED(CONFIG_SPL_SPLASH_SCREEN) && IS_ENABLED(CONFIG_SPL_BMP))
 		splash_display();
diff --git a/board/ti/common/Kconfig b/board/ti/common/Kconfig
index 3dd2852e6b0..409454813f3 100644
--- a/board/ti/common/Kconfig
+++ b/board/ti/common/Kconfig
@@ -22,6 +22,11 @@ config CAPE_EEPROM_BUS_NUM
 	default 2
 	depends on SUPPORT_EXTENSION_SCAN
 
+config TI_K3_BOARD_LFOSC
+	bool "Initialize 32k LFOSC"
+	help
+	  Enable the 32k LFOSC on the device
+
 config TI_COMMON_CMD_OPTIONS
 	bool "Enable cmd options on TI platforms"
 	imply CMD_ASKENV
diff --git a/board/ti/common/Makefile b/board/ti/common/Makefile
index f58935b4103..b40c93cf312 100644
--- a/board/ti/common/Makefile
+++ b/board/ti/common/Makefile
@@ -5,3 +5,4 @@ obj-${CONFIG_TI_I2C_BOARD_DETECT} += board_detect.o
 obj-${CONFIG_$(PHASE_)SUPPORT_EXTENSION_SCAN} += cape_detect.o
 obj-${CONFIG_OF_LIBFDT} += fdt_ops.o
 obj-${CONFIG_ARCH_K3} += k3-ddr.o
+obj-${CONFIG_TI_K3_BOARD_LFOSC} += k3_32k_lfosc.o
diff --git a/board/ti/common/k3_32k_lfosc.c b/board/ti/common/k3_32k_lfosc.c
new file mode 100644
index 00000000000..24c5bad76b9
--- /dev/null
+++ b/board/ti/common/k3_32k_lfosc.c
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Library to support LFOSC operations common to some of the K3 devices
+ *
+ * Copyright (C) 2026 Texas Instruments Incorporated - https://www.ti.com/
+ */
+
+#include <asm/arch/hardware.h>
+
+void enable_32k_lfosc(void)
+{
+	u32 val;
+
+	/* We have 32k crystal, so lets enable it */
+	val = readl(MCU_CTRL_LFXOSC_CTRL);
+	val &= ~(MCU_CTRL_LFXOSC_32K_DISABLE_VAL);
+	writel(val, MCU_CTRL_LFXOSC_CTRL);
+	/* Add any TRIM needed for the crystal here.. */
+	/* Make sure to mux up to take the SoC 32k from the crystal */
+	writel(MCU_CTRL_DEVICE_CLKOUT_LFOSC_SELECT_VAL,
+	       MCU_CTRL_DEVICE_CLKOUT_32K_CTRL);
+}
diff --git a/board/ti/common/k3_32k_lfosc.h b/board/ti/common/k3_32k_lfosc.h
new file mode 100644
index 00000000000..08752033f2e
--- /dev/null
+++ b/board/ti/common/k3_32k_lfosc.h
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Library to support LFOSC operations common to some of the K3 devices
+ *
+ * Copyright (C) 2026 Texas Instruments Incorporated - https://www.ti.com/
+ */
+#ifndef __32K_LFOSC_OPS_H
+#define __32K_LFOSC_OPS_H
+
+/**
+ * enable_32k_lfosc - Do basic initialization of the 32k crystal
+ */
+void enable_32k_lfosc(void);
+
+#endif /* __32K_LFOSC_OPS_H */
diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c
index f01fb369b4b..81f7fa09002 100644
--- a/board/toradex/common/tdx-common.c
+++ b/board/toradex/common/tdx-common.c
@@ -179,6 +179,18 @@ static int settings_r(void)
 		eth_env_set_enetaddr("eth1addr", ethaddr);
 	}
 
+	if (IS_ENABLED(CONFIG_TARGET_TORADEX_SMARC_IMX95) &&
+	    !eth_env_get_enetaddr("eth2addr", ethaddr)) {
+		/*
+		 * Third MAC address is allocated from block
+		 * 0x100000 higher then the first MAC address.
+		 * The same as the default for the secondary MAC.
+		 */
+		memcpy(ethaddr, &tdx_eth_addr, 6);
+		ethaddr[3] += 0x10;
+		eth_env_set_enetaddr("eth2addr", ethaddr);
+	}
+
 	return 0;
 }
 EVENT_SPY_SIMPLE(EVT_SETTINGS_R, settings_r);
diff --git a/board/tq/tqma6/Kconfig b/board/tq/tqma6/Kconfig
index 599b3a72f70..e62228d73d0 100644
--- a/board/tq/tqma6/Kconfig
+++ b/board/tq/tqma6/Kconfig
@@ -11,7 +11,9 @@ config SYS_CONFIG_NAME
 
 choice
 	prompt "TQMa6 SoC variant"
-	default TQMA6Q
+	default TQMA6DL if MX6DL
+	default TQMA6Q if MX6Q
+	default TQMA6S if MX6S
 	help
 	  select the TQMa6 module variant. The variants only differ in the used
 	  i.MX6 CPU type and DRAM
@@ -79,6 +81,10 @@ config MBA6
 	select PHY_MICREL_KSZ90X1
 	select MXC_UART
 	imply OF_UPSTREAM
+	imply DM_I2C
+	imply DM_MMC
+	imply DM_SPI
+	imply DM_GPIO
 	help
 	  Select the MBa6 starterkit. This features a GigE Phy, USB, SD-Card
 	  etc.
diff --git a/board/tq/tqma6/tqma6dl.cfg b/board/tq/tqma6/tqma6dl.cfg
index f7289adb40a..17a3d010517 100644
--- a/board/tq/tqma6/tqma6dl.cfg
+++ b/board/tq/tqma6/tqma6dl.cfg
@@ -29,7 +29,7 @@ BOOT_FROM      spi
 #include "asm/arch/iomux.h"
 #include "asm/arch/crm_regs.h"
 
-/* TQMa6DL DDR config Rev. 0100E */
+/* TQMa6DL DDR config Rev. 0300D */
 /* IOMUX configuration */
 DATA 4, MX6_IOM_GRP_DDR_TYPE, 0x000C0000
 DATA 4, MX6_IOM_GRP_DDRPKE, 0x00000000
@@ -38,7 +38,7 @@ DATA 4, MX6_IOM_DRAM_SDCLK_1, 0x00008030
 DATA 4, MX6_IOM_DRAM_CAS, 0x00008030
 DATA 4, MX6_IOM_DRAM_RAS, 0x00008030
 DATA 4, MX6_IOM_GRP_ADDDS, 0x00000030
-DATA 4, MX6_IOM_DRAM_RESET, 0x000C3030
+DATA 4, MX6_IOM_DRAM_RESET, 0x00000030
 DATA 4, MX6_IOM_DRAM_SDCKE0, 0x00003000
 DATA 4, MX6_IOM_DRAM_SDCKE1, 0x00000000
 DATA 4, MX6_IOM_DRAM_SDBA2, 0x00000000
@@ -104,7 +104,7 @@ DATA 4, MX6_MMDC_P0_MDOTC, 0x00333030
 DATA 4, MX6_MMDC_P0_MDCFG0, 0x3F435333
 DATA 4, MX6_MMDC_P0_MDCFG1, 0xB68E8B63
 DATA 4, MX6_MMDC_P0_MDCFG2, 0x01FF00DB
-DATA 4, MX6_MMDC_P0_MDMISC, 0x00001740
+DATA 4, MX6_MMDC_P0_MDMISC, 0x00011740
 DATA 4, MX6_MMDC_P0_MDSCR, 0x00008000
 DATA 4, MX6_MMDC_P0_MDRWD, 0x000026D2
 DATA 4, MX6_MMDC_P0_MDOR, 0x00431023
@@ -113,7 +113,7 @@ DATA 4, MX6_MMDC_P0_MDCTL, 0x831A0000
 DATA 4, MX6_MMDC_P0_MDSCR, 0x00408032
 DATA 4, MX6_MMDC_P0_MDSCR, 0x00008033
 DATA 4, MX6_MMDC_P0_MDSCR, 0x00048031
-DATA 4, MX6_MMDC_P0_MDSCR, 0x05208030
+DATA 4, MX6_MMDC_P0_MDSCR, 0x15208030
 DATA 4, MX6_MMDC_P0_MDSCR, 0x04008040
 DATA 4, MX6_MMDC_P0_MDREF, 0x00007800
 DATA 4, MX6_MMDC_P0_MPODTCTRL, 0x00022222
diff --git a/board/tq/tqma6/tqma6q.cfg b/board/tq/tqma6/tqma6q.cfg
index ad862535c50..673482b543c 100644
--- a/board/tq/tqma6/tqma6q.cfg
+++ b/board/tq/tqma6/tqma6q.cfg
@@ -29,7 +29,7 @@ BOOT_FROM      spi
 #include "asm/arch/iomux.h"
 #include "asm/arch/crm_regs.h"
 
-/* TQMa6Q/D DDR config Rev. 0100B */
+/* TQMa6Q/D DDR config Rev. 0300D */
 /* IOMUX configuration */
 DATA 4, MX6_IOM_GRP_DDR_TYPE, 0x000C0000
 DATA 4, MX6_IOM_GRP_DDRPKE, 0x00000000
@@ -38,7 +38,7 @@ DATA 4, MX6_IOM_DRAM_SDCLK_1, 0x00008030
 DATA 4, MX6_IOM_DRAM_CAS, 0x00008030
 DATA 4, MX6_IOM_DRAM_RAS, 0x00008030
 DATA 4, MX6_IOM_GRP_ADDDS, 0x00000030
-DATA 4, MX6_IOM_DRAM_RESET, 0x00003030
+DATA 4, MX6_IOM_DRAM_RESET, 0x00000030
 DATA 4, MX6_IOM_DRAM_SDCKE0, 0x00003000
 DATA 4, MX6_IOM_DRAM_SDCKE1, 0x00000000
 DATA 4, MX6_IOM_DRAM_SDBA2, 0x00000000
@@ -75,18 +75,18 @@ DATA 4, MX6_IOM_DRAM_DQM7, 0x00000030
 /* memory interface calibration values */
 DATA 4, MX6_MMDC_P0_MPZQHWCTRL, 0xA1390003
 DATA 4, MX6_MMDC_P1_MPZQHWCTRL, 0xA1390003
-DATA 4, MX6_MMDC_P0_MPWLDECTRL0, 0x001B0013
-DATA 4, MX6_MMDC_P0_MPWLDECTRL1, 0x0018001B
-DATA 4, MX6_MMDC_P1_MPWLDECTRL0, 0x001B0016
-DATA 4, MX6_MMDC_P1_MPWLDECTRL1, 0x0012001C
-DATA 4, MX6_MMDC_P0_MPDGCTRL0, 0x43400350
-DATA 4, MX6_MMDC_P0_MPDGCTRL1, 0x023E032C
-DATA 4, MX6_MMDC_P1_MPDGCTRL0, 0x43400348
-DATA 4, MX6_MMDC_P1_MPDGCTRL1, 0x03300304
-DATA 4, MX6_MMDC_P0_MPRDDLCTL, 0x3C323436
-DATA 4, MX6_MMDC_P1_MPRDDLCTL, 0x38383242
-DATA 4, MX6_MMDC_P0_MPWRDLCTL, 0x3E3C4440
-DATA 4, MX6_MMDC_P1_MPWRDLCTL, 0x4236483E
+DATA 4, MX6_MMDC_P0_MPWLDECTRL0, 0x00180016
+DATA 4, MX6_MMDC_P0_MPWLDECTRL1, 0x001F0018
+DATA 4, MX6_MMDC_P1_MPWLDECTRL0, 0x00130023
+DATA 4, MX6_MMDC_P1_MPWLDECTRL1, 0x00040018
+DATA 4, MX6_MMDC_P0_MPDGCTRL0, 0x43500364
+DATA 4, MX6_MMDC_P0_MPDGCTRL1, 0x034C0344
+DATA 4, MX6_MMDC_P1_MPDGCTRL0, 0x43580364
+DATA 4, MX6_MMDC_P1_MPDGCTRL1, 0x033C031C
+DATA 4, MX6_MMDC_P0_MPRDDLCTL, 0x3C323438
+DATA 4, MX6_MMDC_P1_MPRDDLCTL, 0x383A3040
+DATA 4, MX6_MMDC_P0_MPWRDLCTL, 0x3A3E4440
+DATA 4, MX6_MMDC_P1_MPWRDLCTL, 0x4834483A
 DATA 4, MX6_MMDC_P0_MPRDDQBY0DL, 0x33333333
 DATA 4, MX6_MMDC_P0_MPRDDQBY1DL, 0x33333333
 DATA 4, MX6_MMDC_P0_MPRDDQBY2DL, 0x33333333
@@ -104,18 +104,19 @@ DATA 4, MX6_MMDC_P0_MDOTC, 0x09444040
 DATA 4, MX6_MMDC_P0_MDCFG0, 0x545A79B4
 DATA 4, MX6_MMDC_P0_MDCFG1, 0xDB538F64
 DATA 4, MX6_MMDC_P0_MDCFG2, 0x01FF00DB
-DATA 4, MX6_MMDC_P0_MDMISC, 0x00001740
+DATA 4, MX6_MMDC_P0_MDMISC, 0x00011740
 DATA 4, MX6_MMDC_P0_MDSCR, 0x00008000
 DATA 4, MX6_MMDC_P0_MDRWD, 0x000026D2
 DATA 4, MX6_MMDC_P0_MDOR, 0x005A1023
 DATA 4, MX6_MMDC_P0_MDASP, 0x00000027
 DATA 4, MX6_MMDC_P0_MDCTL, 0x831A0000
-DATA 4, MX6_MMDC_P0_MDSCR, 0x00088032
+
+DATA 4, MX6_MMDC_P0_MDSCR, 0x00488032
 DATA 4, MX6_MMDC_P0_MDSCR, 0x00008033
 DATA 4, MX6_MMDC_P0_MDSCR, 0x00048031
-DATA 4, MX6_MMDC_P0_MDSCR, 0x09308030
+DATA 4, MX6_MMDC_P0_MDSCR, 0x19308030
 DATA 4, MX6_MMDC_P0_MDSCR, 0x04008040
-DATA 4, MX6_MMDC_P0_MDREF, 0x00005800
+DATA 4, MX6_MMDC_P0_MDREF, 0x00007800
 DATA 4, MX6_MMDC_P0_MPODTCTRL, 0x00022222
 DATA 4, MX6_MMDC_P1_MPODTCTRL, 0x00022222
 DATA 4, MX6_MMDC_P0_MDPDC, 0x00025536
diff --git a/board/tq/tqma6/tqma6s.cfg b/board/tq/tqma6/tqma6s.cfg
index e50fe3f57d7..a5057689d64 100644
--- a/board/tq/tqma6/tqma6s.cfg
+++ b/board/tq/tqma6/tqma6s.cfg
@@ -29,7 +29,7 @@ BOOT_FROM      spi
 #include "asm/arch/iomux.h"
 #include "asm/arch/crm_regs.h"
 
-/* TQMa6S DDR config Rev. 0100B */
+/* TQMa6S DDR config Rev. 0300D */
 /* IOMUX configuration */
 DATA 4, MX6_IOM_GRP_DDR_TYPE, 0x000C0000
 DATA 4, MX6_IOM_GRP_DDRPKE, 0x00000000
@@ -38,7 +38,7 @@ DATA 4, MX6_IOM_DRAM_SDCLK_1, 0x00008030
 DATA 4, MX6_IOM_DRAM_CAS, 0x00008030
 DATA 4, MX6_IOM_DRAM_RAS, 0x00008030
 DATA 4, MX6_IOM_GRP_ADDDS, 0x00000030
-DATA 4, MX6_IOM_DRAM_RESET, 0x000C3030
+DATA 4, MX6_IOM_DRAM_RESET, 0x00000030
 DATA 4, MX6_IOM_DRAM_SDCKE0, 0x00003000
 DATA 4, MX6_IOM_DRAM_SDCKE1, 0x00000000
 DATA 4, MX6_IOM_DRAM_SDBA2, 0x00000000
@@ -75,17 +75,17 @@ DATA 4, MX6_IOM_DRAM_DQM7, 0x00000000
 /* memory interface calibration values */
 DATA 4, MX6_MMDC_P0_MPZQHWCTRL, 0xA1390003
 DATA 4, MX6_MMDC_P1_MPZQHWCTRL, 0xA1380000
-DATA 4, MX6_MMDC_P0_MPWLDECTRL0, 0x0014000E
-DATA 4, MX6_MMDC_P0_MPWLDECTRL1, 0x00120014
+DATA 4, MX6_MMDC_P0_MPWLDECTRL0, 0x004C004A
+DATA 4, MX6_MMDC_P0_MPWLDECTRL1, 0x003F0048
 DATA 4, MX6_MMDC_P1_MPWLDECTRL0, 0x00000000
 DATA 4, MX6_MMDC_P1_MPWLDECTRL1, 0x00000000
-DATA 4, MX6_MMDC_P0_MPDGCTRL0, 0x0240023C
-DATA 4, MX6_MMDC_P0_MPDGCTRL1, 0x0228022C
+DATA 4, MX6_MMDC_P0_MPDGCTRL0, 0x42440240
+DATA 4, MX6_MMDC_P0_MPDGCTRL1, 0x022C022C
 DATA 4, MX6_MMDC_P1_MPDGCTRL0, 0x00000000
 DATA 4, MX6_MMDC_P1_MPDGCTRL1, 0x00000000
-DATA 4, MX6_MMDC_P0_MPRDDLCTL, 0x4A4A4E4A
+DATA 4, MX6_MMDC_P0_MPRDDLCTL, 0x484A504C
 DATA 4, MX6_MMDC_P1_MPRDDLCTL, 0x00000000
-DATA 4, MX6_MMDC_P0_MPWRDLCTL, 0x36362A32
+DATA 4, MX6_MMDC_P0_MPWRDLCTL, 0x34322832
 DATA 4, MX6_MMDC_P1_MPWRDLCTL, 0x00000000
 DATA 4, MX6_MMDC_P0_MPRDDQBY0DL, 0x33333333
 DATA 4, MX6_MMDC_P0_MPRDDQBY1DL, 0x33333333
@@ -104,18 +104,19 @@ DATA 4, MX6_MMDC_P0_MDOTC, 0x00333030
 DATA 4, MX6_MMDC_P0_MDCFG0, 0x3F435333
 DATA 4, MX6_MMDC_P0_MDCFG1, 0xB68E8B63
 DATA 4, MX6_MMDC_P0_MDCFG2, 0x01FF00DB
-DATA 4, MX6_MMDC_P0_MDMISC, 0x00001740
+DATA 4, MX6_MMDC_P0_MDMISC, 0x00011740
 DATA 4, MX6_MMDC_P0_MDSCR, 0x00008000
 DATA 4, MX6_MMDC_P0_MDRWD, 0x000026D2
 DATA 4, MX6_MMDC_P0_MDOR, 0x00431023
 DATA 4, MX6_MMDC_P0_MDASP, 0x00000017
 DATA 4, MX6_MMDC_P0_MDCTL, 0x83190000
-DATA 4, MX6_MMDC_P0_MDSCR, 0x00008032
+
+DATA 4, MX6_MMDC_P0_MDSCR, 0x00408032
 DATA 4, MX6_MMDC_P0_MDSCR, 0x00008033
 DATA 4, MX6_MMDC_P0_MDSCR, 0x00048031
-DATA 4, MX6_MMDC_P0_MDSCR, 0x05208030
+DATA 4, MX6_MMDC_P0_MDSCR, 0x15208030
 DATA 4, MX6_MMDC_P0_MDSCR, 0x04008040
-DATA 4, MX6_MMDC_P0_MDREF, 0x00005800
+DATA 4, MX6_MMDC_P0_MDREF, 0x00007800
 DATA 4, MX6_MMDC_P0_MPODTCTRL, 0x00022222
 DATA 4, MX6_MMDC_P1_MPODTCTRL, 0x00000000
 DATA 4, MX6_MMDC_P0_MDPDC, 0x0002552D
diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c
index 4cd3ff0051b..8b1cff2955b 100644
--- a/board/warp7/warp7.c
+++ b/board/warp7/warp7.c
@@ -20,7 +20,7 @@
 #include <netdev.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
-#include "../freescale/common/pfuze.h"
+#include "../nxp/common/pfuze.h"
 #include <asm/setup.h>
 #include <asm/bootm.h>
 
diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index 3b28ba62374..769e52bcfb5 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -628,6 +628,10 @@ enum env_location env_get_location(enum env_operation op, int prio)
 	case QSPI_MODE_32BIT:
 		if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH))
 			return ENVL_SPI_FLASH;
+		if (IS_ENABLED(CONFIG_ENV_IS_IN_FAT))
+			return ENVL_FAT;
+		if (IS_ENABLED(CONFIG_ENV_IS_IN_EXT4))
+			return ENVL_EXT4;
 		return ENVL_NOWHERE;
 	case JTAG_MODE:
 	default: