Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rk322x/edge 6.5: enable Makefile Autopatcher, remove Makefile patches #5768

Merged
merged 3 commits into from
Oct 3, 2023
Merged

rk322x/edge 6.5: enable Makefile Autopatcher, remove Makefile patches #5768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b35c2e2
`rk322x-config`: shformat + fix 2 shellcheck errors
rpardini Oct 2, 2023
43b30fc
`rk322x`/`edge` 6.5: update .config, no changes
rpardini Oct 2, 2023
3385728
`rk322x`/`edge` 6.5: enable Makefile Autopatcher, remove Makefile pat…
rpardini Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 4 additions & 7 deletions config/kernel/linux-rk322x-edge.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 6.5.4 Kernel Configuration
# Linux/arm 6.5.5 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (Ubuntu 11.3.0-1ubuntu1~22.04) 11.3.0"
CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0"
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=110300
CONFIG_GCC_VERSION=110400
CONFIG_CLANG_VERSION=0
CONFIG_AS_IS_GNU=y
CONFIG_AS_VERSION=23800
CONFIG_LD_IS_BFD=y
CONFIG_LD_VERSION=23800
CONFIG_LLD_VERSION=0
CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
CONFIG_PAHOLE_VERSION=122
CONFIG_PAHOLE_VERSION=125
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_TABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y
Expand Down Expand Up @@ -1356,7 +1354,6 @@ CONFIG_BRIDGE_EBT_SNAT=m
CONFIG_BRIDGE_EBT_LOG=m
CONFIG_BRIDGE_EBT_NFLOG=m
CONFIG_BPFILTER=y
CONFIG_BPFILTER_UMH=m
CONFIG_IP_DCCP=m
CONFIG_INET_DCCP_DIAG=m

Expand Down
220 changes: 107 additions & 113 deletions packages/bsp/rk322x/rk322x-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -283,188 +282,183 @@ function apply_wifi_blacklist() {

function select_soc() {

declare -a DIALOG_ENTRIES

# SoC section
declare -a DIALOG_ENTRIES

SELECTION="0"
[[ "$CHIP_TYPE" = "RK3229" ]] && SELECTION="2"
# SoC section

DIALOG_ENTRIES=("0" "RK3228A (max 1.2Ghz)")
DIALOG_ENTRIES+=("1" "RK3228B (max 1.4Ghz)")
DIALOG_ENTRIES+=("2" "RK3229 (max 1.4Ghz)")
SELECTION="0"
[[ "$CHIP_TYPE" = "RK3229" ]] && SELECTION="2"

MENU_TITLE="${BOARD_INFO}Select the SoC type\n"
DIALOG_ENTRIES=("0" "RK3228A (max 1.2Ghz)")
DIALOG_ENTRIES+=("1" "RK3228B (max 1.4Ghz)")
DIALOG_ENTRIES+=("2" "RK3229 (max 1.4Ghz)")

MENU_CMD=(dialog --colors --backtitle "$BACKTITLE" --title "$TITLE" --default-item "$SELECTION" --menu "$MENU_TITLE" 24 0 20)
MENU_TITLE="${BOARD_INFO}Select the SoC type\n"

SELECTION=$("${MENU_CMD[@]}" "${DIALOG_ENTRIES[@]}" 2>&1 >/dev/tty)
MENU_CMD=(dialog --colors --backtitle "$BACKTITLE" --title "$TITLE" --default-item "$SELECTION" --menu "$MENU_TITLE" 24 0 20)

RET=$?
SELECTION=$("${MENU_CMD[@]}" "${DIALOG_ENTRIES[@]}" 2>&1 > /dev/tty)

if [ "$RET" -eq 1 ]; then
echo "Cancelled"
return 1
fi
RET=$?

if [ "$RET" -ne 0 ]; then
echo "dialog utility returned an unexpected error code: $RET"
return 1
fi
if [ "$RET" -eq 1 ]; then
echo "Cancelled"
return 1
fi

[[ "$SELECTION" -eq 0 ]] && SELECTION=""
[[ "$SELECTION" -eq 1 ]] && SELECTION="cpu-hs"
[[ "$SELECTION" -eq 2 ]] && SELECTION="cpu-hs"
if [ "$RET" -ne 0 ]; then
echo "dialog utility returned an unexpected error code: $RET"
return 1
fi

echo $SELECTION
[[ "$SELECTION" -eq 0 ]] && SELECTION=""
[[ "$SELECTION" -eq 1 ]] && SELECTION="cpu-hs"
[[ "$SELECTION" -eq 2 ]] && SELECTION="cpu-hs"

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

for KEY in "${DT_EMMC_OVERLAYS_ORDER[@]}"; do
DIALOG_ENTRIES+=($KEY "${DT_EMMC_OVERLAYS[$KEY]}" "off")
done
declare -a DIALOG_ENTRIES

MENU_TITLE="${BOARD_INFO}${EMMC_OPTIONS_WARNING}"
for KEY in "${DT_EMMC_OVERLAYS_ORDER[@]}"; do
DIALOG_ENTRIES+=($KEY "${DT_EMMC_OVERLAYS[$KEY]}" "off")
done

MENU_CMD=(dialog --colors --backtitle "$BACKTITLE" --title "$TITLE" --checklist "$MENU_TITLE" 28 0 56)
MENU_TITLE="${BOARD_INFO}${EMMC_OPTIONS_WARNING}"

SELECTION=$("${MENU_CMD[@]}" "${DIALOG_ENTRIES[@]}" 2>&1 >/dev/tty)
MENU_CMD=(dialog --colors --backtitle "$BACKTITLE" --title "$TITLE" --checklist "$MENU_TITLE" 28 0 56)

RET=$?
SELECTION=$("${MENU_CMD[@]}" "${DIALOG_ENTRIES[@]}" 2>&1 > /dev/tty)

if [ "$RET" -eq 1 ]; then
echo "Cancelled"
return 1
fi
RET=$?

if [ "$RET" -ne 0 ]; then
echo "dialog utility returned an unexpected error code: $RET"
return 1
fi
if [ "$RET" -eq 1 ]; then
echo "Cancelled"
return 1
fi

echo $SELECTION
if [ "$RET" -ne 0 ]; then
echo "dialog utility returned an unexpected error code: $RET"
return 1
fi

return 0
echo $SELECTION

return 0

}

function select_ddr() {

declare -a DIALOG_ENTRIES

# DDR section
declare -a DIALOG_ENTRIES

SELECTION="default"
# DDR section

for KEY in "${DT_DDR_OVERLAYS_ORDER[@]}"; do
DIALOG_ENTRIES+=($KEY "${DT_DDR_OVERLAYS[$KEY]}")
done
SELECTION="default"

MENU_TITLE="${BOARD_INFO}Select the DDR type and speed\n${HANG_OPTIONS_WARNING}"
for KEY in "${DT_DDR_OVERLAYS_ORDER[@]}"; do
DIALOG_ENTRIES+=($KEY "${DT_DDR_OVERLAYS[$KEY]}")
done

MENU_CMD=(dialog --colors --backtitle "$BACKTITLE" --title "$TITLE" --default-item "$SELECTION" --menu "$MENU_TITLE" 24 0 20)
MENU_TITLE="${BOARD_INFO}Select the DDR type and speed\n${HANG_OPTIONS_WARNING}"

SELECTION=$("${MENU_CMD[@]}" "${DIALOG_ENTRIES[@]}" 2>&1 >/dev/tty)
MENU_CMD=(dialog --colors --backtitle "$BACKTITLE" --title "$TITLE" --default-item "$SELECTION" --menu "$MENU_TITLE" 24 0 20)

RET=$?
SELECTION=$("${MENU_CMD[@]}" "${DIALOG_ENTRIES[@]}" 2>&1 > /dev/tty)

if [ "$RET" -eq 1 ]; then
echo "Cancelled"
return 1
fi
RET=$?

if [ "$RET" -ne 0 ]; then
echo "dialog utility returned an unexpected error code: $RET"
return 1
fi
if [ "$RET" -eq 1 ]; then
echo "Cancelled"
return 1
fi

[[ $SELECTION = "default" ]] && SELECTION=""
if [ "$RET" -ne 0 ]; then
echo "dialog utility returned an unexpected error code: $RET"
return 1
fi

echo $SELECTION
[[ $SELECTION = "default" ]] && SELECTION=""

return 0
echo $SELECTION

return 0

}

function select_led_configuration() {

declare -a DIALOG_ENTRIES

for KEY in "${DT_LED_OVERLAYS_ORDER[@]}"; do
DIALOG_ENTRIES+=($KEY "${DT_LED_OVERLAYS[$KEY]}")
done
declare -a DIALOG_ENTRIES

MENU_TITLE="${BOARD_INFO}${NOTE_LED_GPIO_SELECTION}${HANG_OPTIONS_WARNING}\n"
for KEY in "${DT_LED_OVERLAYS_ORDER[@]}"; do
DIALOG_ENTRIES+=($KEY "${DT_LED_OVERLAYS[$KEY]}")
done

MENU_CMD=(dialog --colors --backtitle "$BACKTITLE" --title "$TITLE" --default-item "$SELECTION" --menu "$MENU_TITLE" 24 0 20)
MENU_TITLE="${BOARD_INFO}${NOTE_LED_GPIO_SELECTION}${HANG_OPTIONS_WARNING}\n"

SELECTION=$("${MENU_CMD[@]}" "${DIALOG_ENTRIES[@]}" 2>&1 >/dev/tty)
MENU_CMD=(dialog --colors --backtitle "$BACKTITLE" --title "$TITLE" --default-item "$SELECTION" --menu "$MENU_TITLE" 24 0 20)

RET=$?
SELECTION=$("${MENU_CMD[@]}" "${DIALOG_ENTRIES[@]}" 2>&1 > /dev/tty)

if [ "$RET" -eq 1 ]; then
echo "Cancelled"
return 1
fi
RET=$?

if [ "$RET" -ne 0 ]; then
echo "dialog utility returned an unexpected error code: $RET"
return 1
fi
if [ "$RET" -eq 1 ]; then
echo "Cancelled"
return 1
fi

echo $SELECTION
if [ "$RET" -ne 0 ]; then
echo "dialog utility returned an unexpected error code: $RET"
return 1
fi

return 0
echo $SELECTION

return 0

}


# ----- Entry point -----

USER_ID=$(id -u)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down