diff --git a/sys/arm64/conf/GENERIC b/sys/arm64/conf/GENERIC
--- a/sys/arm64/conf/GENERIC
+++ b/sys/arm64/conf/GENERIC
@@ -35,7 +35,6 @@
 include		"std.ec2"
 include		"std.hyperv"
 include		"std.hisilicon"
-include		"std.imx"
 include		"std.marvell"
 include		"std.nvidia"
 include		"std.nxp"
diff --git a/sys/arm64/conf/IMX b/sys/arm64/conf/IMX
deleted file mode 100644
--- a/sys/arm64/conf/IMX
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# IMX -- IMX kernel configuration file for FreeBSD/arm64
-#
-# For more information on this file, please read the config(5) manual page,
-# and/or the handbook section on Kernel Configuration Files:
-#
-#    https://docs.freebsd.org/en/books/handbook/kernelconfig/#kernelconfig-config
-#
-# The handbook is also available locally in /usr/share/doc/handbook
-# if you've installed the doc distribution, otherwise always see the
-# FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the
-# latest information.
-#
-# An exhaustive list of options and more detailed explanations of the
-# device lines is also present in the ../../conf/NOTES and NOTES files.
-# If you are in doubt as to the purpose or necessity of a line, check first
-# in NOTES.
-#
-
-#NO_UNIVERSE
-
-cpu		ARM64
-ident		IMX
-
-include		"std.arm64"
-include		"std.dev"
-include		"std.imx"
diff --git a/sys/arm64/conf/std.imx b/sys/arm64/conf/std.imx
deleted file mode 100644
--- a/sys/arm64/conf/std.imx
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# IMX SoC support
-#
-
-# SoC support
-options 	SOC_FREESCALE_IMX8
-
-# I2C
-device		vf_i2c			# Freescale Vybrid I2C controller
-device		fsliic			# Freescale iMX I2C controller
-
-# Serial (COM) ports
-device		uart_imx		# iMX8 UART
-
-# MMC/SD/SDIO Card slot support
-device		sdhci
-
-# Ethernet
-device		ffec
-
-options 	FDT
-
-# DTBs
-makeoptions	MODULES_EXTRA+="dtb/imx8"
diff --git a/sys/arm64/conf/std.nxp b/sys/arm64/conf/std.nxp
--- a/sys/arm64/conf/std.nxp
+++ b/sys/arm64/conf/std.nxp
@@ -3,15 +3,19 @@
 #
 
 # SoC support
+options 	SOC_FREESCALE_IMX8
 options 	SOC_NXP_LS
 
 # I2C
+device		fsliic			# Freescale iMX I2C controller
 device		pca954x			# NPX I2C bus multiplexer / switches
 device		pcf8563			# NXP Real-time clock/calendar
 device		tca64xx			# NXP I2C gpio expander
 device		pcf85063		# NXP Real-time clock
+device		vf_i2c			# Freescale Vybrid I2C controller
 
 # Serial (COM) ports
+device		uart_imx		# iMX8 UART
 device		uart_ns8250		# ns8250-type UART driver
 device		uart_snps
 
@@ -24,9 +28,10 @@
 # Ethernet NICs
 device		dpaa2			# Data Path Acceleration Architecture (2nd Gen)
 device		enetc			# QorIQ LS1028A NIC
+device		ffec
 
 options 	FDT
 device		acpi
 
 # DTBs
-makeoptions	MODULES_EXTRA+="dtb/freescale"
+makeoptions	MODULES_EXTRA+="dtb/freescale dtb/imx8"