summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/am62xx-tdx.inc11
-rw-r--r--conf/machine/verdin-am62.conf7
2 files changed, 7 insertions, 11 deletions
diff --git a/conf/machine/am62xx-tdx.inc b/conf/machine/am62xx-tdx.inc
deleted file mode 100644
index 6bc3741..0000000
--- a/conf/machine/am62xx-tdx.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-# Hack to override stuff in meta-ti
-# This file is included in our conf/layer.conf , i.e. HACKĀ²
-
-# meta-ti-bsp/conf/machine/include/k3.inc
-# With "sdimage-2part-efi.wks" my builds do not boot, no serial output at
-# all
-WKS_FILE:k3 = "sdimage-2part.wks"
-
-MACHINE_EXTRA_RRECOMMENDS:append:am62xx = " kernel-modules"
-
-PREFERRED_PROVIDER_virtual/dtb:am62xx = "device-tree-overlays-ti"
diff --git a/conf/machine/verdin-am62.conf b/conf/machine/verdin-am62.conf
index 1fd15e0..4fccd14 100644
--- a/conf/machine/verdin-am62.conf
+++ b/conf/machine/verdin-am62.conf
@@ -18,8 +18,11 @@ IMAGE_BOOT_FILES:remove = "tiboot3-am62x-hs-evm.bin"
# Don't include kernels in standard images
RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
+# Install kernel modules by default
+MACHINE_EXTRA_RRECOMMENDS:append:am62xx = " kernel-modules"
PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-ti"
+PREFERRED_PROVIDER_virtual/dtb = "device-tree-overlays-ti"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex-ti-staging"
PREFERRED_PROVIDER_u-boot = "u-boot-toradex-ti-staging"
@@ -49,6 +52,10 @@ IMAGE_BOOT_FILES = " \
${@make_dtb_boot_files(d)} \
"
+# meta-ti-bsp/conf/machine/include/k3.inc
+# With "sdimage-2part-efi.wks" my builds do not boot, no serial output at
+# all
+WKS_FILE:k3 = "sdimage-2part.wks"
WKS_FILE_DEPENDS:append = " u-boot-distro-boot"
WIC_CREATE_EXTRA_ARGS:append = " --no-fstab-update"