diff --git a/hwpack/am335x-bone-serial.conf b/hwpack/am335x-bone-serial.conf
index 5f0e4d3..0007389 100644
--- a/hwpack/am335x-bone-serial.conf
+++ b/hwpack/am335x-bone-serial.conf
@@ -29,7 +29,7 @@ kernel_repo="TESTING"
 usbnet_mem=
 
 #Kernel: Bootloader Settings:
-kernel_addr="0x80300000"
+conf_loadaddr="0x80300000"
 initrd_addr="0x81600000"
 load_addr="0x80008000"
 dtb_addr="0x815f0000"
diff --git a/hwpack/am335x-bone-video.conf b/hwpack/am335x-bone-video.conf
index eaad4d8..b1201b2 100644
--- a/hwpack/am335x-bone-video.conf
+++ b/hwpack/am335x-bone-video.conf
@@ -29,7 +29,7 @@ kernel_repo="TESTING"
 usbnet_mem=
 
 #Kernel: Bootloader Settings:
-kernel_addr="0x80300000"
+conf_loadaddr="0x80300000"
 initrd_addr="0x81600000"
 load_addr="0x80008000"
 dtb_addr="0x815f0000"
diff --git a/hwpack/am335x-boneblack.conf b/hwpack/am335x-boneblack.conf
index d08a842..ec15f0a 100644
--- a/hwpack/am335x-boneblack.conf
+++ b/hwpack/am335x-boneblack.conf
@@ -29,7 +29,7 @@ kernel_repo="TESTING"
 usbnet_mem=
 
 #Kernel: Bootloader Settings:
-kernel_addr="0x80300000"
+conf_loadaddr="0x80300000"
 initrd_addr="0x81600000"
 load_addr="0x80008000"
 dtb_addr="0x815f0000"
diff --git a/hwpack/am335x-evmsk.conf b/hwpack/am335x-evmsk.conf
index 78a0fac..346345d 100644
--- a/hwpack/am335x-evmsk.conf
+++ b/hwpack/am335x-evmsk.conf
@@ -29,7 +29,7 @@ kernel_repo="TESTING"
 usbnet_mem=
 
 #Kernel: Bootloader Settings:
-kernel_addr="0x80300000"
+conf_loadaddr="0x80300000"
 initrd_addr="0x81600000"
 load_addr="0x80008000"
 dtb_addr="0x815f0000"
diff --git a/hwpack/docs.txt b/hwpack/docs.txt
index 5674f8c..f4430c7 100644
--- a/hwpack/docs.txt
+++ b/hwpack/docs.txt
@@ -66,7 +66,7 @@ kernel_subarch="omap-psp"
 kernel_repo="TESTING"
 
 #Kernel: Bootloader Settings:
-kernel_addr="0x80300000"
+conf_loadaddr="0x80300000"
 initrd_addr="0x81600000"
 load_addr="0x80008000"
 dtb_addr="0x815f0000"
diff --git a/hwpack/imx51-babbage.conf b/hwpack/imx51-babbage.conf
index bf60667..8f9496c 100644
--- a/hwpack/imx51-babbage.conf
+++ b/hwpack/imx51-babbage.conf
@@ -33,7 +33,7 @@ kernel_repo="STABLE"
 usbnet_mem=
 
 #Kernel: Bootloader Settings:
-kernel_addr="0x90010000"
+conf_loadaddr="0x90010000"
 initrd_addr="0x92000000"
 load_addr="0x90008000"
 dtb_addr="0x91ff0000"
diff --git a/hwpack/imx53-qsb.conf b/hwpack/imx53-qsb.conf
index 22ee584..8cc4d81 100644
--- a/hwpack/imx53-qsb.conf
+++ b/hwpack/imx53-qsb.conf
@@ -33,7 +33,7 @@ kernel_repo="STABLE"
 usbnet_mem=
 
 #Kernel: Bootloader Settings:
-kernel_addr="0x70010000"
+conf_loadaddr="0x70010000"
 initrd_addr="0x72000000"
 load_addr="0x70008000"
 dtb_addr="0x71ff0000"
diff --git a/hwpack/imx6q-sabrelite.conf b/hwpack/imx6q-sabrelite.conf
index ec91aca..2586fb1 100644
--- a/hwpack/imx6q-sabrelite.conf
+++ b/hwpack/imx6q-sabrelite.conf
@@ -35,7 +35,7 @@ kernel_repo="STABLE"
 usbnet_mem=
 
 #Kernel: Bootloader Settings:
-kernel_addr="0x10000000"
+conf_loadaddr="0x10000000"
 initrd_addr="0x12000000"
 load_addr="0x10008000"
 dtb_addr="0x11ff0000"
diff --git a/hwpack/imx6q-sabresd.conf b/hwpack/imx6q-sabresd.conf
index ed75246..eaf591b 100644
--- a/hwpack/imx6q-sabresd.conf
+++ b/hwpack/imx6q-sabresd.conf
@@ -33,7 +33,7 @@ kernel_repo="STABLE"
 usbnet_mem=
 
 #Kernel: Bootloader Settings:
-kernel_addr="0x10000000"
+conf_loadaddr="0x10000000"
 initrd_addr="0x12000000"
 load_addr="0x10008000"
 dtb_addr="0x11ff0000"
diff --git a/hwpack/omap3-beagle-xm-v3.9.conf b/hwpack/omap3-beagle-xm-v3.9.conf
index 41f4171..82e3171 100644
--- a/hwpack/omap3-beagle-xm-v3.9.conf
+++ b/hwpack/omap3-beagle-xm-v3.9.conf
@@ -30,7 +30,7 @@ kernel_repo="EXPERIMENTAL"
 usbnet_mem="16384"
 
 #Kernel: Bootloader Settings:
-kernel_addr="0x80300000"
+conf_loadaddr="0x80300000"
 initrd_addr="0x81600000"
 load_addr="0x80008000"
 dtb_addr="0x815f0000"
diff --git a/hwpack/omap3-beagle-xm.conf b/hwpack/omap3-beagle-xm.conf
index c2721d0..f2492e9 100644
--- a/hwpack/omap3-beagle-xm.conf
+++ b/hwpack/omap3-beagle-xm.conf
@@ -29,7 +29,7 @@ kernel_repo="STABLE"
 
 usbnet_mem="16384"
 
-kernel_addr="0x80300000"
+conf_loadaddr="0x80300000"
 initrd_addr="0x81600000"
 load_addr="0x80008000"
 dtb_addr="0x815f0000"
diff --git a/hwpack/omap4-panda.conf b/hwpack/omap4-panda.conf
index 8a8d3a3..a7292c6 100644
--- a/hwpack/omap4-panda.conf
+++ b/hwpack/omap4-panda.conf
@@ -29,7 +29,7 @@ kernel_repo="STABLE"
 
 usbnet_mem="32768"
 
-kernel_addr="0x80300000"
+conf_loadaddr="0x80300000"
 initrd_addr="0x81600000"
 load_addr="0x80008000"
 dtb_addr="0x815f0000"
diff --git a/mk_mmc.sh b/mk_mmc.sh
index 4e9b6db..4706812 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -407,26 +407,26 @@ function boot_uenv_txt_template {
 
 	if [ "${uboot_USE_MMC_DEFINES}" ] ; then
 		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
-			xyz_load_image=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${kernel_addr} \${kernel_file}
+			xyz_load_image=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_loadaddr} \${kernel_file}
 			xyz_load_initrd=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${initrd_addr} \${initrd_file}; setenv initrd_size \${filesize}
 			xyz_load_dtb=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${dtb_addr} /dtbs/\${dtb_file}
 
 		__EOF__
 		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
-			xyz_load_image=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${kernel_addr} \${kernel_file}
+			xyz_load_image=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${conf_loadaddr} \${kernel_file}
 			xyz_load_initrd=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${initrd_addr} \${initrd_file}; setenv initrd_size \${filesize}
 			xyz_load_dtb=${uboot_CMD_LOAD} mmc \${mmcdev}:\${mmcpart} ${dtb_addr} /dtbs/\${dtb_file}
 
 		__EOF__
 	else
 		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
-			xyz_load_image=${uboot_CMD_LOAD} mmc 0:1 ${kernel_addr} \${kernel_file}
+			xyz_load_image=${uboot_CMD_LOAD} mmc 0:1 ${conf_loadaddr} \${kernel_file}
 			xyz_load_initrd=${uboot_CMD_LOAD} mmc 0:1 ${initrd_addr} \${initrd_file}; setenv initrd_size \${filesize}
 			xyz_load_dtb=${uboot_CMD_LOAD} mmc 0:1 ${dtb_addr} /dtbs/\${dtb_file}
 
 		__EOF__
 		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
-			xyz_load_image=${uboot_CMD_LOAD} mmc 0:1 ${kernel_addr} \${kernel_file}
+			xyz_load_image=${uboot_CMD_LOAD} mmc 0:1 ${conf_loadaddr} \${kernel_file}
 			xyz_load_initrd=${uboot_CMD_LOAD} mmc 0:1 ${initrd_addr} \${initrd_file}; setenv initrd_size \${filesize}
 			xyz_load_dtb=${uboot_CMD_LOAD} mmc 0:1 ${dtb_addr} /dtbs/\${dtb_file}
 
@@ -534,22 +534,22 @@ function boot_uenv_txt_template {
 
 	if [ ! "${need_dtbs}" ] ; then
 		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
-			${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size}
+			${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${conf_loadaddr} ${initrd_addr}:\${initrd_size}
 
 		__EOF__
 
 		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
-			${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size}
+			${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${conf_loadaddr} ${initrd_addr}:\${initrd_size}
 
 		__EOF__
 	else
 		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
-			${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${dtb_addr}
+			${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${conf_loadaddr} ${initrd_addr}:\${initrd_size} ${dtb_addr}
 
 		__EOF__
 
 		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
-			${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${kernel_addr} ${initrd_addr}:\${initrd_size} ${dtb_addr}
+			${uboot_SCRIPT_ENTRY}=run xyz_mmcboot; run device_args; ${boot_image} ${conf_loadaddr} ${initrd_addr}:\${initrd_size} ${dtb_addr}
 
 		__EOF__
 	fi
@@ -1047,7 +1047,7 @@ function initrd_device_settings {
 		boot_fstype=${boot_fstype}
 
 		serial_tty=${SERIAL}
-		kernel_addr=${kernel_addr}
+		conf_loadaddr=${conf_loadaddr}
 		initrd_addr=${initrd_addr}
 		load_addr=${load_addr}
 		dtb_addr=${dtb_addr}
@@ -1338,7 +1338,7 @@ function populate_boot {
 			boot_fstype=${boot_fstype}
 
 			serial_tty=${SERIAL}
-			kernel_addr=${kernel_addr}
+			conf_loadaddr=${conf_loadaddr}
 			initrd_addr=${initrd_addr}
 			load_addr=${load_addr}
 			dtb_addr=${dtb_addr}
@@ -1450,7 +1450,7 @@ function is_omap {
 
 	kernel_subarch="omap"
 
-	kernel_addr="0x80300000"
+	conf_loadaddr="0x80300000"
 	initrd_addr="0x81600000"
 	load_addr="0x80008000"
 	dtb_addr="0x815f0000"