diff --git a/hwpack/omap5-uevm.conf b/hwpack/omap5-uevm.conf
new file mode 100644
index 0000000..61c7e0e
--- /dev/null
+++ b/hwpack/omap5-uevm.conf
@@ -0,0 +1,63 @@
+#!/bin/bash
+#        --dtb omap5-uevm (SVTRONICS OMAP5432 EVM:supported)
+
+#Bootloader:
+conf_board="omap5_uevm"
+conf_bl_http="https://rcn-ee.net/deb/tools/latest"
+conf_bl_listfile="bootloader-ng"
+
+#Bootloader Partition:
+conf_boot_fstype="fat"
+
+bootloader_location="fatfs_boot"
+spl_name="MLO"
+boot_name="u-boot.img"
+
+#Bootloader: u-boot features:
+
+#CONFIG_CMD_BOOTZ
+#bootz & zImage
+conf_uboot_CONFIG_CMD_BOOTZ=1
+
+#CONFIG_SUPPORT_RAW_INITRD
+#allows booting un-mkimage wrapped initrds
+conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
+
+#CONFIG_CMD_FS_GENERIC
+#allows using "load" over "fatload"/"ext2load"
+conf_uboot_CONFIG_CMD_FS_GENERIC=1
+
+#uenvcmd avaiable?
+conf_uboot_use_uenvcmd=1
+#conf_uboot_no_uenvcmd="loaduimage"
+
+#can the bootloader auto detect the device: (*.dtb)?
+uboot_fdt_auto_detection=1
+
+conf_uboot_use_bootpart=1
+
+#Kernel:
+#https://rcn-ee.net/deb/wheezy-armhf/LATEST-armv7-lpae
+kernel_subarch="armv7-lpae"
+kernel_repo="TESTING"
+
+usbnet_mem=""
+
+conf_swapsize_mb="2048"
+
+#Kernel: Bootloader Settings:
+conf_zreladdr="0x80008000"
+conf_loadaddr="0x82000000"
+conf_fdtaddr="0x80F80000"
+conf_initrdaddr="0x85600000"
+#conf_fdtfile="omap4-panda-es.dtb"
+#need_ti_connectivity_firmware=1
+
+#SYSTEM="video"
+SYSTEM="serial"
+
+SERIAL="ttyO2"
+SERIAL_CONSOLE="${SERIAL},115200n8"
+
+USE_KMS=1
+SERIAL_MODE=1
diff --git a/mk_mmc.sh b/mk_mmc.sh
index 05b4448..19576a4 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -345,12 +345,26 @@ boot_uenv_txt_template () {
 		mmcroot=FINAL_PART ro
 		mmcrootfstype=FINAL_FSTYPE rootwait fixrtc
 
-		loadkernel=${conf_fileload} mmc \${mmcdev}:\${mmcpart} ${conf_loadaddr} \${kernel_file}
-		loadinitrd=${conf_fileload} mmc \${mmcdev}:\${mmcpart} ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize}
-		loadfdt=${conf_fileload} mmc \${mmcdev}:\${mmcpart} ${conf_fdtaddr} /dtbs/\${fdtfile}
+	__EOF__
 
-		boot_fdt=run loadkernel; run loadinitrd; run loadfdt
+	if [ ${conf_uboot_use_bootpart} ] ; then
+		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
+			loadkernel=${conf_fileload} mmc \${bootpart} ${conf_loadaddr} \${kernel_file}
+			loadinitrd=${conf_fileload} mmc \${bootpart} ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize}
+			loadfdt=${conf_fileload} mmc \${bootpart} ${conf_fdtaddr} /dtbs/\${fdtfile}
+
+		__EOF__
+	else
+		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
+			loadkernel=${conf_fileload} mmc \${mmcdev}:\${mmcpart} ${conf_loadaddr} \${kernel_file}
+			loadinitrd=${conf_fileload} mmc \${mmcdev}:\${mmcpart} ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize}
+			loadfdt=${conf_fileload} mmc \${mmcdev}:\${mmcpart} ${conf_fdtaddr} /dtbs/\${fdtfile}
 
+		__EOF__
+	fi
+
+	cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
+		boot_fdt=run loadkernel; run loadinitrd; run loadfdt
 	__EOF__
 
 	cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
@@ -361,9 +375,26 @@ boot_uenv_txt_template () {
 
 		mmcroot=/dev/ram0 rw
 
-		loadkernel=${conf_fileload} mmc \${mmcdev}:\${mmcpart} ${conf_loadaddr} \${kernel_file}
-		loadinitrd=${conf_fileload} mmc \${mmcdev}:\${mmcpart} ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize}
-		loadfdt=${conf_fileload} mmc \${mmcdev}:\${mmcpart} ${conf_fdtaddr} /dtbs/\${fdtfile}
+	__EOF__
+
+	if [ ${conf_uboot_use_bootpart} ] ; then
+		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
+			loadkernel=${conf_fileload} mmc \${bootpart} ${conf_loadaddr} \${kernel_file}
+			loadinitrd=${conf_fileload} mmc \${bootpart} ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize}
+			loadfdt=${conf_fileload} mmc \${bootpart} ${conf_fdtaddr} /dtbs/\${fdtfile}
+
+		__EOF__
+
+	else
+		cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
+			loadkernel=${conf_fileload} mmc \${mmcdev}:\${mmcpart} ${conf_loadaddr} \${kernel_file}
+			loadinitrd=${conf_fileload} mmc \${mmcdev}:\${mmcpart} ${conf_initrdaddr} \${initrd_file}; setenv initrd_size \${filesize}
+			loadfdt=${conf_fileload} mmc \${mmcdev}:\${mmcpart} ${conf_fdtaddr} /dtbs/\${fdtfile}
+
+		__EOF__
+	fi
+
+	cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__
 
 		boot_fdt=run loadkernel; run loadinitrd; run loadfdt