diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2023-05-17 13:52:40 +0200 |
|---|---|---|
| committer | Francesco Dolcini <francesco.dolcini@toradex.com> | 2023-06-05 09:51:23 +0000 |
| commit | 46431b28772c22a669ce204ea62c135c4e396221 (patch) | |
| tree | 062c9b7d82c09095cdd8e2f3b2ea07020c048f59 /conf | |
| parent | 0b261c143751f752303361fcd0f31fdbd0b18554 (diff) | |
verdin-am62: remove hackish adaption of meta-ti
Now that we build our own machine verdin-am62 we don't need the
hackish and hidden overrides of certain variables.
Move these settings into the machine configuration.
Related-to: ELB-5190
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/layer.conf | 3 | ||||
| -rw-r--r-- | conf/machine/am62xx-tdx.inc | 11 | ||||
| -rw-r--r-- | conf/machine/verdin-am62.conf | 7 |
3 files changed, 7 insertions, 14 deletions
diff --git a/conf/layer.conf b/conf/layer.conf index aa9afd4..e148b52 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -1,6 +1,3 @@ -# Hack to change stuff in meta-ti -require machine/am62xx-tdx.inc - # We have a conf and classes directory, append to BBPATH BBPATH .= ":${LAYERDIR}" 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" |