Skip to content

Commit

Permalink
Merge branch 'armbian:main' into nanopi-r3s
Browse files Browse the repository at this point in the history
  • Loading branch information
@EvilOlaf
EvilOlaf authored Jan 27, 2025
2 parents 257857c + 9b82282 commit 63b90a0
Show file tree
Hide file tree
Showing 2,010 changed files with 14,042 additions and 372,723 deletions.
8 changes: 4 additions & 4 deletions .github/CODEOWNERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ config/boards/aml-s9xx-box.tvb @SteeManMI
config/boards/armsom-sige1.csc @amazingfate
config/boards/armsom-sige3.csc @amazingfate
config/boards/avaota-a1.csc @chainsx
config/boards/ayn-odin2.eos @FantasyGmm
config/boards/ayn-odin2.csc @FantasyGmm
config/boards/bananapi.conf @DylanHP @janprunk
config/boards/bananapicm4io.conf @pyavitz
config/boards/bananapim2pro.conf @igorpecovnik
Expand Down Expand Up @@ -90,15 +90,15 @@ config/boards/nanopineo.csc @spendist
config/boards/nanopineo2.csc @spendist
config/boards/nanopineocore2.csc @AGM1968
config/boards/nanopineoplus2.csc @teknoid
config/boards/odroidc1.conf @juanlufont
config/boards/odroidc1.eos @juanlufont
config/boards/odroidc2.conf @teknoid
config/boards/odroidc4.conf @igorpecovnik
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.csc @Kreyren
config/boards/onecloud.conf @hzyitc
config/boards/onecloud.eos @hzyitc
config/boards/oneplus-kebab.conf @amazingfate
config/boards/orangepi4-lts.conf @paolosabatino
config/boards/orangepi4.csc @paolosabatino
Expand All @@ -114,7 +114,7 @@ config/boards/orangepizeroplus.csc @schwar3kat
config/boards/phytiumpi.conf @chainsx
config/boards/pine64.conf @PanderMusubi
config/boards/pinebook-pro.csc @TRSx80 @ahoneybun
config/boards/pocketchip.csc @TheSnowfield
config/boards/pocketchip-sd.csc @TheSnowfield
config/boards/qemu-uboot-arm64.csc @rpardini
config/boards/qemu-uboot-x86.csc @rpardini
config/boards/qemu-uefi-x86.conf @davidandreoletti
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
# format to the repository Actions tab.
- name: "Upload artifact"
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
with:
name: SARIF file
path: results.sarif
Expand Down
18 changes: 2 additions & 16 deletions .github/workflows/update-tools.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,6 @@ jobs:
version_latest=$(curl --silent "https://api.github.com/repos/${{ matrix.tool.PROJECT_NAME }}/releases/latest" | jq -r .tag_name)
version_latest=${version_latest#v} # Removing the 'v' prefix since the script uses only plain numbers
echo "version_latest=$version_latest" >> $GITHUB_OUTPUT
{
echo "CHANGE_LOG<<EOFFEOFFF42" # Has to be a unique delimiter that doesn't appear in the changelog itself
curl --silent "https://api.github.com/repos/${{ matrix.tool.PROJECT_NAME }}/releases/latest" | jq -r .body \
| sed -E -e 's/(#([0-9]+))/${{ matrix.tool.USER_NAME }}\/${{ matrix.tool.REPO_NAME }}\1/g' \
-e 's/https\:\/\/github\.com/https\:\/\/redirect.github.com/g'
echo "EOFFEOFFF42"
} >> "$GITHUB_ENV"
- name: Update ${{ matrix.tool.VERSION_VAR}} in script
# @TODO Make sure that the version is actually higher, not lower (the 'latest' tag does not neccessarily mean that the version is higher!)
Expand All @@ -106,13 +99,6 @@ jobs:
body: |
Bump [${{ matrix.tool.PROJECT_NAME}}](https://github.com/${{ matrix.tool.PROJECT_NAME }}) from ${{ steps.get-version-current.outputs.version_current }} to ${{ steps.get-version-latest.outputs.version_latest }} by bumping `${{ matrix.tool.VERSION_VAR}}` in `${{ matrix.tool.VAR_FILE}}`.
<details><summary><b>Release notes</b></summary>
<p><em>Sourced from <a href="https://github.com/${{ matrix.tool.PROJECT_NAME }}/releases">${{ matrix.tool.PROJECT_NAME }}'s releases</a>.
<br>Please note that this only shows the release notes for the latest release.</em></p>
<blockquote>
${{ env.CHANGE_LOG }}
</blockquote>
</details>
Check <a href="https://github.com/${{ matrix.tool.PROJECT_NAME }}/releases/latest">the upstream release notes</a>.
<p><em>Please note that the above link only shows the release notes for the latest release.</em></p>
labels: Dependencies, Bash
6 changes: 1 addition & 5 deletions config/boards/ayn-odin2.eos → config/boards/ayn-odin2.csc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ declare -g DESKTOP_AUTOLOGIN="yes"
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 KERNELBRANCH="branch:ci/odin2/stable"
declare -g LINUXCONFIG="linux-${ARCH}-${BRANCH}" # for this board: linux-arm64-sm8550
display_alert "Setting up kernel ${KERNEL_MAJOR_MINOR} for" "${BOARD}" "info"
}
Expand All @@ -45,10 +45,6 @@ function post_family_tweaks__enable_services() {
# 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
# No driver support for suspend
Expand Down
0 config/boards/beaglev.csc → config/boards/beaglev.eos
View file
File renamed without changes.
71 changes: 64 additions & 7 deletions config/boards/cm3588-nas.csc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ BOOT_LOGO="desktop"
IMAGE_PARTITION_TABLE="gpt"
BOOT_FDT_FILE="rockchip/rk3588-friendlyelec-cm3588-nas.dtb"
BOOT_SCENARIO="spl-blobs"
UEFI_EDK2_BOARD_ID="nanopc-cm3588-nas" # This _only_ used for uefi-edk2-rk3588 extension; cm3588-nas was introduced in v0.12 of edk2-porting/edk2-rk3588

function post_family_tweaks__cm3588_nas_udev_naming_audios() {
display_alert "$BOARD" "Renaming CM3588 audio interfaces to human-readable form" "info"
Expand Down Expand Up @@ -42,17 +43,73 @@ function post_family_config__cm3588_nas_use_mainline_uboot() {

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" # We ❤️ Mainline U-Boot
declare -g BOOTBRANCH="tag:v2024.10"
declare -g BOOTPATCHDIR="v2024.10"
# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency

declare -g BOOTBRANCH="tag:v2025.01"
declare -g BOOTPATCHDIR="v2025.01"
declare -g BOOTDIR="u-boot-${BOARD}" # do not share u-boot directory
declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"

# Disable stuff from rockchip64_common; we're using binman here which does all the work already
unset uboot_custom_postprocess write_uboot_platform write_uboot_platform_mtd
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

# 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 pre_config_uboot_target__cm3588_patch_uboot_dtsi_for_ums() {
display_alert "u-boot for ${BOARD}" "u-boot: add to u-boot dtsi for UMS" "info" # avoid a patch, just append to the dtsi file
cat <<- UBOOT_BOARD_DTSI_OTG >> arch/arm/dts/rk3588-friendlyelec-cm3588-nas-u-boot.dtsi
&u2phy0 { status = "okay"; };
&u2phy0_otg { status = "okay"; };
&usbdp_phy0 { status = "okay"; };
&usb_host0_xhci { dr_mode = "peripheral"; maximum-speed = "high-speed"; status = "okay"; };
UBOOT_BOARD_DTSI_OTG
}

# "rockchip-common: boot SD card first, then NVMe, then mmc"
# include/configs/rockchip-common.h
# -#define BOOT_TARGETS "mmc1 mmc0 nvme scsi usb pxe dhcp spi"
# +#define BOOT_TARGETS "mmc0 nvme mmc1 scsi usb pxe dhcp spi"
# On cm3588-nas, mmc0 is the eMMC, mmc1 is the SD card slot
function pre_config_uboot_target__cm3588_patch_rockchip_common_boot_order() {
declare -a rockchip_uboot_targets=("mmc1" "nvme" "mmc0" "scsi" "usb" "pxe" "dhcp" "spi") # for future make-this-generic delight
display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: adjust boot order to '${rockchip_uboot_targets[*]}'" "info"
sed -i -e "s/#define BOOT_TARGETS.*/#define BOOT_TARGETS \"${rockchip_uboot_targets[*]}\"/" include/configs/rockchip-common.h
regular_git diff -u include/configs/rockchip-common.h || true
}

function post_config_uboot_target__extra_configs_for_cm3588-nas_uboot() {
display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable preboot & flash user LED in preboot" "info"
run_host_command_logged scripts/config --enable CONFIG_USE_PREBOOT
run_host_command_logged scripts/config --set-str CONFIG_PREBOOT "'led led-1 on; sleep 0.1; led led-1 off'" # double quotes required due to run_host_command_logged's quirks

display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable EFI debugging commands" "info"
run_host_command_logged scripts/config --enable CMD_EFIDEBUG
run_host_command_logged scripts/config --enable CMD_NVEDIT_EFI

display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable more compression support" "info"
run_host_command_logged scripts/config --enable CONFIG_LZO
run_host_command_logged scripts/config --enable CONFIG_BZIP2
run_host_command_logged scripts/config --enable CONFIG_ZSTD

display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable gpio LED support" "info"
run_host_command_logged scripts/config --enable CONFIG_LED
run_host_command_logged scripts/config --enable CONFIG_LED_GPIO

display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable networking cmds" "info"
run_host_command_logged scripts/config --enable CONFIG_CMD_NFS
run_host_command_logged scripts/config --enable CONFIG_CMD_WGET
run_host_command_logged scripts/config --enable CONFIG_CMD_DNS
run_host_command_logged scripts/config --enable CONFIG_PROT_TCP
run_host_command_logged scripts/config --enable CONFIG_PROT_TCP_SACK

# UMS, RockUSB, gadget stuff
display_alert "u-boot for ${BOARD}/${BRANCH}" "u-boot: enable UMS/RockUSB gadget" "info"
declare -a enable_configs=("CONFIG_CMD_USB_MASS_STORAGE" "CONFIG_USB_GADGET" "USB_GADGET_DOWNLOAD" "CONFIG_USB_FUNCTION_ROCKUSB" "CONFIG_USB_FUNCTION_ACM" "CONFIG_CMD_ROCKUSB" "CONFIG_CMD_USB_MASS_STORAGE")
for config in "${enable_configs[@]}"; do
run_host_command_logged scripts/config --enable "${config}"
done
# Auto-enabled by the above, force off...
run_host_command_logged scripts/config --disable USB_FUNCTION_FASTBOOT

return 0
}
2 changes: 1 addition & 1 deletion config/boards/coolpi-genbook.csc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function post_family_config_branch_edge__coolpi-genbook_use_mainline_uboot() {
declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # Mainline U-Boot
unset BOOTBRANCH
declare -g BOOTPATCHDIR="v2025.01-rc3-coolpi-cm5"
declare -g BOOTBRANCH_BOARD="tag:v2025.01-rc3"
declare -g BOOTBRANCH_BOARD="tag:v2025.01"
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

Expand Down
28 changes: 12 additions & 16 deletions config/boards/h96-tvbox-3566.tvb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,25 @@
BOARD_NAME="h96-tvbox-3566"
BOARDFAMILY="rockchip64"
BOARD_MAINTAINER="hqnicolas"
BOOTCONFIG="rk3568_defconfig"
KERNEL_TARGET="current,edge"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3566-h96-tvbox.dtb"
BOOT_LOGO="desktop"
BOOT_SCENARIO="spl-blobs"
FULL_DESKTOP="yes"
IMAGE_PARTITION_TABLE="gpt"
KERNEL_TARGET="current,edge"

DDR_BLOB="rk35/rk3568_ddr_1560MHz_v1.21.bin"
BL31_BLOB="rk35/rk3568_bl31_v1.44.elf"

# Mainline U-Boot
function post_family_config__h96_max_use_mainline_uboot() {
display_alert "$BOARD" "Using mainline U-Boot for $BOARD / $BRANCH" "info"

declare -g BOOTCONFIG="generic-rk3568_defconfig" # Use generic defconfig which should boot all RK3568 boards
declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git" # We ❤️ Mainline U-Boot
declare -g BOOTBRANCH="tag:v2024.07"
declare -g BOOTPATCHDIR="v2024.07/board_${BOARD}"
# Don't set BOOTDIR, allow shared U-Boot source directory for disk space efficiency

declare -g UBOOT_TARGET_MAP="BL31=${RKBIN_DIR}/${BL31_BLOB} ROCKCHIP_TPL=${RKBIN_DIR}/${DDR_BLOB};;u-boot-rockchip.bin"

# Disable stuff from rockchip64_common; we're using binman here which does all the work already
declare -g BOOTCONFIG="h96max-v56_defconfig"
declare -g BOOTSOURCE="https://github.com/u-boot/u-boot.git"
declare -g BOOTBRANCH="tag:v2025.01"
declare -g BOOTPATCHDIR="v2025.01/board_${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

# 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
}
Expand Down
3 changes: 2 additions & 1 deletion config/boards/hinlink-h66k.csc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ BOARD_NAME="Hinlink H66K"
BOARDFAMILY="rk35xx"
BOARD_MAINTAINER=""
BOOTCONFIG="radxa-e25-rk3568_defconfig"
KERNEL_TARGET="edge"
KERNEL_TARGET="current,edge"
KERNEL_TEST_TARGET="current"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3568-hinlink-h66k.dtb"
Expand Down
3 changes: 2 additions & 1 deletion config/boards/hinlink-h68k.csc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ BOARD_NAME="Hinlink H68K"
BOARDFAMILY="rk35xx"
BOARD_MAINTAINER=""
BOOTCONFIG="radxa-e25-rk3568_defconfig"
KERNEL_TARGET="edge"
KERNEL_TARGET="current,edge"
KERNEL_TEST_TARGET="current"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3568-hinlink-h68k.dtb"
Expand Down
3 changes: 2 additions & 1 deletion config/boards/hinlink-hnas.csc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ BOARD_NAME="Hinlink HNAS"
BOARDFAMILY="rk35xx"
BOARD_MAINTAINER=""
BOOTCONFIG="radxa-e25-rk3568_defconfig"
KERNEL_TARGET="edge"
KERNEL_TARGET="current,edge"
KERNEL_TEST_TARGET="current"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3568-hinlink-hnas.dtb"
Expand Down
0 config/boards/macchiatobin-doubleshot.csc → config/boards/macchiatobin-doubleshot.eos
View file
File renamed without changes.
Loading

0 comments on commit 63b90a0

Please sign in to comment.