From c58c4a94d8183f8bebda3debedca2c2d34f57e21 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Thu, 20 Sep 2018 14:47:05 +0200
Subject: [PATCH] firmware: reuse SOURCE_PY_DIR where possible

---
 SConscript.firmware | 10 +++++-----
 emu.sh              |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/SConscript.firmware b/SConscript.firmware
index e7c956e53..492d6a6f1 100644
--- a/SConscript.firmware
+++ b/SConscript.firmware
@@ -276,12 +276,12 @@ SOURCE_TREZORHAL = [
 SOURCE_QSTR = SOURCE_MOD + SOURCE_MICROPYTHON + SOURCE_MICROPYTHON_SPEED
 
 # TODO: recursive Glob
-SOURCE_PY = Glob('src/*.py')
-SOURCE_PY.extend(Glob('src/*/*.py'))
-SOURCE_PY.extend(Glob('src/*/*/*.py'))
-SOURCE_PY.extend(Glob('src/*/*/*/*.py'))
-SOURCE_PY.extend(Glob('src/*/*/*/*/*.py'))
 SOURCE_PY_DIR = 'src/'
+SOURCE_PY = Glob(SOURCE_PY_DIR + '*.py')
+SOURCE_PY.extend(Glob(SOURCE_PY_DIR+'*/*.py'))
+SOURCE_PY.extend(Glob(SOURCE_PY_DIR+'*/*/*.py'))
+SOURCE_PY.extend(Glob(SOURCE_PY_DIR+'*/*/*/*.py'))
+SOURCE_PY.extend(Glob(SOURCE_PY_DIR+'*/*/*/*/*.py'))
 
 env = Environment(ENV=os.environ, CFLAGS='%s -DPRODUCTION=%s -DPYOPT=%s' % (ARGUMENTS.get('CFLAGS', ''), ARGUMENTS.get('PRODUCTION', '0'), PYOPT))
 
diff --git a/emu.sh b/emu.sh
index 19d4db65c..0eab3568e 100755
--- a/emu.sh
+++ b/emu.sh
@@ -7,10 +7,11 @@ PYOPT="${PYOPT:-1}"
 MAIN="${MAIN:-main.py}"
 BROWSER="${BROWSER:-chromium}"
 HEAPSIZE="${HEAPSIZE:-800K}"
+SOURCE_PY_DIR="${SOURCE_PY_DIR:-src}"
 
 ARGS="-O${PYOPT} -X heapsize=${HEAPSIZE}"
 
-cd `dirname $0`/src
+cd `dirname $0`/$SOURCE_PY_DIR
 
 case "$1" in
     "-d")