From 97e9d7cad757f9f6d95c741f74f602963b002c0c Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Wed, 17 Apr 2013 17:16:50 -0500 Subject: [PATCH] beagle xm: make sure to enable need_ti_connectivity_firmware Signed-off-by: Robert Nelson --- hwpack/omap3-beagle-xm-v3.9.conf | 1 + hwpack/omap3-beagle-xm.conf | 1 + mk_mmc.sh | 11 ----------- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/hwpack/omap3-beagle-xm-v3.9.conf b/hwpack/omap3-beagle-xm-v3.9.conf index f9d7c98..c367e5e 100644 --- a/hwpack/omap3-beagle-xm-v3.9.conf +++ b/hwpack/omap3-beagle-xm-v3.9.conf @@ -35,6 +35,7 @@ conf_initrdaddr="0x81600000" conf_zreladdr="0x80008000" conf_fdtaddr="0x815f0000" conf_fdtfile= +need_ti_connectivity_firmware=1 SERIAL="ttyO2" SERIAL_CONSOLE="${SERIAL},115200n8" diff --git a/hwpack/omap3-beagle-xm.conf b/hwpack/omap3-beagle-xm.conf index 5a41aee..5d76329 100644 --- a/hwpack/omap3-beagle-xm.conf +++ b/hwpack/omap3-beagle-xm.conf @@ -35,6 +35,7 @@ conf_initrdaddr="0x81600000" conf_zreladdr="0x80008000" conf_fdtaddr="0x815f0000" conf_fdtfile= +need_ti_connectivity_firmware=1 SERIAL="ttyO2" SERIAL_CONSOLE="${SERIAL},115200n8" diff --git a/mk_mmc.sh b/mk_mmc.sh index 1498cbd..fbc72a1 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -776,16 +776,6 @@ function dl_am335_firmware { function dl_device_firmware { mkdir -p ${TEMPDIR}/firmware/ DL_WGET="wget --directory-prefix=${TEMPDIR}/firmware/" - case "${SYSTEM}" in - beagle_xm) - dl_linux_firmware - echo "-----------------------------" - echo "Adding Firmware for onboard WiFi/Bluetooth module" - echo "-----------------------------" - cp -r "${DIR}/dl/linux-firmware/ti-connectivity" ${TEMPDIR}/firmware/ - #${DL_WGET}ti-connectivity http://rcn-ee.net/firmware/ti/7.6.15_ble/WL1271L_BLE_Enabled_BTS_File/115K/TIInit_7.6.15.bts - ;; - esac if [ "${need_ti_connectivity_firmware}" ] ; then dl_linux_firmware @@ -1648,7 +1638,6 @@ function check_uboot_type { #just to disable the omapfb stuff.. USE_KMS=1 ;; - bone_dt|bone_dtb) echo "Note: [--dtb am335x-bone-serial] now replaces [--uboot bone_dtb]" source "${DIR}"/hwpack/am335x-bone-serial.conf