diff --git a/arch/arm/dts/o4-imx-nano.dts b/arch/arm/dts/o4-imx-nano.dts
index d1785b7dc70221d7927398af00559b965205eff0..54d32f9dd47b9b14e9076c42ec9e09100b44b0fd 100644
--- a/arch/arm/dts/o4-imx-nano.dts
+++ b/arch/arm/dts/o4-imx-nano.dts
@@ -24,40 +24,34 @@
 	leds {
 		compatible = "gpio-leds";
 
-		led@0 {
+		led0 {
 			color = <LED_COLOR_ID_RED>;
 			gpios = <&pcf8574a 0 GPIO_ACTIVE_LOW>;
-			reg = <0>;
 		};
 
-		led@1 {
+		led1{
 			color = <LED_COLOR_ID_GREEN>;
 			gpios = <&pcf8574a 1 GPIO_ACTIVE_LOW>;
-			reg = <1>;
 		};
 
-		led@2 {
+		led2 {
 			gpios = <&pcf8574a 2 GPIO_ACTIVE_LOW>;
 			color = <LED_COLOR_ID_BLUE>;
-			reg = <2>;
 		};
 
-		led@3 {
+		led3 {
 			color = <LED_COLOR_ID_RED>;
 			gpios = <&pcf8574a 3 GPIO_ACTIVE_LOW>;
-			reg = <3>;
 		};
 
-		led@4 {
+		led4{
 			color = <LED_COLOR_ID_GREEN>;
 			gpios = <&pcf8574a 4 GPIO_ACTIVE_LOW>;
-			reg = <4>;
 		};
 
-		led@5 {
+		led5 {
 			color = <LED_COLOR_ID_BLUE>;
 			gpios = <&pcf8574a 5 GPIO_ACTIVE_LOW>;
-			reg = <5>;
 		};
 	};
 
diff --git a/configs/imx8mm_evk_defconfig b/configs/imx8mm_evk_defconfig
index 200bf554e0ad57783663d7ca884782110e692f27..1ac48167b56e3bc7c22a4508cf105968bb6d9637 100644
--- a/configs/imx8mm_evk_defconfig
+++ b/configs/imx8mm_evk_defconfig
@@ -18,6 +18,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_DEFAULT_DEVICE_TREE="imx8mm-evk"
+CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_FIT_EXTERNAL_OFFSET=0x3000
 CONFIG_SPL_LOAD_FIT=y
@@ -40,7 +41,6 @@ CONFIG_CMD_FUSE=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
-CONFIG_CMD_PART=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
@@ -50,7 +50,6 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
-CONFIG_CMD_FS_GENERIC=y
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y
diff --git a/configs/imx8mp_evk_defconfig b/configs/imx8mp_evk_defconfig
index 11d62837bc67cf4a09f51e53ecff9ebb1e87088b..79b4a7b2470a3d3fc80d106679370722b67c7f50 100644
--- a/configs/imx8mp_evk_defconfig
+++ b/configs/imx8mp_evk_defconfig
@@ -19,6 +19,7 @@ CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_SPL=y
 CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000
 CONFIG_DEFAULT_DEVICE_TREE="imx8mp-evk"
+CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_FIT_EXTERNAL_OFFSET=0x3000
 CONFIG_SPL_LOAD_FIT=y
@@ -45,7 +46,6 @@ CONFIG_CMD_FUSE=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
-CONFIG_CMD_PART=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
@@ -55,7 +55,6 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
-CONFIG_CMD_FS_GENERIC=y
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_ENV_OVERWRITE=y