Rename output directory, patch flash script
- Rename output directory from imx8m_phanbell=>imx8mm_columbia
- Update flash script with new output path, disable reboot-bootloader
until it's implemented in u-boot
- Remove imx-board-wlan (QCA chip not present in columbia)
Change-Id: Ib2a83a46f7d8f8fb1ea4e4680a29b124c0ca3d0c
diff --git a/flash.sh b/flash.sh
index 652d225..e17bcb5 100755
--- a/flash.sh
+++ b/flash.sh
@@ -53,7 +53,7 @@
if [ -e ${SCRIPT_DIR}/boot_${USERSPACE_ARCH}.img ]; then
PRODUCT_OUT=${SCRIPT_DIR}
else
- PRODUCT_OUT=${PRODUCT_OUT:=${ROOTDIR}/out/target/product/imx8m_phanbell}
+ PRODUCT_OUT=${PRODUCT_OUT:=${ROOTDIR}/out/target/product/imx8mm_columbia}
fi
# Figure out which partition map we need based upon fastboot vars
@@ -69,13 +69,13 @@
done
# Flash bootloader
-try ${FASTBOOT_CMD} flash bootloader0 ${PRODUCT_OUT}/u-boot.imx
-try ${FASTBOOT_CMD} reboot-bootloader
+try ${FASTBOOT_CMD} flash bootloader ${PRODUCT_OUT}/u-boot.imx
+# try ${FASTBOOT_CMD} reboot-bootloader
sleep 3
# Flash partition table
try ${FASTBOOT_CMD} flash gpt ${PRODUCT_OUT}/${PART_IMAGE}
-try ${FASTBOOT_CMD} reboot-bootloader
+# try ${FASTBOOT_CMD} reboot-bootloader
sleep 3
# Flash filesystems
diff --git a/packages.mk b/packages.mk
index 96a0fcd..98f0b89 100644
--- a/packages.mk
+++ b/packages.mk
@@ -33,6 +33,5 @@
imx-vpuwrap imx-gst-plugins-bad))
$(eval $(call make-pbuilder-bsp-package-target,imx-board-tools,packages/imx-board-tools))
$(eval $(call make-pbuilder-bsp-package-target,imx-board-audio,packages/imx-board-audio))
-$(eval $(call make-pbuilder-bsp-package-target,imx-board-wlan,imx-board-wlan,linux-imx))
$(eval $(call make-pbuilder-bsp-package-target,bluez-imx,bluez-imx))
$(eval $(call make-pbuilder-bsp-package-target,meta-enterprise,packages/meta-enterprise))
diff --git a/project.sh b/project.sh
index fd4b85b..b9ff2e7 100644
--- a/project.sh
+++ b/project.sh
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-export PROJECT_NAME=imx8m_phanbell
+export PROJECT_NAME=imx8mm_columbia
export PLATFORM=imx
export BOARD_NAME=enterprise
