4 files changed, 6 insertions, 0 deletions

diff --git a/meta-ti-bsp/conf/machine/am335x-hs-evm.conf b/meta-ti-bsp/conf/machine/am335x-hs-evm.conf
index 652496c2..562befe9 100644
--- a/meta-ti-bsp/conf/machine/am335x-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/am335x-hs-evm.conf
@@ -11,6 +11,7 @@ UBOOT_CONFIG[uart] = "am335x_hs_evm_uart_config"
 UBOOT_CONFIG[mmc] = "am335x_hs_evm_config"
 
 # FIT image for legacy secure devices
+KERNEL_BASE_CLASS = "kernel_legacyhs"
 KERNEL_CLASSES += " kernel-fitimage-legacyhs"
 KERNEL_IMAGETYPES += " fitImage"
 
diff --git a/meta-ti-bsp/conf/machine/am437x-hs-evm.conf b/meta-ti-bsp/conf/machine/am437x-hs-evm.conf
index fde38d39..35b8d0a4 100644
--- a/meta-ti-bsp/conf/machine/am437x-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/am437x-hs-evm.conf
@@ -12,6 +12,7 @@ OPTEEFLAVOR = "am43xx"
 EXTRA_IMAGEDEPENDS += "optee-os"
 
 # FIT image for legacy secure devices
+KERNEL_BASE_CLASS = "kernel_legacyhs"
 KERNEL_CLASSES += " kernel-fitimage-legacyhs"
 KERNEL_IMAGETYPES += " fitImage"
 
diff --git a/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf b/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf
index fcdc5c0b..e06c9728 100644
--- a/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/am57xx-hs-evm.conf
@@ -13,6 +13,7 @@ OPTEEPAGER = "y"
 EXTRA_IMAGEDEPENDS += "optee-os"
 
 # FIT image for legacy secure devices
+KERNEL_BASE_CLASS = "kernel_legacyhs"
 KERNEL_CLASSES += " kernel-fitimage-legacyhs"
 KERNEL_IMAGETYPES += " fitImage"
 
diff --git a/meta-ti-bsp/conf/machine/include/ti-soc.inc b/meta-ti-bsp/conf/machine/include/ti-soc.inc
index e3a50fdd..56ea9e47 100644
--- a/meta-ti-bsp/conf/machine/include/ti-soc.inc
+++ b/meta-ti-bsp/conf/machine/include/ti-soc.inc
@@ -11,3 +11,6 @@ UBOOT_RD_ENTRYPOINT = "0x84000000"
 
 # TI platforms all use devicetrees with overlays
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree"
+
+# All machines should start off pointing at the default base kernel class
+KERNEL_BASE_CLASS = "kernel"