From f5c48494753a9f781a9f150cd6dd6dc2cfa38b71 Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Mon, 10 Nov 2025 15:20:11 -0600 Subject: [PATCH] k3-beagle: Add config for BeagleBoard.org Linux and U-Boot Instead of using the TI k3.conf and overriding configuration, add a new config for BeagleBoard.org Linux and U-Boot and use it for the boards that use that Linux/U-Boot. Signed-off-by: Andrew Davis --- config/boards/beagley-ai.conf | 15 +------------ config/boards/pocketbeagle2.conf | 23 +------------------- config/sources/families/k3-beagle.conf | 29 ++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 36 deletions(-) create mode 100644 config/sources/families/k3-beagle.conf diff --git a/config/boards/beagley-ai.conf b/config/boards/beagley-ai.conf index 2839415cd1..fb0c0ee5de 100644 --- a/config/boards/beagley-ai.conf +++ b/config/boards/beagley-ai.conf @@ -1,7 +1,7 @@ # Texas Instruments AM67A quad core 4GB USB3 DDR4 4TOPS BOARD_NAME="BeagleY-AI" -BOARDFAMILY="k3" +BOARDFAMILY="k3-beagle" BOARD_MAINTAINER="Grippy98" BOOTCONFIG="am67a_beagley_ai_a53_defconfig" BOOTFS_TYPE="fat" @@ -16,16 +16,3 @@ ATF_BOARD="lite" OPTEE_ARGS="" OPTEE_PLATFORM="k3-am62x" CC33XX_SUPPORT="yes" - -# Use these branches until BeagleY-AI goes upstream -function post_family_config_branch_current__beagley_ai_use_beagle_kernel_uboot() { - display_alert "$BOARD" " Beagleboard U-Boot and kernel overrides for $BOARD / $BRANCH" "info" - - declare -g KERNELSOURCE="https://github.com/beagleboard/linux" # BeagleBoard kernel - declare -g KERNEL_MAJOR_MINOR="6.12" - declare -g KERNELBRANCH="branch:v6.12.49-ti-arm64-r56" - declare -g LINUXFAMILY="k3-beagle" # Separate kernel package from the regular `k3` family - - declare -g BOOTSOURCE="https://github.com/beagleboard/u-boot" # BeagleBoard u-boot - declare -g BOOTBRANCH="branch:v2025.07-am6232-pocketbeagle2" -} diff --git a/config/boards/pocketbeagle2.conf b/config/boards/pocketbeagle2.conf index 17a2baf2c2..92320ec3b3 100644 --- a/config/boards/pocketbeagle2.conf +++ b/config/boards/pocketbeagle2.conf @@ -1,7 +1,7 @@ #Texas Instruments AM62 dual core 1GB USB2 DDR4 BOARD_NAME="PocketBeagle 2" -BOARDFAMILY="k3" +BOARDFAMILY="k3-beagle" BOARD_MAINTAINER="Grippy98" BOOTCONFIG="am6232_pocketbeagle2_a53_defconfig" BOOTFS_TYPE="fat" @@ -16,24 +16,3 @@ SRC_EXTLINUX="yes" SRC_CMDLINE="root=/dev/mmcblk1p2 rootwait console=ttyS2,115200n8 console=ttyGS0,115200n8 modules-load=dwc2,g_cdc" BOOT_FDT_FILE="ti/k3-am6232-pocketbeagle2.dtb" OPTEE_PLATFORM="k3-am62x" - -function current_beagle_kernel_uboot() { - declare -g KERNELSOURCE="https://github.com/beagleboard/linux" # BeagleBoard kernel - declare -g KERNEL_MAJOR_MINOR="6.12" - declare -g KERNELBRANCH="branch:v6.12.49-ti-arm64-r56" - declare -g LINUXFAMILY="k3-beagle" # Separate kernel package from the regular `k3` family - - declare -g BOOTSOURCE="https://github.com/beagleboard/u-boot" # BeagleBoard u-boot - declare -g BOOTBRANCH="branch:v2025.07-am6232-pocketbeagle2" -} - -#Until PB2 goes upstream, use this branch -function post_family_config_branch_current__pocketbeagle2_use_beagle_kernel_uboot() { - display_alert "$BOARD" " beagleboard (current branch) u-boot and kernel overrides for $BOARD / $BRANCH" "info" - current_beagle_kernel_uboot -} - -function post_family_config_branch_current-rt__pocketbeagle2_use_beagle_kernel_uboot() { - display_alert "$BOARD" " beagleboard (current-rt branch) u-boot and kernel overrides for $BOARD / $BRANCH" "info" - current_beagle_kernel_uboot -} diff --git a/config/sources/families/k3-beagle.conf b/config/sources/families/k3-beagle.conf new file mode 100644 index 0000000000..4713ecfcb5 --- /dev/null +++ b/config/sources/families/k3-beagle.conf @@ -0,0 +1,29 @@ +# +# SPDX-License-Identifier: GPL-2.0 +# +# Copyright (c) 2013-2023 Igor Pecovnik, igor@armbian.com +# +# This file is a part of the Armbian Build Framework +# https://github.com/armbian/build/ +# + +source "${BASH_SOURCE%/*}/include/k3_common.inc" + +declare -g LINUXFAMILY="k3-beagle" # Separate kernel package from the regular `k3` family +declare -g KERNELSOURCE="https://github.com/beagleboard/linux" # BeagleBoard kernel +declare -g BOOTSOURCE="https://github.com/beagleboard/u-boot" # BeagleBoard u-boot + +case "${BRANCH}" in + + current | current-rt) + declare -g KERNEL_MAJOR_MINOR="6.12" + declare -g KERNELBRANCH="branch:v6.12.49-ti-arm64-r56" + declare -g BOOTBRANCH="branch:v2025.07-am6232-pocketbeagle2" + declare -g KERNEL_DESCRIPTION="BeagleBoard.org (vendor) kernel" + declare -g ATFBRANCH="tag:11.00.09" + declare -g OPTEE_BRANCH="tag:4.6.0" + declare -g TI_LINUX_FIRMWARE_BRANCH="tag:11.00.09" + EXTRAWIFI="no" + ;; + +esac