Skip to content

Commit fde61ba

Browse files
committed
dts-functions: board_config: rely on config parse
Ditch the mechanism for checking each supported platform manually and rely on parsing configurations instead. The config parser funtion shall print valid error codes. Only preparation for config parsing shall be done in board_config(). Signed-off-by: Mateusz Kusiak <[email protected]>
1 parent fc76f86 commit fde61ba

File tree

1 file changed

+18
-83
lines changed

1 file changed

+18
-83
lines changed

include/dts-functions.sh

Lines changed: 18 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -272,97 +272,32 @@ board_config() {
272272
tar xf "$BOARD_CONFIG_PATH.tar.gz" -C "$BOARD_CONFIG_PATH" --strip-components=1
273273

274274
echo "Checking if board is Dasharo compatible."
275+
# Handle special cases that need preprocessing or should fail early
275276
case "$SYSTEM_VENDOR" in
276-
"Notebook")
277-
case "$SYSTEM_MODEL" in
278-
"NV4XMB,ME,MZ")
279-
if ! parse_and_verify_config "$SYSTEM_VENDOR" "$SYSTEM_MODEL" "$BOARD_MODEL"; then
280-
return 1
281-
fi
282-
;;
283-
"NS50_70MU")
284-
if ! parse_and_verify_config "$SYSTEM_VENDOR" "$SYSTEM_MODEL" "$BOARD_MODEL"; then
285-
return 1
286-
fi
287-
;;
288-
"NS5x_NS7xPU")
289-
if ! parse_and_verify_config "$SYSTEM_VENDOR" "$SYSTEM_MODEL" "$BOARD_MODEL"; then
290-
return 1
291-
fi
292-
;;
293-
"NV4xPZ")
294-
if ! parse_and_verify_config "$SYSTEM_VENDOR" "$SYSTEM_MODEL" "$BOARD_MODEL"; then
295-
return 1
296-
fi
297-
;;
298-
"V54x_6x_TU")
299-
if check_if_dasharo; then
300-
BOARD_MODEL="$($DMIDECODE dump_var_mock -s baseboard-version)"
301-
else
302-
ask_for_model V540TU V560TU
303-
fi
304-
305-
if ! parse_and_verify_config "$SYSTEM_VENDOR" "$SYSTEM_MODEL" "$BOARD_MODEL"; then
306-
return 1
307-
fi
308-
;;
309-
"V5xTNC_TND_TNE")
310-
if check_if_dasharo; then
311-
BOARD_MODEL="$($DMIDECODE dump_var_mock -s baseboard-version)"
312-
else
313-
ask_for_model V540TNx V560TNx
314-
fi
315-
316-
if ! parse_and_verify_config "$SYSTEM_VENDOR" "$SYSTEM_MODEL" "$BOARD_MODEL"; then
317-
return 1
318-
fi
319-
;;
320-
*)
321-
print_error "Board model $SYSTEM_MODEL is currently not supported"
322-
return 1
323-
;;
324-
esac
325-
;;
326-
"NovaCustom" | "ASRock Industrial")
327-
if ! parse_and_verify_config "$SYSTEM_VENDOR" "$SYSTEM_MODEL" "$BOARD_MODEL"; then
328-
return 1
329-
fi
330-
;;
331-
"Micro-Star International Co., Ltd.")
332-
if ! parse_and_verify_config "$SYSTEM_VENDOR" "$SYSTEM_MODEL" "$BOARD_MODEL"; then
333-
return 1
334-
fi
335-
;;
336-
"Dell Inc.")
337-
if ! parse_and_verify_config "$SYSTEM_VENDOR" "$SYSTEM_MODEL" "$BOARD_MODEL"; then
338-
return 1
339-
fi
340-
;;
341-
"PC Engines")
342-
if ! parse_and_verify_config "$SYSTEM_VENDOR" "$SYSTEM_MODEL" "$BOARD_MODEL"; then
343-
return 1
344-
fi
345-
;;
346-
"HARDKERNEL")
347-
if ! parse_and_verify_config "$SYSTEM_VENDOR" "$SYSTEM_MODEL" "$BOARD_MODEL"; then
348-
return 1
349-
fi
350-
;;
351-
"QEMU" | "Emulation")
352-
if ! parse_and_verify_config "$SYSTEM_VENDOR" "$SYSTEM_MODEL" "$BOARD_MODEL"; then
353-
return 1
354-
fi
355-
;;
356277
"To Be Filled By O.E.M.")
357278
print_error "Cannot determine board vendor"
358279
return 1
359280
;;
360-
*)
361-
print_error "Board vendor: $SYSTEM_VENDOR is currently not supported"
362-
return 1
281+
"Notebook")
282+
if check_if_dasharo; then
283+
BOARD_MODEL="$($DMIDECODE dump_var_mock -s baseboard-version)"
284+
else
285+
case "$SYSTEM_MODEL" in
286+
"V54x_6x_TU")
287+
ask_for_model V540TU V560TU
288+
;;
289+
"V5xTNC_TND_TNE")
290+
ask_for_model V540TNx V560TNx
291+
;;
292+
esac
293+
fi
363294
;;
364295
esac
365296

297+
if ! parse_and_verify_config "$SYSTEM_VENDOR" "$SYSTEM_MODEL" "$BOARD_MODEL"; then
298+
return 1
299+
fi
300+
366301
rm -rf "$BOARD_CONFIG_PATH"
367302
}
368303

0 commit comments

Comments
 (0)