From 1b983ba044244962e94f2a2b20835114bd3892c1 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Tue, 19 Jul 2016 09:09:09 -0500
Subject: [PATCH] sdcard: x15 use the correct flasher
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
tools/setup_sdcard.sh | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/tools/setup_sdcard.sh b/tools/setup_sdcard.sh
index 229c3184f..ca5e5743a 100755
--- a/tools/setup_sdcard.sh
+++ b/tools/setup_sdcard.sh
@@ -1168,13 +1168,8 @@ populate_rootfs () {
if [ "x${usb_flasher}" = "xenable" ] ; then
echo "cmdline=init=/opt/scripts/tools/eMMC/init-eMMC-flasher-from-usb-media.sh" >> ${wfile}
elif [ "x${emmc_flasher}" = "xenable" ] ; then
- if [ "x${conf_board}" = "xbeagle_x15" ] ; then
- echo "##enable x15: eMMC Flasher:" >> ${wfile}
- echo "cmdline=init=/opt/scripts/tools/eMMC/init-eMMC-flasher-v3-x15_b1.sh" >> ${wfile}
- else
- echo "##enable Generic eMMC Flasher:" >> ${wfile}
- echo "cmdline=init=/opt/scripts/tools/eMMC/init-eMMC-flasher-v3.sh" >> ${wfile}
- fi
+ echo "##enable Generic eMMC Flasher:" >> ${wfile}
+ echo "cmdline=init=/opt/scripts/tools/eMMC/init-eMMC-flasher-v3.sh" >> ${wfile}
elif [ "x${bbg_flasher}" = "xenable" ] ; then
echo "##enable BBG: eMMC Flasher:" >> ${wfile}
echo "cmdline=init=/opt/scripts/tools/eMMC/init-eMMC-flasher-v3-bbg.sh" >> ${wfile}
@@ -1197,8 +1192,13 @@ populate_rootfs () {
if [ "x${usb_flasher}" = "xenable" ] ; then
echo "cmdline=init=/opt/scripts/tools/eMMC/init-eMMC-flasher-from-usb-media.sh" >> ${wfile}
elif [ "x${emmc_flasher}" = "xenable" ] ; then
- echo "##enable Generic eMMC Flasher:" >> ${wfile}
- echo "cmdline=init=/opt/scripts/tools/eMMC/init-eMMC-flasher-v3.sh" >> ${wfile}
+ if [ "x${conf_board}" = "xbeagle_x15" ] ; then
+ echo "##enable x15: eMMC Flasher:" >> ${wfile}
+ echo "cmdline=init=/opt/scripts/tools/eMMC/init-eMMC-flasher-v3-x15_b1.sh" >> ${wfile}
+ else
+ echo "##enable Generic eMMC Flasher:" >> ${wfile}
+ echo "cmdline=init=/opt/scripts/tools/eMMC/init-eMMC-flasher-v3.sh" >> ${wfile}
+ fi
elif [ "x${a335_flasher}" = "xenable" ] ; then
echo "##enable a335: eeprom Flasher:" >> ${wfile}
echo "cmdline=init=/opt/scripts/tools/eMMC/init-eMMC-flasher-a335.sh" >> ${wfile}
--
GitLab