diff --git a/board/ruby/ruby.c b/board/ruby/ruby.c
index ee014c2..092f443 100644
--- a/board/ruby/ruby.c
+++ b/board/ruby/ruby.c
@@ -207,7 +207,7 @@
 	sprintf(cmd, "if test xx$HNV_ACTIVATED_KERNEL_NAME = xxkernel1; "
 	  "then gfkernel=0x%08x otherkernel=0x%08x; "
 	  "else gfkernel=0x%08x otherkernel=0x%08x; fi; "
-	  "loadaddr=0x%08x; kernelsize=0x%08x; ",
+	  "gfloadaddr=0x%08x; kernelsize=0x%08x; ",
 	  UBOOT_PARTITION_OFFSET_KERNEL1, UBOOT_PARTITION_OFFSET_KERNEL0,
 	  UBOOT_PARTITION_OFFSET_KERNEL0, UBOOT_PARTITION_OFFSET_KERNEL1,
 	  RUBY_KERNEL_LOAD_DRAM_BEGIN,
@@ -215,8 +215,8 @@
 	setenv("gfparams", cmd);
 
 	const char *gfboot = "run gfparams; "
-	  "spi_flash read $gfkernel $loadaddr $kernelsize; "
-	  "bootm $loadaddr; ";
+	  "spi_flash read $gfkernel $gfloadaddr $kernelsize; "
+	  "bootm $gfloadaddr; ";
 
 	char *env = getenv("gfboot");
 	if (env && strcmp(env, gfboot)) {
@@ -231,8 +231,8 @@
 
 	setenv("otherboot",
 	  "run gfparams; "
-	  "spi_flash read $otherkernel $loadaddr $kernelsize; "
-	  "bootm $loadaddr; ");
+	  "spi_flash read $otherkernel $gfloadaddr $kernelsize; "
+	  "bootm $gfloadaddr; ");
 #endif
 	return 0;
 }