utils: Move URAY_BITREAD to environment.sh

Signed-off-by: Tomasz Michalak <tmichalak@antmicro.com>

settings/zynqusp.sh

diff --git a/settings/zynqusp.sh b/settings/zynqusp.sh
index fbde66b..729e43c 100644
--- a/settings/zynqusp.sh
+++ b/settings/zynqusp.sh
@@ -23,4 +23,3 @@
 export URAY_PIN_03="B9"
 
 source $(dirname ${BASH_SOURCE[0]})/../utils/environment.sh
-export URAY_BITREAD="${URAY_TOOLS_DIR}/bitread --part_file ${URAY_PART_YAML} --architecture UltraScalePlus"

utils/environment.sh

diff --git a/utils/environment.sh b/utils/environment.sh
index 863b05e..3a820d1 100644
--- a/utils/environment.sh
+++ b/utils/environment.sh
@@ -22,7 +22,7 @@
 
 # tools
 export URAY_GENHEADER="${URAY_UTILS_DIR}/genheader.sh"
-export URAY_BITREAD="${URAY_TOOLS_DIR}/bitread --part_file ${URAY_PART_YAML}"
+export URAY_BITREAD="${URAY_TOOLS_DIR}/bitread --part_file ${URAY_PART_YAML} --architecture ${URAY_ARCH}"
 export URAY_MERGEDB="bash ${URAY_UTILS_DIR}/mergedb.sh"
 export URAY_DBFIXUP="python3 ${URAY_UTILS_DIR}/dbfixup.py"
 export URAY_MASKMERGE="bash ${URAY_UTILS_DIR}/maskmerge.sh"