Merge remote-tracking branch 'armbian/main'

.github/labels.yml

@@ -111,4 +111,4 @@
   description: "Provided input is not in the expected data format or structure"
 - name: "Giveaway"
   color: "DA4C13"
-  description: "Code author was selected to enter contributors giveaway"
+  description: "Code completition was selected to enter contributors giveaway"

.github/workflows/merge-announce.yml

@@ -0,0 +1,20 @@
+name: push
+
+on:
+  push:
+    branches: [ main ]
+
+jobs:
+  announcepush:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get repo
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+      - name: Send push to Discord
+        run: |
+          curl -i -H "Accept: application/json" -H "Content-Type: application/json" -X POST --data \
+          "{\"username\": \"Github\", \"avatar_url\": \"${{ secrets.AVATARURL }}\", \"content\": \"\
+          :white_check_mark: **Merged** into [$GITHUB_REPOSITORY](<$GITHUB_SERVER_URL/$GITHUB_REPOSITORY>) by [$GITHUB_ACTOR](<$GITHUB_SERVER_URL/$GITHUB_ACTOR>) - \
+          [Link](<$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/commit/$GITHUB_SHA>): *$(git show -s --format=%s)*\"}" ${{ secrets.WEBHOOKURL }}

.github/workflows/pr-announce.yml

@@ -0,0 +1,18 @@
+on:
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get repo
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+      - name: Discord webhook
+        run: |
+          curl -i -H "Accept: application/json" -H "Content-Type: application/json" -X POST --data \
+          "{\"username\": \"Github\", \"avatar_url\": \"${{ secrets.AVATARURL }}\", \"content\": \"\
+          :arrow_heading_up: **Pull request** to [$GITHUB_REPOSITORY](<$GITHUB_SERVER_URL/$GITHUB_REPOSITORY>) by [$GITHUB_ACTOR](<$GITHUB_SERVER_URL/$GITHUB_ACTOR>) - **Please review!** \
+          :point_right: [Link](<$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/commit/$GITHUB_SHA>): *$(git show -s --format=%s)*\"}" ${{ secrets.WEBHOOKURL }}

.github/workflows/scorecard.yml

@@ -33,7 +33,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@v2.3.3
+        uses: ossf/scorecard-action@v2.4.0
         with:
           results_file: results.sarif
           results_format: sarif
@@ -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@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
         with:
           name: SARIF file
           path: results.sarif

config/boards/armsom-sige5.csc

@@ -2,14 +2,15 @@
 BOARD_NAME="ArmSoM Sige5"
 BOARDFAMILY="rk35xx"
 BOOTCONFIG="armsom-sige5-rk3576_defconfig"
-KERNEL_TARGET="rk3576"
+KERNEL_TARGET="vendor"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3576-armsom-sige5.dtb"
 BOOT_SCENARIO="spl-blobs"
 IMAGE_PARTITION_TABLE="gpt"
 SRC_EXTLINUX="yes"
 MODULES_BLACKLIST="panfrost"
+BOARD_MAINTAINER=""
 
 function post_family_config_branch_vendor__armsom-sige7_use_vendor_uboot() {
         display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"

config/boards/bigtreetech-cb1.conf

@@ -1,14 +1,18 @@
 # Allwinner H616 quad core 512MB/1GB RAM SoC WiFi
 BOARD_NAME="BigTreeTech CB1"
-BOARDFAMILY="sun50iw9-btt"
-BOARD_MAINTAINER="bigtreetech"
+BOARDFAMILY="sun50iw9"
+BOARD_MAINTAINER="JohnTheCoolingFan"
 BOOTCONFIG="bigtreetech_cb1_defconfig"
-DEFAULT_CONSOLE="serial"
 SERIALCON="ttyS0"
-KERNEL_TARGET="legacy,current,edge"
-KERNEL_TEST_TARGET="legacy"
+KERNEL_TARGET="current,edge"
 FORCE_BOOTSCRIPT_UPDATE="yes"
 BOOTFS_TYPE="fat"
 BOOT_FS_LABEL="BOOT"
 OVERLAY_PREFIX="sun50i-h616"
 BOOT_FDT_FILE="allwinner/sun50i-h616-bigtreetech-cb1-sd.dtb"
+
+post_family_config__fdt_bigtreetech_cb1() {
+	if [[ "${BRANCH}" = "edge" ]]; then
+		BOOT_FDT_FILE="allwinner/sun50i-h616-bigtreetech-pi.dtb"
+	fi
+}

config/boards/h96-tvbox-3566.tvb

@@ -1,11 +1,31 @@
 # Rockchip RK3566 quad core SoC WIFI/BT eMMC USB2/3
 BOARD_NAME="h96-tvbox-3566"
-BOARDFAMILY="rk35xx"
+BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER="hqnicolas"
 BOOTCONFIG="rk3568_defconfig"
-KERNEL_TARGET="current,edge"
+KERNEL_TARGET="current"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3566-h96-tvbox.dtb"
 IMAGE_PARTITION_TABLE="gpt"
-BOOT_SCENARIO="spl-blobs"
+
+# 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
+	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
+	}
+}

config/boards/nanopi-r5c.csc

@@ -11,8 +11,8 @@ IMAGE_PARTITION_TABLE="gpt"
 FULL_DESKTOP="no"
 BOOT_LOGO="desktop"
 
-BOOTBRANCH_BOARD="tag:v2024.04"
-BOOTPATCHDIR="v2024.04"
+BOOTBRANCH_BOARD="tag:v2024.07"
+BOOTPATCHDIR="v2024.07/board_${BOARD}"
 BOOTCONFIG="nanopi-r5c-rk3568_defconfig"
 
 OVERLAY_PREFIX="rockchip-rk3568"

config/boards/thinkpad-x13s.wip

@@ -28,8 +28,8 @@ enable_extension "grub-with-dtb"             # important, puts the whole DTB han
 declare -g BOARD_FIRMWARE_INSTALL="-full"
 
 function post_family_config_branch_sc8280xp__jhovolds_69y_kernel() {
-	declare -g KERNEL_MAJOR_MINOR="6.9" # Major and minor versions of this kernel.
-	declare -g KERNELBRANCH='branch:wip/sc8280xp-6.10-rc7'
+	declare -g KERNEL_MAJOR_MINOR="6.10" # Major and minor versions of this kernel.
+	declare -g KERNELBRANCH='branch:wip/sc8280xp-6.10'
 	declare -g KERNELSOURCE='https://github.com/jhovold/linux.git'
 	declare -g LINUXCONFIG="linux-${ARCH}-${BRANCH}" # for this board: linux-arm64-sc8280xp
 	display_alert "Set up jhovold's kernel ${KERNELBRANCH} for" "${BOARD}" "info"

config/desktop/jammy/environments/kde-neon/support

@@ -1 +1 @@
-csc
+supported