From 0ec7cad7b8681a0ede3ddd4c5dcd3481eeed0697 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Thu, 24 Jul 2014 18:22:58 -0500 Subject: [PATCH] mk_mmc.sh: conf_uboot_no_uenvcmd dont block conf_smart_uboot Signed-off-by: Robert Nelson --- mk_mmc.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/mk_mmc.sh b/mk_mmc.sh index e28157e..056db73 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -1519,14 +1519,16 @@ process_dtb_conf () { fi fi - if [ "${conf_uboot_use_uenvcmd}" ] ; then - conf_entrypt="uenvcmd" - else - if [ ! "x${conf_uboot_no_uenvcmd}" = "x" ] ; then - conf_entrypt="${conf_uboot_no_uenvcmd}" + if [ ! "x${conf_smart_uboot}" = "xenable" ] ; then + if [ "${conf_uboot_use_uenvcmd}" ] ; then + conf_entrypt="uenvcmd" else - echo "Error: [conf_uboot_no_uenvcmd] not defined, stopping..." - exit + if [ ! "x${conf_uboot_no_uenvcmd}" = "x" ] ; then + conf_entrypt="${conf_uboot_no_uenvcmd}" + else + echo "Error: [conf_uboot_no_uenvcmd] not defined, stopping..." + exit + fi fi fi }