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

sunxi-6.6: Switch to v6.6.75. Add BananaPi M4 Berry board as WIP #7865

Merged
merged 5 commits into from
Feb 23, 2025
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
26 changes: 26 additions & 0 deletions config/boards/bananapim4berry.wip
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Allwinner H618 quad core 2/4GB RAM 8GB eMMC SoC WiFi\Bt HDMI SPI USB-C
BOARD_NAME="BananaPi M4 Berry"
BOARDFAMILY="sun50iw9-bpi"
BOARD_MAINTAINER="The-going"
BOOTCONFIG="bananapi_m4_berry_defconfig"

BOOTPATCHDIR="v2025.01/board_bananapim4berry"
BOOTBRANCH_BOARD="tag:v2025.01"

OVERLAY_PREFIX="sun50i-h616"
BOOT_FDT_FILE="sun50i-h618-bananapi-m4-berry.dtb"
BOOT_LOGO="desktop"
KERNEL_TARGET="current,edge"
KERNEL_TEST_TARGET="current"

PACKAGE_LIST_BOARD="rfkill bluetooth bluez bluez-tools gpiod libgpiod2 network-manager"

function post_family_tweaks_bsp__bananapi_firmware() {
if [[ -d "$SRC/packages/bsp/bananapi/brcm" ]] && [[ -d "$SRC/packages/bsp/bananapi/rtl_bt" ]]; then
mkdir -p "${destination}"/lib/firmware/updates/brcm
mkdir -p "${destination}"/lib/firmware/updates/rtl_bt
display_alert "$BOARD" "Installing upstream firmware" "info"
cp -fr $SRC/packages/bsp/bananapi/brcm/* "${destination}"/lib/firmware/updates/brcm/
cp -fr $SRC/packages/bsp/bananapi/rtl_bt/* "${destination}"/lib/firmware/updates/rtl_bt/
fi
}
2 changes: 1 addition & 1 deletion config/sources/families/include/sunxi64_common.inc
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ case $BRANCH in

current)
declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel.
declare -g KERNELBRANCH="tag:v6.6.72"
declare -g KERNELBRANCH="tag:v6.6.75"
;;

edge)
Expand Down
2 changes: 1 addition & 1 deletion config/sources/families/include/sunxi_common.inc
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ case $BRANCH in

current)
declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel.
declare -g KERNELBRANCH="tag:v6.6.72"
declare -g KERNELBRANCH="tag:v6.6.75"
;;

edge)
Expand Down
2 changes: 1 addition & 1 deletion config/sources/families/sun50iw9-bpi.conf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ case $BRANCH in
declare -g BOOTSOURCE='https://source.denx.de/u-boot/u-boot.git'
declare -g BOOTBRANCH="${BOOTBRANCH_BOARD}"
declare -g ATFSOURCE='https://github.com/ARM-software/arm-trusted-firmware'
declare -g ATFBRANCH='tag:lts-v2.10.7'
declare -g ATFBRANCH='tag:v2.12.0'
declare -g ATF_PLAT="sun50i_h616"
declare -g ATF_TARGET_MAP='PLAT=sun50i_h616 DEBUG=1 bl31;;build/sun50i_h616/debug/bl31.bin'
declare -g BOOTSCRIPT='boot-sun50i-next.cmd:boot.cmd'
Expand Down
Loading
Loading