aixiao/Blueberry
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

官方 Armdebian Build 程序支持到 commits: 901922671e845808abaebbd33d407339174df9d7 可能随着官方提交后, 我的Git补丁不再适用与官方最新.

Browse Source
This commit is contained in:
aixiao 2024-03-12 16:11:16 +08:00
parent 60614c8025
commit 6e2e6ad930
2 changed files with 57 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
SF/ArmDebian/blueberry.patch
View File

@ -8569,7 +8569,7 @@ new file mode 100644
index 000000000..c79f80a62
--- /dev/null
+++ b/config/sources/families/sun50iw9-blb.conf
@@ -0,0 +1,83 @@
@@ -0,0 +1,64 @@
+ #
+ # SPDX-License-Identifier: GPL-2.0
+ #
@ -8599,7 +8599,7 @@ index 000000000..c79f80a62
+ ASOUND_STATE='asound.state.sun50iw9-legacy'
+
+ ATFSOURCE='https://github.com/ARM-software/arm-trusted-firmware'
+ ATFBRANCH='branch:master'
+ ATFBRANCH='tag:lts-v2.10.2'
+ ATF_PLAT="sun50i_h616"
+ ATF_TARGET_MAP='PLAT=sun50i_h616 DEBUG=1 bl31;;build/sun50i_h616/debug/bl31.bin'
+ BOOTSCRIPT='boot-sun50i-next.cmd:boot.cmd'
@ -8608,33 +8608,14 @@ index 000000000..c79f80a62
+
+ current | edge)
+ ATFSOURCE='https://github.com/ARM-software/arm-trusted-firmware'
+ ATFBRANCH='branch:master'
+ ATFBRANCH='tag:lts-v2.10.2'
+ ATF_PLAT="sun50i_h616"
+ ATF_TARGET_MAP='PLAT=sun50i_h616 DEBUG=1 bl31;;build/sun50i_h616/debug/bl31.bin'
+ BOOTSCRIPT='boot-sun50i-next.cmd:boot.cmd'
+
+ # Stick to 6.2.16 kernel for edge until ws2812 driver is fixed
+ if [[ "$BRANCH" == "edge" ]]; then
+ LINUXFAMILY="sun50iw9-btt" # Use a separate kernel deb
+ LINUXCONFIG="linux-sunxi64-edge" # But the same kernel config, will be modified below in armbian_kernel_config__enable_ws2812_driver
+ KERNEL_MAJOR_MINOR="6.2"
+ KERNELBRANCH="tag:v6.2.16"
+ KERNELPATCHDIR="archive/sunxi-${KERNEL_MAJOR_MINOR}"
+ fi
+
+ ;;
+ esac
+
+# Enable ws2812 driver for edge kernel
+function armbian_kernel_config__enable_ws2812_driver() {
+ if [[ "$BRANCH" == "edge" ]]; then
+ kernel_config_modifying_hashes+=("CONFIG_LEDS_WS2812=m")
+ if [[ -f .config ]]; then
+ kernel_config_set_m CONFIG_LEDS_WS2812
+ fi
+ fi
+}
+
+ # This build requires busybox (and dos2unix)
+ function add_host_dependencies__sun50iw9_add_busybox_hostdep() {
+ display_alert "Adding busybox dep" "for ${BOARD} bootloader compile" "debug"

23
SF/ArmDebian/sun50iw9-blb.conf
View File

@ -27,7 +27,7 @@ case $BRANCH in
ASOUND_STATE='asound.state.sun50iw9-legacy'
ATFSOURCE='https://github.com/ARM-software/arm-trusted-firmware'
ATFBRANCH='branch:master'
ATFBRANCH='tag:lts-v2.10.2'
ATF_PLAT="sun50i_h616"
ATF_TARGET_MAP='PLAT=sun50i_h616 DEBUG=1 bl31;;build/sun50i_h616/debug/bl31.bin'
BOOTSCRIPT='boot-sun50i-next.cmd:boot.cmd'
@ -36,33 +36,14 @@ case $BRANCH in
current | edge)
ATFSOURCE='https://github.com/ARM-software/arm-trusted-firmware'
ATFBRANCH='branch:master'
ATFBRANCH='tag:lts-v2.10.2'
ATF_PLAT="sun50i_h616"
ATF_TARGET_MAP='PLAT=sun50i_h616 DEBUG=1 bl31;;build/sun50i_h616/debug/bl31.bin'
BOOTSCRIPT='boot-sun50i-next.cmd:boot.cmd'
# Stick to 6.2.16 kernel for edge until ws2812 driver is fixed
if [[ "$BRANCH" == "edge" ]]; then
LINUXFAMILY="sun50iw9-btt" # Use a separate kernel deb
LINUXCONFIG="linux-sunxi64-edge" # But the same kernel config, will be modified below in armbian_kernel_config__enable_ws2812_driver
KERNEL_MAJOR_MINOR="6.2"
KERNELBRANCH="tag:v6.2.16"
KERNELPATCHDIR="archive/sunxi-${KERNEL_MAJOR_MINOR}"
fi
;;
esac
# Enable ws2812 driver for edge kernel
function armbian_kernel_config__enable_ws2812_driver() {
if [[ "$BRANCH" == "edge" ]]; then
kernel_config_modifying_hashes+=("CONFIG_LEDS_WS2812=m")
if [[ -f .config ]]; then
kernel_config_set_m CONFIG_LEDS_WS2812
fi
fi
}
# This build requires busybox (and dos2unix)
function add_host_dependencies__sun50iw9_add_busybox_hostdep() {
display_alert "Adding busybox dep" "for ${BOARD} bootloader compile" "debug"