  			"run load_args; "				\
  		"fi;\0"							\
  	"load_initrd=ext4load mmc ${rootdev}:${bootpart} $ramdiskaddr $ramdisk_file\0" \
-@@ -470,7 +472,12 @@
+@@ -470,7 +471,14 @@
  		"setenv modulespart " __stringify(CONFIG_MODULES_PART_SD)"; "	\
  		"setenv rootpart " __stringify(CONFIG_ROOT_PART_SD)";\0"	\
  	"ramfsboot=run gen_addr; run load_args; run boot_cmd_initrd\0"	\
 -	"mmcboot=run gen_addr; run load_args; run boot_cmd_mmcboot\0"	\
 +	"mmcboot="							\
-+		"run gen_addr; setenv resin_kernel_load_addr ${kerneladdr}; "	\
++		"run gen_addr;"						\
++		"setenv resin_kernel_load_addr ${kerneladdr};"		\
++		"run resin_set_kernel_root;"				\
 +		"setenv rootdev ${resin_dev_index};"			\
 +		"setenv rootpart ${resin_root_part};"			\
 +		"setenv bootpart ${resin_boot_part};"			\

 		"fi; setenv success; setenv number; setenv loop;\0"	\
 	"bootdelay=" __stringify(CONFIG_BOOTDELAY) "\0"			\
 	"console=" CONFIG_DEFAULT_CONSOLE				\
@@ -441,21 +442,22 @@
 	"factory_set_ethaddr=run factory_load; gen_eth_addr ;"		\
 		"factory_info write ethaddr $ethaddr;"			\
 		"run factory_save\0"					\
-	"load_args=run factory_load; setenv bootargs ${console} "	\
-		"root=/dev/mmcblk${rootdev}p${rootpart} ${root_rw} "	\
+	"load_args=run resin_set_kernel_root; "				\
+		"run factory_load; setenv bootargs ${console} "		\
+		"${resin_kernel_root} ${root_rw} "			\
 		"rootfstype=${rootfs_type} ${recoverymode} ${ota} "	\
 		"drm_panel=$lcd_panel nr_cpus=${nr_cpus} ${opts} "	\

 	"recovery_cmd=run sdrecovery; setenv recoverymode recovery\0"	\
 	"recoveryboot=run gen_sdrecaddr; run recovery_cmd; run ramfsboot\0"		\
 	"hwtestboot=setenv rootdev 1;"					\
@@ -478,6 +486,6 @@
 		"setenv fdtfile s5p4418-artik${model_id}-explorer.dtb;"		\
 		"run mmcboot\0"						\
 	"hwtest_recoveryboot=run recovery_cmd; run hwtestboot\0"        \
