diff --git a/tools/setup_sdcard.sh b/tools/setup_sdcard.sh
index 1e475c79bb13248691e6c404b5516dbb94f399b5..4586fbec373ead50dcbcbf837d45bdca84e47da2 100755
--- a/tools/setup_sdcard.sh
+++ b/tools/setup_sdcard.sh
@@ -241,31 +241,50 @@ dl_bootloader () {
 	fi
 
 	if [ "x${oem_blank_eeprom}" = "xenable" ] ; then
-		if [ "x${conf_board}" = "xbeagle_x15" ] ; then
-			unset oem_blank_eeprom
-		fi
-	fi
-
-	if [ "x${oem_blank_eeprom}" = "xenable" ] ; then
-		ABI="ABI2"
-		conf_board="am335x_boneblack"
+		if [ "x${conf_board}" = "xam335x_evm" ] ; then
+			ABI="ABI2"
+			conf_board="am335x_boneblack"
+
+			if [ "${spl_name}" ] ; then
+				blank_SPL=$(cat ${TEMPDIR}/dl/${conf_bl_listfile} | grep "${ABI}:${conf_board}:SPL" | awk '{print $2}')
+				${dl_quiet} --directory-prefix="${TEMPDIR}/dl/" ${blank_SPL}
+				blank_SPL=${blank_SPL##*/}
+				echo "blank_SPL Bootloader: ${blank_SPL}"
+			else
+				unset blank_SPL
+			fi
 
-		if [ "${spl_name}" ] ; then
-			blank_SPL=$(cat ${TEMPDIR}/dl/${conf_bl_listfile} | grep "${ABI}:${conf_board}:SPL" | awk '{print $2}')
-			${dl_quiet} --directory-prefix="${TEMPDIR}/dl/" ${blank_SPL}
-			blank_SPL=${blank_SPL##*/}
-			echo "blank_SPL Bootloader: ${blank_SPL}"
-		else
-			unset blank_SPL
+			if [ "${boot_name}" ] ; then
+				blank_UBOOT=$(cat ${TEMPDIR}/dl/${conf_bl_listfile} | grep "${ABI}:${conf_board}:BOOT" | awk '{print $2}')
+				${dl} --directory-prefix="${TEMPDIR}/dl/" ${blank_UBOOT}
+				blank_UBOOT=${blank_UBOOT##*/}
+				echo "blank_UBOOT Bootloader: ${blank_UBOOT}"
+			else
+				unset blank_UBOOT
+			fi
 		fi
 
-		if [ "${boot_name}" ] ; then
-			blank_UBOOT=$(cat ${TEMPDIR}/dl/${conf_bl_listfile} | grep "${ABI}:${conf_board}:BOOT" | awk '{print $2}')
-			${dl} --directory-prefix="${TEMPDIR}/dl/" ${blank_UBOOT}
-			blank_UBOOT=${blank_UBOOT##*/}
-			echo "blank_UBOOT Bootloader: ${blank_UBOOT}"
-		else
-			unset blank_UBOOT
+		if [ "x${conf_board}" = "xbeagle_x15" ] ; then
+			ABI="ABI2"
+			conf_board="beagle_x15_flasher"
+
+			if [ "${spl_name}" ] ; then
+				blank_SPL=$(cat ${TEMPDIR}/dl/${conf_bl_listfile} | grep "${ABI}:${conf_board}:SPL" | awk '{print $2}')
+				${dl_quiet} --directory-prefix="${TEMPDIR}/dl/" ${blank_SPL}
+				blank_SPL=${blank_SPL##*/}
+				echo "blank_SPL Bootloader: ${blank_SPL}"
+			else
+				unset blank_SPL
+			fi
+
+			if [ "${boot_name}" ] ; then
+				blank_UBOOT=$(cat ${TEMPDIR}/dl/${conf_bl_listfile} | grep "${ABI}:${conf_board}:BOOT" | awk '{print $2}')
+				${dl} --directory-prefix="${TEMPDIR}/dl/" ${blank_UBOOT}
+				blank_UBOOT=${blank_UBOOT##*/}
+				echo "blank_UBOOT Bootloader: ${blank_UBOOT}"
+			else
+				unset blank_UBOOT
+			fi
 		fi
 	fi
 }