From f9c6581552d666483e382d33845a5c0fc7639be5 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> Date: Wed, 4 Jan 2017 11:28:40 -0600 Subject: [PATCH] sdcard: still want the options listed Signed-off-by: Robert Nelson <robertcnelson@gmail.com> --- tools/setup_sdcard.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/setup_sdcard.sh b/tools/setup_sdcard.sh index 488429b61..34cbd8ebd 100755 --- a/tools/setup_sdcard.sh +++ b/tools/setup_sdcard.sh @@ -1134,7 +1134,12 @@ populate_rootfs () { if [ ! "x${dtb}" = "x" ] ; then echo "dtb=${dtb}" >> ${wfile} else - echo "#dtb=" >> ${wfile} + + if [ ! "x${forced_dtb}" = "x" ] ; then + echo "dtb=${forced_dtb}" >> ${wfile} + else + echo "#dtb=" >> ${wfile} + fi if [ "x${conf_board}" = "xam335x_boneblack" ] || [ "x${conf_board}" = "xam335x_evm" ] || [ "x${conf_board}" = "xam335x_blank_bbbw" ] ; then echo "" >> ${wfile} @@ -1887,7 +1892,7 @@ while [ ! -z "$1" ] ; do ;; --force-device-tree) checkparm $2 - dtb="$2" + forced_dtb="$2" ;; esac shift -- GitLab