Skip to content

Commit

Permalink
Merge remote-tracking branch 'armbian/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
Ryzer58 committed Dec 7, 2024
2 parents 98e18bd + 6ba9d13 commit c4000c0
Show file tree
Hide file tree
Showing 90 changed files with 3,837 additions and 10,489 deletions.
19 changes: 10 additions & 9 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,15 @@ config/boards/bananapim2s.conf @jeanrhum @pyavitz
config/boards/bananapim2zero.csc @mhawkins-consultant
config/boards/bananapim3.csc @AaronNGray
config/boards/bananapim4zero.conf @pyavitz
config/boards/bananapim5.conf @bretmlw
config/boards/bananapim5.conf @igorpecovnik
config/boards/bananapim64.csc @devdotnetorg
config/boards/bananapim7.conf @amazingfate
config/boards/bigtreetech-cb1.conf @JohnTheCoolingFan
config/boards/cherryba-m1.csc @IsMrX
config/boards/clearfogpro.csc @Heisath
config/boards/cm3588-nas.csc @ColorfulRhino
config/boards/coolpi-cm5.csc @andyshrk
config/boards/coolpi-genbook.csc @andyshrk
config/boards/firefly-itx-3588j.csc @SeeleVolleri
config/boards/fxblox-rk1.csc @mahdichi
config/boards/gateway-gz80x.conf @pyavitz
Expand Down Expand Up @@ -90,7 +91,7 @@ config/boards/odroidhc4.conf @igorpecovnik
config/boards/odroidm1.conf @rpardini
config/boards/odroidn2.conf @NicoD-SBC
config/boards/odroidxu4.conf @joekhoobyar
config/boards/olimex-teres-a64.conf @Kreyren
config/boards/olimex-teres-a64.csc @Kreyren
config/boards/onecloud.conf @hzyitc
config/boards/oneplus-kebab.conf @amazingfate
config/boards/orangepi4-lts.conf @paolosabatino
Expand All @@ -100,10 +101,10 @@ config/boards/orangepi5.conf @efectn
config/boards/orangepione.conf @StephenGraf
config/boards/orangepipc.csc @lbmendes
config/boards/orangepipcplus.csc @Janmcha
config/boards/orangepizero2.wip @AGM1968 @krachlatte
config/boards/orangepizero2.csc @AGM1968 @krachlatte
config/boards/orangepizero2w.csc @chraac
config/boards/orangepizero3.csc @alexl83 @chraac
config/boards/orangepizeroplus.conf @schwar3kat
config/boards/orangepizeroplus.csc @schwar3kat
config/boards/phytiumpi.conf @chainsx
config/boards/pine64.conf @PanderMusubi
config/boards/pinebook-pro.csc @TRSx80 @ahoneybun
Expand Down Expand Up @@ -141,7 +142,7 @@ config/boards/sk-tda4vm.conf @glneo
config/boards/station-m1.csc @150balbes
config/boards/station-m3.csc @chainsx
config/boards/sweet-potato.conf @Tonymac32
config/boards/thinkpad-x13s.wip @PeterChrz @rpardini
config/boards/thinkpad-x13s.conf @PeterChrz @rpardini
config/boards/tinkerboard.conf @paolosabatino
config/boards/tritium-h3.conf @Tonymac32
config/boards/tritium-h5.conf @Tonymac32
Expand All @@ -152,15 +153,15 @@ config/boards/wsl2-x86.csc @rpardini
config/boards/x96-mate.tvb @Ressetkk
config/boards/x96q.tvb @sicXnull
config/boards/xiaomi-elish.conf @amazingfate
config/boards/xiaomi-umi.conf @FantasyGmm
config/boards/xiaomi-umi.eos @FantasyGmm
config/boards/youyeetoo-r1-v3.csc @SuperKali
config/kernel/linux-arm64-*.config @FantasyGmm
config/kernel/linux-bcm2711-*.config @PanderMusubi @teknoid
config/kernel/linux-imx8m-*.config @schmiedelm
config/kernel/linux-k3-*.config @glneo
config/kernel/linux-meson-*.config @hzyitc
config/kernel/linux-meson-s4t7-*.config @adeepn @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-meson64-*.config @NicoD-SBC @SteeManMI @Tonymac32 @adeepn @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
config/kernel/linux-mvebu-*.config @Heisath
config/kernel/linux-odroidxu4-*.config @joekhoobyar
config/kernel/linux-phytium-embedded-*.config @chainsx
Expand All @@ -184,7 +185,7 @@ patch/kernel/bcm2711-*/ @PanderMusubi @teknoid
patch/kernel/imx8m-*/ @schmiedelm
patch/kernel/k3-*/ @glneo
patch/kernel/meson-*/ @hzyitc
patch/kernel/meson64-*/ @NicoD-SBC @SteeManMI @Tonymac32 @adeepn @bretmlw @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
patch/kernel/meson64-*/ @NicoD-SBC @SteeManMI @Tonymac32 @adeepn @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
patch/kernel/mvebu-*/ @Heisath
patch/kernel/odroidxu4-*/ @joekhoobyar
patch/kernel/phytium-embedded-*/ @chainsx
Expand All @@ -202,7 +203,7 @@ sources/families/imx8m.conf @schmiedelm
sources/families/k3.conf @glneo
sources/families/meson-s4t7.conf @adeepn @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/meson64.conf @NicoD-SBC @SteeManMI @Tonymac32 @adeepn @clee @engineer-80 @igorpecovnik @jeanrhum @monkaBlyat @pyavitz @rpardini @teknoid
sources/families/mvebu.conf @Heisath
sources/families/odroidxu4.conf @joekhoobyar
sources/families/phytium-embedded.conf @chainsx
Expand Down
2 changes: 1 addition & 1 deletion config/boards/bananapim5.conf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Amlogic S905X3 quad core 2-4GB RAM SoC eMMC GBE USB3 SPI
BOARD_NAME="Banana Pi M5"
BOARDFAMILY="meson-sm1"
BOARD_MAINTAINER="bretmlw"
BOARD_MAINTAINER="igorpecovnik"
BOOTCONFIG="bananapi-m5_defconfig"
BOOT_FDT_FILE="amlogic/meson-sm1-bananapi-m5.dtb"
KERNEL_TARGET="current,edge"
Expand Down
48 changes: 48 additions & 0 deletions config/boards/bigtreetech-cb2.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# Rockchip RK3566 quad core 2GB-8GB GBE eMMC NVMe USB3 WiFi
BOARD_NAME="BigTreeTech CB2"
BOARDFAMILY="rockchip64"
BOARD_MAINTAINER="JohnTheCoolingFan"
BOOTCONFIG="bigtreetech-cb2-rk3566_defconfig"
BOOT_SOC="rk3566"
KERNEL_TARGET="current,edge"
KERNEL_TEST_TARGET="current"
BOOT_FDT_FILE="rockchip/rk3566-bigtreetech-cb2.dtb"
IMAGE_PARTITION_TABLE="gpt"
BOOT_SCENARIO="spl-blobs"
OVERLAY_PREFIX='rk3566'
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"

# TODO: replace with BOOT_SCENARIO=binman when it gets merged and in good shape
function post_family_config__bigtreetech-cb2_uboot_overrides() {
display_alert "$BOARD" "mainline u-boot overrides" "info"

DDR_BLOB="rk35/rk3566_ddr_1056MHz_v1.21.bin"
BL31_BLOB="rk35/rk3568_bl31_v1.44.elf" # NOT a typo, bl31 is shared across 68 and 66

declare -g BOOTDELAY=1 # Wait for UART interrupt to enter UMS/RockUSB mode etc
declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"
declare -g BOOTBRANCH="tag:v2024.10"
declare -g BOOTPATCHDIR="v2024.10/board_bigtreetech-cb2"
#declare -g BOOTDIR="u-boot-${BOARD}"
declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"
unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already

# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
function write_uboot_platform() {
dd "if=${1}/u-boot-rockchip.bin" "of=${2}" bs=32k seek=1 conv=notrunc
}

function write_uboot_platform_mtd() {
declare -a extra_opts_flashcp=("--verbose")
if flashcp -h | grep -q -e '--partition'; then
echo "Confirmed flashcp supports --partition -- read and write only changed blocks." >&2
extra_opts_flashcp+=("--partition")
else
echo "flashcp does not support --partition, will write full SPI flash blocks." >&2
fi
flashcp "${extra_opts_flashcp[@]}" "${1}/u-boot-rockchip-spi.bin" /dev/mtd0
}
}

# vim: ft=bash
36 changes: 36 additions & 0 deletions config/boards/coolpi-genbook.csc
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# Rockchip RK3588 SoC octa core 4-16GB SoC eMMC USB3 NVME
BOARD_NAME="CoolPi GenBook"
BOARDFAMILY="rockchip-rk3588"
BOARD_MAINTAINER="andyshrk"
BOARD_FIRMWARE_INSTALL="-full"
BOOT_SOC="rk3588"
BOOTCONFIG="coolpi-cm5-genbook-rk3588_defconfig"
KERNEL_TARGET="edge"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3588-coolpi-cm5-genbook.dtb"
BOOT_SCENARIO="spl-blobs"
BOOT_SUPPORT_SPI="yes"
BOOT_SPI_RKSPI_LOADER="yes"
IMAGE_PARTITION_TABLE="gpt"

# Mainline U-Boot
function post_family_config_branch_edge__coolpi-genbook_use_mainline_uboot() {
display_alert "$BOARD" "mainline (next branch) u-boot overrides for $BOARD / $BRANCH" "info"

declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # Mainline U-Boot
unset BOOTBRANCH
unset BOOTPATCHDIR
declare -g BOOTBRANCH_BOARD="tag:v2025.01-rc3"
declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin u-boot-rockchip-spi.bin"
unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd # disable stuff from rockchip64_common; we're using binman here which does all the work already

# Just use the binman-provided u-boot-rockchip.bin, which is ready-to-go
function write_uboot_platform() {
dd "if=$1/u-boot-rockchip.bin" "of=$2" bs=32k seek=1 conv=notrunc status=none
}

function write_uboot_platform_mtd() {
flashcp -v -p "$1/u-boot-rockchip-spi.bin" /dev/mtd0
}
}
1 change: 0 additions & 1 deletion config/boards/radxa-e20c.csc
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ FULL_DESKTOP="no"
BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3528-radxa-e20c.dtb"
BOOT_SCENARIO="spl-blobs"
WIREGUARD="no"
IMAGE_PARTITION_TABLE="gpt"
2 changes: 1 addition & 1 deletion config/boards/retroidpocket-rp5.csc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Retroid Pocket RP5 Configuration
declare -g BOARD_NAME="Retroid Pocket RP5"
declare -g BOARD_MAINTAINER="tjstyle"
declare -g BOARD_MAINTAINER=""
declare -g BOARDFAMILY="sm8250"
declare -g KERNEL_TARGET="current"
declare -g EXTRAWIFI="no"
Expand Down
2 changes: 1 addition & 1 deletion config/boards/retroidpocket-rpmini.csc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Retroid Pocket RPMini Configuration
declare -g BOARD_NAME="Retroid Pocket RPMini"
declare -g BOARD_MAINTAINER="tjstyle"
declare -g BOARD_MAINTAINER=""
declare -g BOARDFAMILY="sm8250"
declare -g KERNEL_TARGET="current"
declare -g EXTRAWIFI="no"
Expand Down
2 changes: 1 addition & 1 deletion config/boards/rock-s0.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

BOARD_NAME="Rock S0"
BOARDFAMILY=rockchip64
BOARD_MAINTAINER=brentr
BOARD_MAINTAINER="brentr"

BOOTCONFIG=rock-s0-rk3308_defconfig
BOOT_FDT_FILE=rockchip/rk3308-rock-s0.dtb
Expand Down
2 changes: 1 addition & 1 deletion config/boards/rockpi-s.conf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

BOARD_NAME="Rockpi S"
BOARDFAMILY=rockchip64
BOARD_MAINTAINER=brentr
BOARD_MAINTAINER="brentr"

BOOTCONFIG=rock-pi-s-rk3308_defconfig
BOOT_FDT_FILE=rockchip/rk3308-rock-pi-s.dtb
Expand Down
2 changes: 1 addition & 1 deletion config/sources/families/rk35xx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ case $BRANCH in
declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel.
declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo
KERNELSOURCE='https://github.com/armbian/linux-rockchip.git'
KERNELBRANCH='branch:rk-6.1-rkr3'
KERNELBRANCH='branch:rk-6.1-rkr4.1'
KERNELPATCHDIR='rk35xx-vendor-6.1'
;;
esac
Expand Down
2 changes: 1 addition & 1 deletion config/sources/families/rockchip-rk3588.conf
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ case $BRANCH in
declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel.
declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo
KERNELSOURCE='https://github.com/armbian/linux-rockchip.git'
KERNELBRANCH='branch:rk-6.1-rkr3'
KERNELBRANCH='branch:rk-6.1-rkr4.1'
KERNELPATCHDIR='rk35xx-vendor-6.1'
LINUXFAMILY=rk35xx
;;
Expand Down
6 changes: 3 additions & 3 deletions config/sources/families/sm8250.conf
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ enable_extension "image-output-abl"
case $BRANCH in

current)
declare -g KERNEL_MAJOR_MINOR="6.11" # Major and minor versions of this kernel.
declare -g KERNELBRANCH='branch:linux-6.11.y'
declare -g KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel.
declare -g KERNELBRANCH='branch:linux-6.12.y'
declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo
;;

edge)
declare -g KERNEL_MAJOR_MINOR="6.10" # Major and minor versions of this kernel.
declare -g KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel.
;;

esac
Expand Down
28 changes: 0 additions & 28 deletions extensions/mesa-vpu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -90,34 +90,6 @@ function post_install_kernel_debs__3d() {

# Add chromium if building a desktop
if [[ "${BUILD_DESKTOP}" == "yes" ]]; then
if [[ "${ARCH}" == "arm64" ]]; then

display_alert "Adding Amazingfate Chromium PPAs" "${EXTENSION}" "info"
do_with_retries 3 chroot_sdcard add-apt-repository ppa:liujianfeng1994/chromium --yes --no-update
sed -i "s/oracular/noble/g" "${SDCARD}"/etc/apt/sources.list.d/liujianfeng1994-ubuntu-chromium-"${RELEASE}".*

display_alert "Pinning amazingfated's Chromium PPAs" "${EXTENSION}" "info"
cat <<- EOF > "${SDCARD}"/etc/apt/preferences.d/liujianfeng1994-chromium-pin
Package: chromium
Pin: release o=LP-PPA-liujianfeng1994-chromium
Pin-Priority: 1001
EOF

else

display_alert "Adding Xtradebs Apps PPAs" "${EXTENSION}" "info"
do_with_retries 3 chroot_sdcard add-apt-repository ppa:xtradeb/apps --yes --no-update
sed -i "s/oracular/noble/g" "${SDCARD}"/etc/apt/sources.list.d/xtradeb-ubuntu-apps-"${RELEASE}".*

display_alert "Pinning Xtradebs PPAs" "${EXTENSION}" "info"
cat <<- EOF > "${SDCARD}"/etc/apt/preferences.d/xtradebs-apps-pin
Package: chromium
Pin: release o=LP-PPA-xtradebs-apps
Pin-Priority: 1001
EOF

fi

pkgs+=("chromium")
fi
fi
Expand Down
56 changes: 21 additions & 35 deletions packages/bsp/rockchip/asound.conf
Original file line number Diff line number Diff line change
@@ -1,27 +1,3 @@
pcm.OnBoard_D0 {

type hw
card OnBoard
device 0

}

pcm.OnBoard_D1 {

type hw
card OnBoard
device 1

}

pcm.OnBoard_D2 {

type hw
card OnBoard
device 2

}

# Configuration to expose the SPDIF device of RK3288 to ALSA.
# The device tree must describe a simple-audio-card device named "SPDIF"
# for this to work properly
Expand Down Expand Up @@ -53,24 +29,18 @@ cards.SPDIF.pcm.iec958.0 {
}

# Configuration to expose the HDMI device of RK3288 to ALSA.
# The device tree must describe a simple-audio-card device named "DW-I2S-HDMI"
# The device tree must describe a simple-audio-card device named "HDMI"
# for this to work properly
# This percolates to PulseAudio, which will eventually show the proper
# labels to the audio device

<confdir:pcm/hdmi.conf>

cards.DW-I2S-HDMI.pcm.hdmi.0 {
@args [ CARD DEVICE CTLINDEX AES0 AES1 AES2 AES3 ]
cards.HDMI.pcm.hdmi.0 {
@args [ CARD AES0 AES1 AES2 AES3 ]
@args.CARD {
type string
}
@args.DEVICE {
type integer
}
@args.CTLINDEX {
type integer
}
@args.AES0 {
type integer
}
Expand All @@ -83,6 +53,22 @@ cards.DW-I2S-HDMI.pcm.hdmi.0 {
@args.AES3 {
type integer
}
type hw
card $CARD
type hooks
slave.pcm {
type hw
card $CARD
}
hooks.0 {
type ctl_elems
hook_args [
{
interface PCM
name "IEC958 Playback Default"
lock true
preserve true
value [ $AES0 $AES1 $AES2 $AES3 ]
}
]
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Chen Jiali <[email protected]>
Date: Tue, 23 Apr 2024 16:05:42 +0800
Subject: [PATCH 1/1] Reduce eMMC frequency to improve compatibility

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
index cf0a9be83..29ace14b4 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
@@ -358,7 +358,7 @@ &sd_emmc_c {
cap-mmc-highspeed;
mmc-ddr-1_8v;
mmc-hs200-1_8v;
- max-frequency = <200000000>;
+ max-frequency = <150000000>;
disable-wp;

mmc-pwrseq = <&emmc_pwrseq>;
Loading

0 comments on commit c4000c0

Please sign in to comment.