diff --git a/hwpack/omap4-panda.conf b/hwpack/omap4-panda.conf
index a72fa7d..27abde1 100644
--- a/hwpack/omap4-panda.conf
+++ b/hwpack/omap4-panda.conf
@@ -2,35 +2,41 @@
 #Reference: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=tree;f=arch/arm/boot/dts;hb=refs/tags/v3.7
 #        --dtb omap4-panda (PandaBoard:supported)
 
-SYSTEM="panda"
-
 #Bootloader:
 conf_board="PANDABOARD"
-conf_bl_http="http://rcn-ee.net/deb/tools/latest/"
+conf_bl_http="http://rcn-ee.net/deb/tools/latest"
 conf_bl_listfile="bootloader-ng"
 
+#Bootloader Partition:
 bootloader_location="fatfs_boot"
 boot_partition_size="100"
 spl_name="MLO"
 boot_name="u-boot.img"
 
+#Bootloader: u-boot settings
 boot_image="bootz"
 boot_script="uEnv.txt"
 boot_fstype="fat"
-uboot_SCRIPT_ENTRY="loaduimage"
-uboot_CMD_LOAD="fatload"
+uboot_SCRIPT_ENTRY="uenvcmd"
+uboot_CMD_LOAD="load"
 
+#Kernel:
 #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap
 kernel_subarch="omap"
 kernel_repo="STABLE"
 
 usbnet_mem="32768"
 
-conf_loadaddr="0x80300000"
-conf_initrdaddr="0x81600000"
+#Kernel: Bootloader Settings:
 conf_zreladdr="0x80008000"
+conf_loadaddr="0x80300000"
 conf_fdtaddr="0x815f0000"
+conf_initrdaddr="0x81600000"
 conf_fdtfile=
+need_ti_connectivity_firmware=1
+
+SYSTEM="video"
+#SYSTEM="serial"
 
 SERIAL="ttyO2"
 SERIAL_CONSOLE="${SERIAL},115200n8"
diff --git a/mk_mmc.sh b/mk_mmc.sh
index 083e569..385011f 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -485,7 +485,7 @@ function boot_uenv_txt_template {
 			expansion_args=setenv expansion buddy=\${buddy} buddy2=\${buddy2}
 		__EOF__
 		;;
-	crane|igepv2|mx53loco|panda|panda_es|panda_dtb|panda_es_dtb|mx51evk|mx6qsabrelite)
+	crane|igepv2|mx53loco|panda_es|panda_dtb|panda_es_dtb|mx51evk|mx6qsabrelite)
 		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
 			optargs=VIDEO_CONSOLE
 			expansion_args=setenv expansion
@@ -773,7 +773,7 @@ function dl_device_firmware {
 	mkdir -p ${TEMPDIR}/firmware/
 	DL_WGET="wget --directory-prefix=${TEMPDIR}/firmware/"
 	case "${SYSTEM}" in
-	beagle_xm|panda|panda_dtb|panda_es|panda_es_dtb)
+	beagle_xm|panda_dtb|panda_es|panda_es_dtb)
 		dl_linux_firmware
 		echo "-----------------------------"
 		echo "Adding Firmware for onboard WiFi/Bluetooth module"
@@ -783,6 +783,14 @@ function dl_device_firmware {
 		;;
 	esac
 
+	if [ "${need_ti_connectivity_firmware}" ] ; then
+		dl_linux_firmware
+		echo "-----------------------------"
+		echo "Adding Firmware for onboard WiFi/Bluetooth module"
+		echo "-----------------------------"
+		cp -r "${DIR}/dl/linux-firmware/ti-connectivity" ${TEMPDIR}/firmware/
+	fi
+
 	if [ "${need_am335x_firmware}" ] ; then
 		dl_am335_firmware
 		echo "-----------------------------"