Skip to content

Commit

Permalink
Merge pull request #16 from armbian/main
Browse files Browse the repository at this point in the history
[pull] main from armbian:main
  • Loading branch information
inozemtsev-roman authored Mar 9, 2024
2 parents 3a79434 + 094f396 commit 910cb3a
Show file tree
Hide file tree
Showing 292 changed files with 344,129 additions and 7,328 deletions.
85 changes: 47 additions & 38 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,20 @@ tools/ @iav @neheb @hzyitc @mhoffrog
# The following contents are generated by board configs
config/boards/aml-s9xx-box.tvb @SteeManMI
config/boards/armsom-sige7.csc @Z-Keven
config/boards/ayn-odin2.conf @FantasyGmm
config/boards/bananapi.csc @DylanHP
config/boards/bananapicm4io.conf @pyavitz
config/boards/bananapim2pro.conf @bretmlw
config/boards/bananapim2s.conf @jeanrhum @pyavitz
config/boards/bananapim3.csc @AaronNGray
config/boards/bananapim4zero.conf @pyavitz
config/boards/bananapim5.conf @bretmlw
config/boards/bananapim64.csc @devdotnetorg
config/boards/bigtreetech-cb1.conf @bigtreetech
config/boards/espressobin.csc @ManoftheSea
config/boards/firefly-rk3399.csc @150balbes
config/boards/fxblox-rk1.wip @mahdichi
config/boards/fxblox-rk1.csc @mahdichi
config/boards/helios4.conf @Heisath
config/boards/hinlink-h28k.csc @sputnik2019
config/boards/hinlink-ht2.csc @hoochiwetech
config/boards/indiedroid-nova.csc @lanefu
Expand All @@ -45,16 +48,16 @@ config/boards/khadas-vim3l.conf @rpardini
config/boards/khadas-vim4.conf @echatzip @rpardini @viraniac
config/boards/lafrite.conf @Tonymac32
config/boards/lepotato.conf @Tonymac32
config/boards/licheepi-4a.wip @chainsx
config/boards/licheepi-4a.csc @chainsx
config/boards/mangopi-m28k.csc @sputnik2019
config/boards/mekotronics-r58-minipc.wip @monkaBlyat
config/boards/mekotronics-r58x-4g.wip @monkaBlyat
config/boards/mekotronics-r58x.wip @monkaBlyat
config/boards/mixtile-blade3.wip @rpardini
config/boards/nanopct6.wip @Tonymac32
config/boards/mekotronics-r58-minipc.csc @monkaBlyat
config/boards/mekotronics-r58x-4g.csc @monkaBlyat
config/boards/mekotronics-r58x.csc @monkaBlyat
config/boards/mixtile-blade3.csc @rpardini
config/boards/nanopct6.csc @Tonymac32
config/boards/nanopi-r4s.conf @Manouchehri
config/boards/nanopi-r5s.wip @utlark
config/boards/nanopi-r6s.conf @efectn
config/boards/nanopi-r5s.csc @utlark
config/boards/nanopi-r6s.csc @efectn
config/boards/nanopiair.csc @1ubuntuuser
config/boards/nanopiduo.conf @sgjava
config/boards/nanopiduo2.conf @viraniac
Expand All @@ -65,8 +68,8 @@ config/boards/odroidn2.conf @NicoD-SBC
config/boards/odroidxu4.conf @joekhoobyar
config/boards/olimex-teres-a64.conf @Kreyren
config/boards/onecloud.conf @hzyitc
config/boards/orangepi-r1.conf @schwar3kat
config/boards/orangepi-r1plus-lts.conf @schwar3kat
config/boards/orangepi-r1.csc @schwar3kat
config/boards/orangepi-r1plus-lts.csc @schwar3kat
config/boards/orangepi3-lts.csc @viraniac
config/boards/orangepi3.csc @viraniac
config/boards/orangepi4-lts.conf @paolosabatino
Expand All @@ -78,23 +81,24 @@ config/boards/orangepipc.csc @lbmendes
config/boards/orangepiprime.conf @viraniac
config/boards/orangepizero.conf @viraniac
config/boards/orangepizero2.conf @AGM1968 @krachlatte
config/boards/orangepizero3.wip @viraniac
config/boards/orangepizeroplus.conf @schwar3kat
config/boards/pine64.conf @PanderMusubi
config/boards/pine64so.csc @joshaspinall
config/boards/pinebook-pro.conf @TRSx80 @ahoneybun
config/boards/qemu-uboot-arm64.wip @rpardini
config/boards/qemu-uboot-x86.wip @rpardini
config/boards/radxa-e25.wip @krachlatte
config/boards/qemu-uboot-arm64.csc @rpardini
config/boards/qemu-uboot-x86.csc @rpardini
config/boards/qemu-uefi-x86.conf @davidandreoletti
config/boards/radxa-e25.csc @krachlatte
config/boards/radxa-zero.conf @clee @engineer-80
config/boards/radxa-zero2.wip @monkaBlyat
config/boards/radxa-zero2.csc @monkaBlyat
config/boards/recore.csc @eliasbakken
config/boards/renegade.conf @Tonymac32
config/boards/rock-3a.conf @ZazaBR @amazingfate @catalinii @vamzii
config/boards/rock-5a.wip @amazingfate
config/boards/rock-5b.conf @amazingfate @linhz0hz
config/boards/rock-3a.csc @ZazaBR @amazingfate @catalinii @vamzii
config/boards/rock-5a.csc @amazingfate
config/boards/rock-5b.csc @amazingfate @linhz0hz
config/boards/rock-s0.conf @brentr
config/boards/rock64.csc @clee
config/boards/rockpi-4a.conf @clee
config/boards/rockpi-4a.csc @clee
config/boards/rockpi-e.conf @krachlatte
config/boards/rockpi-s.conf @brentr
config/boards/rockpro64.conf @joekhoobyar
Expand All @@ -105,9 +109,9 @@ config/boards/sk-am64b.conf @glneo
config/boards/sk-tda4vm.conf @glneo
config/boards/station-m1.csc @150balbes
config/boards/station-m2.csc @150balbes
config/boards/station-m3.csc @150balbes
config/boards/station-m3.csc @chainsx
config/boards/station-p2.csc @150balbes
config/boards/thinkpad-x13s.wip @rpardini
config/boards/thinkpad-x13s.wip @PeterChrz @rpardini
config/boards/tinkerboard.conf @paolosabatino
config/boards/tritium-h3.conf @Tonymac32
config/boards/tritium-h5.conf @Tonymac32
Expand All @@ -116,67 +120,72 @@ config/boards/uefi-x86.conf @rpardini
config/boards/wsl2-arm64.csc @rpardini
config/boards/wsl2-x86.csc @rpardini
config/boards/xiaomi-elish.conf @amazingfate
config/kernel/linux-arm64-*.config @amazingfate
config/boards/xiaomi-umi.wip @FantasyGmm
config/kernel/linux-arm64-*.config @FantasyGmm @amazingfate
config/kernel/linux-bcm2711-*.config @PanderMusubi @teknoid @viraniac
config/kernel/linux-k3-*.config @glneo
config/kernel/linux-media-*.config @150balbes
config/kernel/linux-meson-*.config @hzyitc
config/kernel/linux-meson-s4t7-*.config @echatzip @rpardini @viraniac
config/kernel/linux-meson64-*.config @NicoD-SBC @SteeManMI @Tonymac32 @adeepn @bretmlw @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
config/kernel/linux-mvebu-*.config @Heisath
config/kernel/linux-mvebu64-*.config @ManoftheSea
config/kernel/linux-odroidxu4-*.config @joekhoobyar
config/kernel/linux-rk35xx-*.config @Tonymac32 @Z-Keven @ZazaBR @amazingfate @catalinii @efectn @hoochiwetech @igorpecovnik @krachlatte @lanefu @linhz0hz @mahdichi @monkaBlyat @rpardini @sputnik2019 @vamzii
config/kernel/linux-rk35xx-*.config @Tonymac32 @Z-Keven @ZazaBR @amazingfate @catalinii @chainsx @efectn @hoochiwetech @igorpecovnik @krachlatte @lanefu @linhz0hz @mahdichi @monkaBlyat @rpardini @sputnik2019 @vamzii
config/kernel/linux-rockchip-*.config @paolosabatino
config/kernel/linux-rockchip-rk3588-*.config @Tonymac32 @amazingfate @efectn @igorpecovnik @lanefu @linhz0hz @rpardini
config/kernel/linux-rockchip64-*.config @Manouchehri @TRSx80 @Tonymac32 @ZazaBR @ahoneybun @amazingfate @brentr @catalinii @clee @joekhoobyar @krachlatte @paolosabatino @rpardini @schwar3kat @tdleiyao @utlark @vamzii
config/kernel/linux-rockpis-*.config @brentr
config/kernel/linux-sun50iw9-*.config @AGM1968 @krachlatte
config/kernel/linux-sun50iw9-btt-*.config @bigtreetech
config/kernel/linux-sunxi-*.config @1ubuntuuser @AaronNGray @DylanHP @StephenGraf @Tonymac32 @lbmendes @schwar3kat @sgjava @viraniac
config/kernel/linux-sunxi64-*.config @AGM1968 @Kreyren @PanderMusubi @Tonymac32 @bigtreetech @devdotnetorg @eliasbakken @joshaspinall @krachlatte @schwar3kat @teknoid @viraniac
config/kernel/linux-sunxi64-*.config @AGM1968 @Kreyren @PanderMusubi @Tonymac32 @bigtreetech @devdotnetorg @eliasbakken @joshaspinall @krachlatte @pyavitz @schwar3kat @teknoid @viraniac
config/kernel/linux-thead-*.config @chainsx
config/kernel/linux-uefi-arm64-*.config @150balbes @rpardini
config/kernel/linux-uefi-x86-*.config @rpardini
patch/kernel/NEED-*/ @bigtreetech
config/kernel/linux-uefi-arm64-*.config @150balbes @PeterChrz @rpardini
config/kernel/linux-uefi-x86-*.config @davidandreoletti @rpardini
patch/kernel/archive/meson-s4t7-*/ @echatzip @rpardini @viraniac
patch/kernel/archive/rockpis-*/ @brentr
patch/kernel/archive/sm8250-*/ @amazingfate
patch/kernel/archive/sm8250-*/ @FantasyGmm @amazingfate
patch/kernel/archive/sun50iw9-*/ @AGM1968 @krachlatte
patch/kernel/archive/sunxi-*/ @1ubuntuuser @AGM1968 @AaronNGray @DylanHP @Kreyren @PanderMusubi @StephenGraf @Tonymac32 @bigtreetech @devdotnetorg @eliasbakken @joshaspinall @krachlatte @lbmendes @schwar3kat @sgjava @teknoid @viraniac
patch/kernel/archive/uefi-arm64-*/ @150balbes @rpardini
patch/kernel/archive/uefi-x86-*/ @rpardini
patch/kernel/arm64-*/ @amazingfate
patch/kernel/archive/sun50iw9-btt-*/ @bigtreetech
patch/kernel/archive/sunxi-*/ @1ubuntuuser @AGM1968 @AaronNGray @DylanHP @Kreyren @PanderMusubi @StephenGraf @Tonymac32 @bigtreetech @devdotnetorg @eliasbakken @joshaspinall @krachlatte @lbmendes @pyavitz @schwar3kat @sgjava @teknoid @viraniac
patch/kernel/archive/uefi-arm64-*/ @150balbes @PeterChrz @rpardini
patch/kernel/archive/uefi-x86-*/ @davidandreoletti @rpardini
patch/kernel/arm64-*/ @FantasyGmm @amazingfate
patch/kernel/bcm2711-*/ @PanderMusubi @teknoid @viraniac
patch/kernel/k3-*/ @glneo
patch/kernel/media-*/ @150balbes
patch/kernel/meson-*/ @hzyitc
patch/kernel/meson64-*/ @NicoD-SBC @SteeManMI @Tonymac32 @adeepn @bretmlw @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
patch/kernel/mvebu-*/ @Heisath
patch/kernel/mvebu64-*/ @ManoftheSea
patch/kernel/odroidxu4-*/ @joekhoobyar
patch/kernel/rk35xx-*/ @Tonymac32 @Z-Keven @ZazaBR @amazingfate @catalinii @efectn @hoochiwetech @igorpecovnik @krachlatte @lanefu @linhz0hz @mahdichi @monkaBlyat @rpardini @sputnik2019 @vamzii
patch/kernel/rk35xx-*/ @Tonymac32 @Z-Keven @ZazaBR @amazingfate @catalinii @chainsx @efectn @hoochiwetech @igorpecovnik @krachlatte @lanefu @linhz0hz @mahdichi @monkaBlyat @rpardini @sputnik2019 @vamzii
patch/kernel/rk35xx-vendor-*/ @Tonymac32 @Z-Keven @ZazaBR @amazingfate @catalinii @chainsx @efectn @hoochiwetech @igorpecovnik @krachlatte @lanefu @linhz0hz @mahdichi @monkaBlyat @rpardini @sputnik2019 @vamzii
patch/kernel/rockchip-*/ @paolosabatino
patch/kernel/rockchip-rk3588-*/ @Tonymac32 @amazingfate @efectn @igorpecovnik @lanefu @linhz0hz @rpardini
patch/kernel/rockchip64-*/ @Manouchehri @TRSx80 @Tonymac32 @ZazaBR @ahoneybun @amazingfate @brentr @catalinii @clee @joekhoobyar @krachlatte @paolosabatino @rpardini @schwar3kat @tdleiyao @utlark @vamzii
patch/kernel/rockpis-*/ @brentr
patch/kernel/sun50iw9-*/ @AGM1968 @krachlatte
patch/kernel/thead-*/ @chainsx
sources/families/arm64.conf @150balbes @amazingfate @rpardini
sources/families/arm64.conf @150balbes @FantasyGmm @PeterChrz @amazingfate @rpardini
sources/families/bcm2711.conf @PanderMusubi @teknoid @viraniac
sources/families/k3.conf @glneo
sources/families/media.conf @150balbes
sources/families/meson-s4t7.conf @echatzip @rpardini @viraniac
sources/families/meson.conf @hzyitc
sources/families/meson64.conf @NicoD-SBC @SteeManMI @Tonymac32 @adeepn @bretmlw @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
sources/families/mvebu.conf @Heisath
sources/families/mvebu64.conf @ManoftheSea
sources/families/odroidxu4.conf @joekhoobyar
sources/families/rk35xx.conf @Tonymac32 @Z-Keven @ZazaBR @amazingfate @catalinii @efectn @hoochiwetech @igorpecovnik @krachlatte @lanefu @linhz0hz @mahdichi @monkaBlyat @rpardini @sputnik2019 @vamzii
sources/families/rk35xx.conf @Tonymac32 @Z-Keven @ZazaBR @amazingfate @catalinii @chainsx @efectn @hoochiwetech @igorpecovnik @krachlatte @lanefu @linhz0hz @mahdichi @monkaBlyat @rpardini @sputnik2019 @vamzii
sources/families/rockchip-rk3588.conf @Tonymac32 @amazingfate @efectn @igorpecovnik @lanefu @linhz0hz @rpardini
sources/families/rockchip.conf @paolosabatino
sources/families/rockchip64.conf @Manouchehri @TRSx80 @Tonymac32 @ZazaBR @ahoneybun @amazingfate @brentr @catalinii @clee @joekhoobyar @krachlatte @paolosabatino @rpardini @schwar3kat @tdleiyao @utlark @vamzii
sources/families/rockpis.conf @brentr
sources/families/sun50iw9-btt.conf @bigtreetech
sources/families/sun50iw9.conf @AGM1968 @krachlatte
sources/families/sunxi.conf @1ubuntuuser @AaronNGray @DylanHP @StephenGraf @Tonymac32 @lbmendes @schwar3kat @sgjava @viraniac
sources/families/sunxi64.conf @AGM1968 @Kreyren @PanderMusubi @Tonymac32 @bigtreetech @devdotnetorg @eliasbakken @joshaspinall @krachlatte @schwar3kat @teknoid @viraniac
sources/families/sunxi64.conf @AGM1968 @Kreyren @PanderMusubi @Tonymac32 @bigtreetech @devdotnetorg @eliasbakken @joshaspinall @krachlatte @pyavitz @schwar3kat @teknoid @viraniac
sources/families/thead.conf @chainsx
sources/families/x86.conf @rpardini
sources/families/x86.conf @davidandreoletti @rpardini
2 changes: 1 addition & 1 deletion .github/workflows/kernel-security-analysis-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ jobs:
run: |
for file in ${{ steps.changed-files.outputs.all_changed_files }}; do
if [[ "${file}" = config/kernel/*.config ]]; then
kconfig-hardened-check/bin/kconfig-hardened-check -m show_fail -c $file | sed -e 's/^/ /' >> $GITHUB_STEP_SUMMARY
kconfig-hardened-check/bin/kernel-hardening-checker -m show_fail -c $file | sed -e 's/^/ /' >> $GITHUB_STEP_SUMMARY
fi
done
3 changes: 1 addition & 2 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,7 @@ runs:
# copy os userpatches and custom
mkdir -pv build/userpatches
rsync -av os/userpatches/. build/userpatches/
#[[ -d custom/userpatches ]] &&
rsync -av custom/userpatches/. build/userpatches/
[[ -d custom/userpatches ]] && rsync -av custom/userpatches/. build/userpatches/
- shell: bash
run: |
Expand Down
6 changes: 5 additions & 1 deletion config/boards/armsom-sige7.csc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BOARD_NAME="ArmSoM Sige7"
BOARDFAMILY="rockchip-rk3588"
BOARD_MAINTAINER="Z-Keven"
BOOTCONFIG="armsom-sige7-rk3588_defconfig"
KERNEL_TARGET="legacy"
KERNEL_TARGET="legacy,vendor"
KERNEL_TEST_TARGET="legacy" # in case different then kernel target
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
Expand All @@ -18,6 +18,10 @@ BL31_BLOB='rk35/rk3588_bl31_v1.38.elf'

# post_family_config hook which only runs when branch is legacy.
function post_family_config_branch_legacy__uboot_armsom() {
post_family_config_branch_vendor__uboot_armsom
}
# post_family_config hook which only runs when branch is vendor.
function post_family_config_branch_vendor__uboot_armsom() {
display_alert "$BOARD" "Configuring armsom u-boot" "info"
declare -g BOOTSOURCE='https://github.com/radxa/u-boot.git'
declare -g BOOTBRANCH="commit:b54d452d46459bc6e4cfc1a2795c9aad143aa174" # specific commit in next-dev branch
Expand Down
6 changes: 5 additions & 1 deletion config/boards/armsom-w3.csc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BOARD_NAME="ArmSoM W3"
BOARDFAMILY="rockchip-rk3588"
BOARD_MAINTAINER=""
BOOTCONFIG="armsom-w3-rk3588_defconfig"
KERNEL_TARGET="legacy"
KERNEL_TARGET="legacy,vendor"
KERNEL_TEST_TARGET="legacy" # in case different then kernel target
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
Expand All @@ -18,6 +18,10 @@ BL31_BLOB='rk35/rk3588_bl31_v1.38.elf'

# post_family_config hook which only runs when branch is legacy.
function post_family_config_branch_legacy__uboot_armsom() {
post_family_config_branch_vendor__uboot_armsom
}
# post_family_config hook which only runs when branch is legacy.
function post_family_config_branch_vendor__uboot_armsom() {
display_alert "$BOARD" "Configuring armsom u-boot" "info"
declare -g BOOTSOURCE='https://github.com/radxa/u-boot.git'
declare -g BOOTBRANCH="commit:b54d452d46459bc6e4cfc1a2795c9aad143aa174" # specific commit in next-dev branch
Expand Down
101 changes: 101 additions & 0 deletions config/boards/ayn-odin2.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
# Generate kernel and rootfs image for Qcom ABL booting
declare -g BOARD_NAME="Ayn Odin2"
declare -g BOARD_MAINTAINER="FantasyGmm"
declare -g BOARDFAMILY="qcom-abl"
declare -g KERNEL_TARGET="sm8550"
declare -g KERNELPATCHDIR="arm64-sm8550"
declare -g EXTRAWIFI="no"
declare -g BOOTCONFIG="none"
declare -g BOOTIMG_CMDLINE_EXTRA="clk_ignore_unused pd_ignore_unused panic=30 audit=0 allow_mismatched_32bit_el0 rw mem_sleep_default=s2idle"
declare -g IMAGE_PARTITION_TABLE="gpt"
declare -g -a ABL_DTB_LIST=("qcs8550-ayn-odin2-hypdtbo")

# Use the full firmware, complete linux-firmware plus Armbian's
declare -g BOARD_FIRMWARE_INSTALL="-full"

function post_family_config_branch_sm8550__edk2_kernel() {
declare -g KERNELSOURCE='https://github.com/edk2-porting/linux-next'
declare -g KERNEL_MAJOR_MINOR="6.7" # Major and minor versions of this kernel.
declare -g KERNELBRANCH="branch:integration/ayn-odin2"
declare -g LINUXCONFIG="linux-${ARCH}-${BRANCH}" # for this board: linux-arm64-sm8550
display_alert "Setting up kernel ${KERNEL_MAJOR_MINOR} for" "${BOARD}" "info"
}

function ayn-odin2_is_userspace_supported() {
[[ "${RELEASE}" == "trixie" ]] && return 0
[[ "${RELEASE}" == "noble" ]] && return 0
return 1
}

function post_family_tweaks__ayn-odin2_enable_services() {
if ! ayn-odin2_is_userspace_supported; then
if [[ "${RELEASE}" != "" ]]; then
display_alert "Missing userspace for ${BOARD}" "${RELEASE} does not have the userspace necessary to support the ${BOARD}" "warn"
fi
return 0
fi

if [[ "${RELEASE}" == "noble" ]];then
display_alert "Adding Mesa PPA For Ubuntu " "${BOARD}" "info"
do_with_retries 3 chroot_sdcard add-apt-repository ppa:oibaf/graphics-drivers --yes --no-update
fi

# We need unudhcpd from armbian repo, so enable it
mv "${SDCARD}"/etc/apt/sources.list.d/armbian.list.disabled "${SDCARD}"/etc/apt/sources.list.d/armbian.list

# Add zink env
echo '__GLX_VENDOR_LIBRARY_NAME=mesa' | tee -a "${SDCARD}"/etc/environment
echo 'MESA_LOADER_DRIVER_OVERRIDE=zink' | tee -a "${SDCARD}"/etc/environment
echo 'GALLIUM_DRIVER=zink' | tee -a "${SDCARD}"/etc/environment
# Add Gamepad udev rule
echo 'SUBSYSTEM=="input", ATTRS{name}=="Ayn Odin2 Gamepad", MODE="0666", ENV{ID_INPUT_MOUSE}="0", ENV{ID_INPUT_JOYSTICK}="1"'> "${SDCARD}"/etc/udev/rules.d/99-ignore-gamepad.rules
# Add video decoder/encoder udev rule
echo 'SUBSYSTEM=="video4linux", ATTR{name}=="qcom-venus-decoder", SYMLINK+="video-dec%n"' >> "${SDCARD}"/etc/udev/rules.d/90-browser-video.rules
echo 'SUBSYSTEM=="video4linux", ATTR{name}=="qcom-venus-encoder", SYMLINK+="video-enc%n"' >> "${SDCARD}"/etc/udev/rules.d/90-browser-video.rules
# No driver support for suspend
chroot_sdcard systemctl mask suspend.target
# Add Bt Mac Fixed service
install -Dm655 $SRC/packages/bsp/ayn-odin2/bt-fixed-mac.sh "${SDCARD}"/usr/local/bin/
install -Dm644 $SRC/packages/bsp/ayn-odin2/bt-fixed-mac.service "${SDCARD}"/usr/lib/systemd/system/
chroot_sdcard systemctl enable bt-fixed-mac

do_with_retries 3 chroot_sdcard_apt_get_update
display_alert "$BOARD" "Installing board tweaks" "info"
do_with_retries 3 chroot_sdcard_apt_get_install alsa-ucm-conf unudhcpd mkbootimg git

# Disable armbian repo back
mv "${SDCARD}"/etc/apt/sources.list.d/armbian.list "${SDCARD}"/etc/apt/sources.list.d/armbian.list.disabled
do_with_retries 3 chroot_sdcard_apt_get_update

do_with_retries 3 chroot_sdcard_apt_get_install mesa-vulkan-drivers qbootctl qrtr-tools protection-domain-mapper tqftpserv

return 0
}

function post_family_tweaks_bsp__ayn-odin2_bsp_firmware_in_initrd() {
random_mac=$(openssl rand -hex 6 | sed 's/\(..\)/\1:/g; s/.$//')
declare -g BOOTIMG_CMDLINE_EXTRA="${BOOTIMG_CMDLINE_EXTRA} bt_mac=${random_mac}"
display_alert "Generate a random Bluetooth MAC address, Mac:${random_mac}" "info"
display_alert "Adding to bsp-cli" "${BOARD}: firmware in initrd" "info"
declare file_added_to_bsp_destination # Will be filled in by add_file_from_stdin_to_bsp_destination
# Using odin2's firmware for now
add_file_from_stdin_to_bsp_destination "/etc/initramfs-tools/hooks/ayn-odin2-firmware" <<- 'FIRMWARE_HOOK'
#!/bin/bash
[[ "$1" == "prereqs" ]] && exit 0
. /usr/share/initramfs-tools/hook-functions
for f in /lib/firmware/qcom/sm8550/ayn/odin2/* ; do
add_firmware "${f#/lib/firmware/}"
done
add_firmware "qcom/a740_sqe.fw" # Extra one for dpu
add_firmware "qcom/gmu_gen70200.bin" # Extra one for gpu
# Extra one for wifi
for f in /lib/firmware/ath12k/WCN7850/hw2.0/* ; do
add_firmware "${f#/lib/firmware/}"
done
# Extra one for bt
for f in /lib/firmware/qca/* ; do
add_firmware "${f#/lib/firmware/}"
done
FIRMWARE_HOOK
run_host_command_logged chmod -v +x "${file_added_to_bsp_destination}"
}
Loading

0 comments on commit 910cb3a

Please sign in to comment.