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

 		"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} "	\


Signed-off-by: Florin Sarbu <florin@resin.io>
---
 include/configs/artik530_raptor.h | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/include/configs/artik530_raptor.h b/include/configs/artik530_raptor.h
index 65ede91..67674fe 100644
--- a/include/configs/artik530_raptor.h
+++ b/include/configs/artik530_raptor.h
@@ -234,6 +234,7 @@
