From 5c391f0e05df778a1980c1e0bcecf3150f15f035 Mon Sep 17 00:00:00 2001
From: Mecid <mecid@mecomediagroup.de>
Date: Fri, 28 Mar 2025 11:38:11 +0100
Subject: [PATCH] Switch canonical to vendor to keep more inline with other
 families

---
 config/boards/radxa-nio-12l.csc                           | 8 ++++----
 .../{linux-genio-bsp.config => linux-genio-vendor.config} | 0
 config/sources/families/genio.conf                        | 6 +++---
 .../0000.patching_config.yaml                             | 4 ++--
 .../001-Mali-DDK-r43p0-to-r48p0.patch                     | 0
 .../dt/mt8395-radxa-nio-12l.dts                           | 0
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename config/kernel/{linux-genio-bsp.config => linux-genio-vendor.config} (100%)
 rename patch/kernel/{genio-1200-bsp => genio-1200-vendor}/0000.patching_config.yaml (96%)
 rename patch/kernel/{genio-1200-bsp => genio-1200-vendor}/001-Mali-DDK-r43p0-to-r48p0.patch (100%)
 rename patch/kernel/{genio-1200-bsp => genio-1200-vendor}/dt/mt8395-radxa-nio-12l.dts (100%)

diff --git a/config/boards/radxa-nio-12l.csc b/config/boards/radxa-nio-12l.csc
index 1bd8aada85..a100a4d607 100644
--- a/config/boards/radxa-nio-12l.csc
+++ b/config/boards/radxa-nio-12l.csc
@@ -2,15 +2,15 @@
 BOARD_NAME="Radxa Nio 12L"
 BOARDFAMILY="genio"
 BOARD_MAINTAINER="HeyMeco"
-KERNEL_TARGET="collabora,canonical"
+KERNEL_TARGET="collabora,vendor"
 KERNEL_TEST_TARGET="collabora"
 BOOT_FDT_FILE="mediatek/mt8395-radxa-nio-12l.dtb"
 enable_extension "grub-with-dtb"
 HAS_VIDEO_OUTPUT="yes"
 
-# Post-config function for canonical branch
-function post_family_config__nio12l_canonical_setup() {
-	if [[ "${BRANCH}" == "canonical" ]]; then
+# Post-config function for vendor branch
+function post_family_config__nio12l_vendor_setup() {
+	if [[ "${BRANCH}" == "vendor" ]]; then
 		display_alert "Setting up Genio-Firmware package for ${BOARD}" "${RELEASE}///${BOARD}" "info"
 		add_packages_to_image "linux-firmware-mediatek-genio" "ubuntu-dev-tools" "ubuntu-desktop"
 	fi
diff --git a/config/kernel/linux-genio-bsp.config b/config/kernel/linux-genio-vendor.config
similarity index 100%
rename from config/kernel/linux-genio-bsp.config
rename to config/kernel/linux-genio-vendor.config
diff --git a/config/sources/families/genio.conf b/config/sources/families/genio.conf
index 099c8a0282..acb95b202e 100644
--- a/config/sources/families/genio.conf
+++ b/config/sources/families/genio.conf
@@ -28,11 +28,11 @@ case $BRANCH in
 		declare -g INSTALL_HEADERS="yes"
 		;;
 
-	canonical)
+	vendor)
 
-		declare -g LINUXCONFIG="linux-genio-bsp"
+		declare -g LINUXCONFIG="linux-genio-vendor"
 		declare -g KERNEL_MAJOR_MINOR="5.15"
-		declare -g KERNELPATCHDIR='genio-1200-bsp'
+		declare -g KERNELPATCHDIR='genio-1200-vendor'
 		declare -g KERNELSOURCE='https://git.launchpad.net/~canonical-kernel/ubuntu/+source/linux-mtk/+git/jammy'
 		declare -g KERNELBRANCH='branch:master-next'
 		declare -g EXTRAWIFI="no"
diff --git a/patch/kernel/genio-1200-bsp/0000.patching_config.yaml b/patch/kernel/genio-1200-vendor/0000.patching_config.yaml
similarity index 96%
rename from patch/kernel/genio-1200-bsp/0000.patching_config.yaml
rename to patch/kernel/genio-1200-vendor/0000.patching_config.yaml
index 99a0d497fb..934858e719 100644
--- a/patch/kernel/genio-1200-bsp/0000.patching_config.yaml
+++ b/patch/kernel/genio-1200-vendor/0000.patching_config.yaml
@@ -1,9 +1,9 @@
 config:
 
   # Just some info stuff; not used by the patching scripts
-  name: genio-1200-bsp
+  name: genio-1200-vendor
   kind: kernel
-  type: mtk-bsp # or: vendor
+  type: mtk-vendor
   branch: mtk-v5.15-dev
 
   # .dts files in these directories will be copied as-is to the build tree; later ones overwrite earlier ones.
diff --git a/patch/kernel/genio-1200-bsp/001-Mali-DDK-r43p0-to-r48p0.patch b/patch/kernel/genio-1200-vendor/001-Mali-DDK-r43p0-to-r48p0.patch
similarity index 100%
rename from patch/kernel/genio-1200-bsp/001-Mali-DDK-r43p0-to-r48p0.patch
rename to patch/kernel/genio-1200-vendor/001-Mali-DDK-r43p0-to-r48p0.patch
diff --git a/patch/kernel/genio-1200-bsp/dt/mt8395-radxa-nio-12l.dts b/patch/kernel/genio-1200-vendor/dt/mt8395-radxa-nio-12l.dts
similarity index 100%
rename from patch/kernel/genio-1200-bsp/dt/mt8395-radxa-nio-12l.dts
rename to patch/kernel/genio-1200-vendor/dt/mt8395-radxa-nio-12l.dts