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.

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

[Cleanup] Remove leftovers of former BOARDFAMILY rk322x (now integrated into the rockchip family) #6832

Merged
merged 3 commits into from
Jun 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions config/sources/families/rockchip.conf
Original file line number Diff line number Diff line change
Expand Up @@ -240,12 +240,6 @@ family_tweaks_bsp() {
mkdir -p $destination/etc/initramfs-tools/hooks
install -m 550 $SRC/packages/bsp/rockchip/ap6330-initramfs-firmware $destination/etc/initramfs-tools/hooks

# esp8089 wifi driver modprobe default configuration options, only for legacy kernel
mkdir -p $destination/etc/modprobe.d
if [[ "$BOOT_SOC" == "rk322x" && "$BRANCH" == "legacy" ]]; then
cp $SRC/packages/bsp/rk322x/esp8089.conf $destination/etc/modprobe.d/esp8089.conf
fi

# Board selection script, only for rk322x-box
if [[ "$BOARD" == "rk322x-box" ]]; then
install -m 755 $SRC/packages/bsp/rk322x/rk322x-config $destination/usr/sbin
Expand Down
23 changes: 11 additions & 12 deletions packages/bsp/common/usr/lib/armbian/armbian-hardware-optimization
Original file line number Diff line number Diff line change
Expand Up @@ -106,13 +106,17 @@ prepare_board() {
done
fi

# IRQ distribution based on $BOARDFAMILY and/or $BOARD_NAME
case ${BOARD} in
rockpro64 | renegade-elite | pinebook-pro | station-p1)
BOARDFAMILY=rk3399
;;
esac
case ${BOARDFAMILY} in
local hw_optimization_family
# IRQ distribution based on $BOARDFAMILY or $BOARD or $BOOT_SOC
if [[ "${BOARD}" == "rockpro64" || "${BOARD}" == "renegade-elite" || "${BOARD}" == "pinebook-pro" || "${BOARD}" == "station-p1" ]]; then
hw_optimization_family="rk3399"
elif [[ "${BOOT_SOC}" == "rk322x" ]]; then
hw_optimization_family="rk322x"
else
hw_optimization_family="${BOARDFAMILY}"
fi

case ${hw_optimization_family} in
cubox | udoo*) # i.MX6 boards: send Ethernet to cpu3, MMC to cpu1/cpu2 (when available)
echo 2 > /proc/irq/$(awk -F":" "/mmc0/ {print \$1}" < /proc/interrupts | sed 's/\ //g' | head -1)/smp_affinity 2> /dev/null
echo 4 > /proc/irq/$(awk -F":" "/mmc1/ {print \$1}" < /proc/interrupts | sed 's/\ //g' | head -1)/smp_affinity 2> /dev/null
Expand Down Expand Up @@ -190,11 +194,6 @@ prepare_board() {
echo 8 > /proc/irq/$(awk -F":" "/eth0/ {print \$1}" < /proc/interrupts | sed 's/\ //g' | head -n1)/smp_affinity
echo 7 > /sys/class/net/eth0/queues/rx-0/rps_cpus

# Mali in 4.4 kernel
for i in $(awk -F':' '/Mali_/{print $1}' /proc/interrupts | sed 's/\ //g'); do
echo 8 > /proc/irq/$i/smp_affinity
done

# Lima in mainline kernel
echo 8 > /proc/irq/$(awk -F':' '/gp$/{print $1}' /proc/interrupts | sed 's/\ //g')/smp_affinity
echo 8 > /proc/irq/$(awk -F':' '/gpmmu/{print $1}' /proc/interrupts | sed 's/\ //g')/smp_affinity
Expand Down
1 change: 0 additions & 1 deletion packages/bsp/rk322x/50-rkvdec.rules

This file was deleted.

1 change: 0 additions & 1 deletion packages/bsp/rk322x/esp8089.conf

This file was deleted.

26 changes: 0 additions & 26 deletions patch/kernel/archive/rk322x-4.4/0001-fixing-dtc-error.patch

This file was deleted.

This file was deleted.

Loading