Skip to content

Commit 8c2709b

Browse files
committed
refactor(debos/flash): Assume dtb always present
All boards have a dtb now, drop conditionals. Signed-off-by: Loïc Minier <loic.minier@oss.qualcomm.com>
1 parent cf30764 commit 8c2709b

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

debos-recipes/qualcomm-linux-debian-flash.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -228,13 +228,13 @@ actions:
228228
skip_board=true
229229
echo "Skipping board {{ $board.name }}: not in target list"
230230
fi
231-
{{- if $board.dtb }}
232-
# set skip_board if board has a dtb and dtb isn't present
231+
232+
# set skip_board if board dtb isn't present
233233
if ! grep -Fxq "{{ $board.dtb }}" "${dtbs_file}"; then
234234
skip_board=true
235235
echo "Skipping board {{ $board.name }}: dtb not available"
236236
fi
237-
{{- end }}
237+
238238

239239
# unpack boot binaries
240240
mkdir -v build/{{ $board.name }}_boot-binaries
@@ -389,7 +389,6 @@ actions:
389389
fi
390390
{{- end }}
391391

392-
{{- if $board.dtb }}
393392
if [ "${skip_board}" = false ]; then
394393
# generate a dtb.bin FAT partition with just a single dtb for the
395394
# current board; long-term this should really be a set of dtbs and
@@ -410,7 +409,6 @@ actions:
410409
mcopy -vmp -i "${dtb_bin}" "build/{{ $board.dtb }}" \
411410
::/combined-dtb.dtb
412411
fi
413-
{{- end }}
414412
{{- end }}
415413

416414
# cleanup

0 commit comments

Comments
 (0)