From 599785eb6b405cf6896866f4f7ca58888c5d8168 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor@armbian.com>
Date: Wed, 1 Jan 2025 17:47:30 +0100
Subject: [PATCH] riscv64: enable support in Debian Trixie, enable UEFI grub

---
 config/distributions/trixie/architectures | 2 +-
 extensions/grub-riscv64.sh                | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/config/distributions/trixie/architectures b/config/distributions/trixie/architectures
index aa3ead768444..6103381d1881 100644
--- a/config/distributions/trixie/architectures
+++ b/config/distributions/trixie/architectures
@@ -1 +1 @@
-arm64,armhf,amd64
+arm64,armhf,riscv64,amd64
diff --git a/extensions/grub-riscv64.sh b/extensions/grub-riscv64.sh
index e488e7cd1b18..8455c83ac053 100644
--- a/extensions/grub-riscv64.sh
+++ b/extensions/grub-riscv64.sh
@@ -19,10 +19,6 @@ function extension_prepare_config__prepare_grub-riscv64() {
 	declare -g EXTRA_BSP_NAME="${EXTRA_BSP_NAME}-grub"                               # Unique bsp name.
 	declare -g UEFI_GRUB_TARGET="riscv64-efi"                                        # Default for x86_64
 
-	if [[ "${DISTRIBUTION}" != "Ubuntu" && "${BUILDING_IMAGE}" == "yes" ]]; then
-		exit_with_error "Extension: ${EXTENSION}: ${DISTRIBUTION} is not supported yet"
-	fi
-
 	add_packages_to_image efibootmgr efivar cloud-initramfs-growroot busybox os-prober "grub-efi-${ARCH}-bin" "grub-efi-${ARCH}"
 
 	display_alert "Activating" "GRUB with SERIALCON=${SERIALCON}; timeout ${UEFI_GRUB_TIMEOUT}; target=${UEFI_GRUB_TARGET}" ""