From 90ebf28cef5d4cbc95afcc03f8edee0a258fd153 Mon Sep 17 00:00:00 2001 From: Rick Altherr Date: Tue, 19 Dec 2017 10:59:37 -0800 Subject: [PATCH] utils: update XRAY_BITREAD to specify part YAML flag bitread now requires a part YAML file as part of the rewrite to use libprjxray. Instead of changing every invocation directly, just add the flag to the existing environment variable as it is needed for all invocations. Signed-off-by: Rick Altherr Signed-off-by: Tim 'mithro' Ansell --- utils/environment.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/utils/environment.sh b/utils/environment.sh index 671d8ab0..a8e20cf5 100644 --- a/utils/environment.sh +++ b/utils/environment.sh @@ -10,8 +10,11 @@ export XRAY_DIR="$( dirname "$XRAY_UTILS_DIR" )" export XRAY_DATABASE_DIR="${XRAY_DIR}/database" export XRAY_TOOLS_DIR="${XRAY_DIR}/build/tools" +export XRAY_PART_YAML="${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/${XRAY_PART}.yaml" + + export XRAY_GENHEADER="${XRAY_UTILS_DIR}/genheader.sh" -export XRAY_BITREAD="${XRAY_TOOLS_DIR}/bitread" +export XRAY_BITREAD="${XRAY_TOOLS_DIR}/bitread --part_file ${XRAY_PART_YAML}" export XRAY_MERGEDB="bash ${XRAY_UTILS_DIR}/mergedb.sh" export XRAY_DBFIXUP="python3 ${XRAY_UTILS_DIR}/dbfixup.py" export XRAY_DBCHECK="bash ${XRAY_UTILS_DIR}/dbcheck.sh"