diff options
| author | Daniel Boulby <daniel.boulby@arm.com> | 2022-07-05 11:03:37 +0100 |
|---|---|---|
| committer | Daniel Boulby <daniel.boulby@arm.com> | 2022-07-05 11:03:37 +0100 |
| commit | a2858260f67b25d65f82eb4bf0cfe5cb06127ed4 (patch) | |
| tree | 1a24d029d57da693eb9a00a3919e6bd4d51dbd21 /tools | |
| parent | e68eb35676704c9f6de08ed3454790003acc76af (diff) | |
fix(build): sp_layout gen for concurrent builds
Move renaming of the primary dts file for ivy partitions according
to if the shim is present out of the if else so it always occurs.
Signed-off-by: Daniel Boulby <daniel.boulby@arm.com>
Change-Id: Ib018e7bc9872520921fe7c7684ec968cbe786d52
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/generate_json/generate_json.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/generate_json/generate_json.sh b/tools/generate_json/generate_json.sh index 0485862..8a14517 100755 --- a/tools/generate_json/generate_json.sh +++ b/tools/generate_json/generate_json.sh @@ -20,18 +20,18 @@ GENERATED_JSON=$2/sp_layout.json primary_dts="$1.dts" +if [ "$1" == "ivy" ]; then + if [ "$3" == "1" ]; then + primary_dts="ivy-sel1.dts" + else + primary_dts="ivy-sel0.dts" + fi +fi + # Remove closing bracket and add comma if the dts is already present. if [ ! -f "$GENERATED_JSON" ]; then echo -e "{\n" >> "$GENERATED_JSON" else - if [ "$1" == "ivy" ]; then - if [ "$3" == "1" ]; then - primary_dts="ivy-sel1.dts" - else - primary_dts="ivy-sel0.dts" - fi - fi - if [ $(grep "$primary_dts" "$GENERATED_JSON" | wc -l) -eq "0" ]; then sed -i '$d' "$GENERATED_JSON" sed -i '$ s/$/,/' "$GENERATED_JSON" |