rk322x-config: shformat + fix 2 shellcheck errors
This commit is contained in:
Ricardo Pardini
Igor
parent
19226a9c27
commit
1ff8356058
@ -213,7 +213,7 @@ function select_wifi_module() {
|
||||
|
||||
MENU_TITLE="${BOARD_INFO}Please choose the wifi module suitable for your configuration\n"
|
||||
MENU_CMD=(dialog --colors --backtitle "$BACKTITLE" --title "$TITLE" --default-item "0" --menu "$MENU_TITLE" 24 0 20)
|
||||
SELECTION=$("${MENU_CMD[@]}" "${DIALOG_ENTRIES[@]}" 2>&1 >/dev/tty)
|
||||
SELECTION=$("${MENU_CMD[@]}" "${DIALOG_ENTRIES[@]}" 2>&1 > /dev/tty)
|
||||
|
||||
if [[ $? -ne 0 ]]; then
|
||||
return 1
|
||||
@ -264,7 +264,6 @@ function apply_wifi_blacklist() {
|
||||
|
||||
fi
|
||||
|
||||
|
||||
# unsupported wifi_chip_type: blacklist all known wifi
|
||||
# modules if the blacklist file exists. If the blacklist file does not exist just skip over
|
||||
if [ -z $WIFI_MODULE ]; then
|
||||
@ -283,188 +282,183 @@ function apply_wifi_blacklist() {
|
||||
|
||||
function select_soc() {
|
||||
|
||||
declare -a DIALOG_ENTRIES
|
||||
declare -a DIALOG_ENTRIES
|
||||
|
||||
# SoC section
|
||||
# SoC section
|
||||
|
||||
SELECTION="0"
|
||||
[[ "$CHIP_TYPE" = "RK3229" ]] && SELECTION="2"
|
||||
SELECTION="0"
|
||||
[[ "$CHIP_TYPE" = "RK3229" ]] && SELECTION="2"
|
||||
|
||||
DIALOG_ENTRIES=("0" "RK3228A (max 1.2Ghz)")
|
||||
DIALOG_ENTRIES+=("1" "RK3228B (max 1.4Ghz)")
|
||||
DIALOG_ENTRIES+=("2" "RK3229 (max 1.4Ghz)")
|
||||
DIALOG_ENTRIES=("0" "RK3228A (max 1.2Ghz)")
|
||||
DIALOG_ENTRIES+=("1" "RK3228B (max 1.4Ghz)")
|
||||
DIALOG_ENTRIES+=("2" "RK3229 (max 1.4Ghz)")
|
||||
|
||||
MENU_TITLE="${BOARD_INFO}Select the SoC type\n"
|
||||
MENU_TITLE="${BOARD_INFO}Select the SoC type\n"
|
||||
|
||||
MENU_CMD=(dialog --colors --backtitle "$BACKTITLE" --title "$TITLE" --default-item "$SELECTION" --menu "$MENU_TITLE" 24 0 20)
|
||||
MENU_CMD=(dialog --colors --backtitle "$BACKTITLE" --title "$TITLE" --default-item "$SELECTION" --menu "$MENU_TITLE" 24 0 20)
|
||||
|
||||
SELECTION=$("${MENU_CMD[@]}" "${DIALOG_ENTRIES[@]}" 2>&1 >/dev/tty)
|
||||
SELECTION=$("${MENU_CMD[@]}" "${DIALOG_ENTRIES[@]}" 2>&1 > /dev/tty)
|
||||
|
||||
RET=$?
|
||||
RET=$?
|
||||
|
||||
if [ "$RET" -eq 1 ]; then
|
||||
echo "Cancelled"
|
||||
return 1
|
||||
fi
|
||||
if [ "$RET" -eq 1 ]; then
|
||||
echo "Cancelled"
|
||||
return 1
|
||||
fi
|
||||
|
||||
if [ "$RET" -ne 0 ]; then
|
||||
echo "dialog utility returned an unexpected error code: $RET"
|
||||
return 1
|
||||
fi
|
||||
if [ "$RET" -ne 0 ]; then
|
||||
echo "dialog utility returned an unexpected error code: $RET"
|
||||
return 1
|
||||
fi
|
||||
|
||||
[[ "$SELECTION" -eq 0 ]] && SELECTION=""
|
||||
[[ "$SELECTION" -eq 1 ]] && SELECTION="cpu-hs"
|
||||
[[ "$SELECTION" -eq 2 ]] && SELECTION="cpu-hs"
|
||||
[[ "$SELECTION" -eq 0 ]] && SELECTION=""
|
||||
[[ "$SELECTION" -eq 1 ]] && SELECTION="cpu-hs"
|
||||
[[ "$SELECTION" -eq 2 ]] && SELECTION="cpu-hs"
|
||||
|
||||
echo $SELECTION
|
||||
|
||||
return 0
|
||||
echo $SELECTION
|
||||
|
||||
return 0
|
||||
|
||||
}
|
||||
|
||||
function select_flash() {
|
||||
|
||||
declare -a DIALOG_ENTRIES
|
||||
declare -a DIALOG_ENTRIES
|
||||
|
||||
SELECTION="emmc-nand"
|
||||
[[ "$FLASH_TYPE" = "eMMC" ]] && SELECTION="emmc"
|
||||
[[ "$FLASH_TYPE" = "NAND" ]] && SELECTION="nand"
|
||||
SELECTION="emmc-nand"
|
||||
[[ "$FLASH_TYPE" = "eMMC" ]] && SELECTION="emmc"
|
||||
[[ "$FLASH_TYPE" = "NAND" ]] && SELECTION="nand"
|
||||
|
||||
for KEY in "${!DT_FLASH_OVERLAYS[@]}"; do
|
||||
DIALOG_ENTRIES+=($KEY "${DT_FLASH_OVERLAYS[$KEY]}")
|
||||
done
|
||||
for KEY in "${!DT_FLASH_OVERLAYS[@]}"; do
|
||||
DIALOG_ENTRIES+=($KEY "${DT_FLASH_OVERLAYS[$KEY]}")
|
||||
done
|
||||
|
||||
MENU_TITLE="${BOARD_INFO}Select the internal flash type\n"
|
||||
MENU_TITLE="${BOARD_INFO}Select the internal flash type\n"
|
||||
|
||||
MENU_CMD=(dialog --colors --backtitle "$BACKTITLE" --title "$TITLE" --default-item "$SELECTION" --menu "$MENU_TITLE" 24 0 20)
|
||||
MENU_CMD=(dialog --colors --backtitle "$BACKTITLE" --title "$TITLE" --default-item "$SELECTION" --menu "$MENU_TITLE" 24 0 20)
|
||||
|
||||
SELECTION=$("${MENU_CMD[@]}" "${DIALOG_ENTRIES[@]}" 2>&1 >/dev/tty)
|
||||
SELECTION=$("${MENU_CMD[@]}" "${DIALOG_ENTRIES[@]}" 2>&1 > /dev/tty)
|
||||
|
||||
RET=$?
|
||||
RET=$?
|
||||
|
||||
if [ "$RET" -eq 1 ]; then
|
||||
echo "Cancelled"
|
||||
return 1
|
||||
fi
|
||||
if [ "$RET" -eq 1 ]; then
|
||||
echo "Cancelled"
|
||||
return 1
|
||||
fi
|
||||
|
||||
if [ "$RET" -ne 0 ]; then
|
||||
echo "dialog utility returned an unexpected error code: $RET"
|
||||
return 1
|
||||
fi
|
||||
if [ "$RET" -ne 0 ]; then
|
||||
echo "dialog utility returned an unexpected error code: $RET"
|
||||
return 1
|
||||
fi
|
||||
|
||||
echo $SELECTION
|
||||
echo $SELECTION
|
||||
|
||||
return 0
|
||||
return 0
|
||||
|
||||
}
|
||||
|
||||
function select_emmc_options() {
|
||||
|
||||
declare -a DIALOG_ENTRIES
|
||||
declare -a DIALOG_ENTRIES
|
||||
|
||||
for KEY in "${DT_EMMC_OVERLAYS_ORDER[@]}"; do
|
||||
DIALOG_ENTRIES+=($KEY "${DT_EMMC_OVERLAYS[$KEY]}" "off")
|
||||
done
|
||||
for KEY in "${DT_EMMC_OVERLAYS_ORDER[@]}"; do
|
||||
DIALOG_ENTRIES+=($KEY "${DT_EMMC_OVERLAYS[$KEY]}" "off")
|
||||
done
|
||||
|
||||
MENU_TITLE="${BOARD_INFO}${EMMC_OPTIONS_WARNING}"
|
||||
MENU_TITLE="${BOARD_INFO}${EMMC_OPTIONS_WARNING}"
|
||||
|
||||
MENU_CMD=(dialog --colors --backtitle "$BACKTITLE" --title "$TITLE" --checklist "$MENU_TITLE" 28 0 56)
|
||||
MENU_CMD=(dialog --colors --backtitle "$BACKTITLE" --title "$TITLE" --checklist "$MENU_TITLE" 28 0 56)
|
||||
|
||||
SELECTION=$("${MENU_CMD[@]}" "${DIALOG_ENTRIES[@]}" 2>&1 >/dev/tty)
|
||||
SELECTION=$("${MENU_CMD[@]}" "${DIALOG_ENTRIES[@]}" 2>&1 > /dev/tty)
|
||||
|
||||
RET=$?
|
||||
RET=$?
|
||||
|
||||
if [ "$RET" -eq 1 ]; then
|
||||
echo "Cancelled"
|
||||
return 1
|
||||
fi
|
||||
if [ "$RET" -eq 1 ]; then
|
||||
echo "Cancelled"
|
||||
return 1
|
||||
fi
|
||||
|
||||
if [ "$RET" -ne 0 ]; then
|
||||
echo "dialog utility returned an unexpected error code: $RET"
|
||||
return 1
|
||||
fi
|
||||
if [ "$RET" -ne 0 ]; then
|
||||
echo "dialog utility returned an unexpected error code: $RET"
|
||||
return 1
|
||||
fi
|
||||
|
||||
echo $SELECTION
|
||||
|
||||
return 0
|
||||
echo $SELECTION
|
||||
|
||||
return 0
|
||||
|
||||
}
|
||||
|
||||
function select_ddr() {
|
||||
|
||||
declare -a DIALOG_ENTRIES
|
||||
declare -a DIALOG_ENTRIES
|
||||
|
||||
# DDR section
|
||||
# DDR section
|
||||
|
||||
SELECTION="default"
|
||||
SELECTION="default"
|
||||
|
||||
for KEY in "${DT_DDR_OVERLAYS_ORDER[@]}"; do
|
||||
DIALOG_ENTRIES+=($KEY "${DT_DDR_OVERLAYS[$KEY]}")
|
||||
done
|
||||
for KEY in "${DT_DDR_OVERLAYS_ORDER[@]}"; do
|
||||
DIALOG_ENTRIES+=($KEY "${DT_DDR_OVERLAYS[$KEY]}")
|
||||
done
|
||||
|
||||
MENU_TITLE="${BOARD_INFO}Select the DDR type and speed\n${HANG_OPTIONS_WARNING}"
|
||||
MENU_TITLE="${BOARD_INFO}Select the DDR type and speed\n${HANG_OPTIONS_WARNING}"
|
||||
|
||||
MENU_CMD=(dialog --colors --backtitle "$BACKTITLE" --title "$TITLE" --default-item "$SELECTION" --menu "$MENU_TITLE" 24 0 20)
|
||||
MENU_CMD=(dialog --colors --backtitle "$BACKTITLE" --title "$TITLE" --default-item "$SELECTION" --menu "$MENU_TITLE" 24 0 20)
|
||||
|
||||
SELECTION=$("${MENU_CMD[@]}" "${DIALOG_ENTRIES[@]}" 2>&1 >/dev/tty)
|
||||
SELECTION=$("${MENU_CMD[@]}" "${DIALOG_ENTRIES[@]}" 2>&1 > /dev/tty)
|
||||
|
||||
RET=$?
|
||||
RET=$?
|
||||
|
||||
if [ "$RET" -eq 1 ]; then
|
||||
echo "Cancelled"
|
||||
return 1
|
||||
fi
|
||||
if [ "$RET" -eq 1 ]; then
|
||||
echo "Cancelled"
|
||||
return 1
|
||||
fi
|
||||
|
||||
if [ "$RET" -ne 0 ]; then
|
||||
echo "dialog utility returned an unexpected error code: $RET"
|
||||
return 1
|
||||
fi
|
||||
if [ "$RET" -ne 0 ]; then
|
||||
echo "dialog utility returned an unexpected error code: $RET"
|
||||
return 1
|
||||
fi
|
||||
|
||||
[[ $SELECTION = "default" ]] && SELECTION=""
|
||||
[[ $SELECTION = "default" ]] && SELECTION=""
|
||||
|
||||
echo $SELECTION
|
||||
|
||||
return 0
|
||||
echo $SELECTION
|
||||
|
||||
return 0
|
||||
|
||||
}
|
||||
|
||||
function select_led_configuration() {
|
||||
|
||||
declare -a DIALOG_ENTRIES
|
||||
declare -a DIALOG_ENTRIES
|
||||
|
||||
for KEY in "${DT_LED_OVERLAYS_ORDER[@]}"; do
|
||||
DIALOG_ENTRIES+=($KEY "${DT_LED_OVERLAYS[$KEY]}")
|
||||
done
|
||||
for KEY in "${DT_LED_OVERLAYS_ORDER[@]}"; do
|
||||
DIALOG_ENTRIES+=($KEY "${DT_LED_OVERLAYS[$KEY]}")
|
||||
done
|
||||
|
||||
MENU_TITLE="${BOARD_INFO}${NOTE_LED_GPIO_SELECTION}${HANG_OPTIONS_WARNING}\n"
|
||||
MENU_TITLE="${BOARD_INFO}${NOTE_LED_GPIO_SELECTION}${HANG_OPTIONS_WARNING}\n"
|
||||
|
||||
MENU_CMD=(dialog --colors --backtitle "$BACKTITLE" --title "$TITLE" --default-item "$SELECTION" --menu "$MENU_TITLE" 24 0 20)
|
||||
MENU_CMD=(dialog --colors --backtitle "$BACKTITLE" --title "$TITLE" --default-item "$SELECTION" --menu "$MENU_TITLE" 24 0 20)
|
||||
|
||||
SELECTION=$("${MENU_CMD[@]}" "${DIALOG_ENTRIES[@]}" 2>&1 >/dev/tty)
|
||||
SELECTION=$("${MENU_CMD[@]}" "${DIALOG_ENTRIES[@]}" 2>&1 > /dev/tty)
|
||||
|
||||
RET=$?
|
||||
RET=$?
|
||||
|
||||
if [ "$RET" -eq 1 ]; then
|
||||
echo "Cancelled"
|
||||
return 1
|
||||
fi
|
||||
if [ "$RET" -eq 1 ]; then
|
||||
echo "Cancelled"
|
||||
return 1
|
||||
fi
|
||||
|
||||
if [ "$RET" -ne 0 ]; then
|
||||
echo "dialog utility returned an unexpected error code: $RET"
|
||||
return 1
|
||||
fi
|
||||
if [ "$RET" -ne 0 ]; then
|
||||
echo "dialog utility returned an unexpected error code: $RET"
|
||||
return 1
|
||||
fi
|
||||
|
||||
echo $SELECTION
|
||||
|
||||
return 0
|
||||
echo $SELECTION
|
||||
|
||||
return 0
|
||||
|
||||
}
|
||||
|
||||
|
||||
# ----- Entry point -----
|
||||
|
||||
USER_ID=$(id -u)
|
||||
@ -510,8 +504,8 @@ SELECTION=$(select_flash) || exit 1
|
||||
DT_OVERLAYS_TO_APPLY+=($SELECTION)
|
||||
|
||||
if [[ "$SELECTION" = "emmc" ]]; then
|
||||
SELECTION=$(select_emmc_options) || exit 1
|
||||
DT_OVERLAYS_TO_APPLY+=($SELECTION)
|
||||
SELECTION=$(select_emmc_options) || exit 1
|
||||
DT_OVERLAYS_TO_APPLY+=($SELECTION)
|
||||
fi
|
||||
|
||||
SELECTION=$(select_ddr) || exit 1
|
||||
@ -539,7 +533,7 @@ if [ $? -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "overlays=${DT_OVERLAYS_TO_APPLY[@]}" >> $ARMBIAN_ENV_TXT
|
||||
echo "overlays=${DT_OVERLAYS_TO_APPLY[*]}" >> $ARMBIAN_ENV_TXT
|
||||
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "An error occurred while adding overlays entry in $ARMBIAN_ENV_TXT"
|
||||
@ -576,7 +570,7 @@ fi
|
||||
echo ""
|
||||
echo ""
|
||||
echo "Device tree overlays enabled in ${ARMBIAN_ENV_TXT}:"
|
||||
echo "overlays=${DT_OVERLAYS_TO_APPLY[@]}"
|
||||
echo "overlays=${DT_OVERLAYS_TO_APPLY[*]}"
|
||||
|
||||
# Print the outcome of wifi chip selection only with legacy kernel
|
||||
# Mainline kernel is supposed to work ok by itself with hardware recognition
|
||||
|
||||
Loading…
Reference in New Issue
Block a user