summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2022-05-16 10:14:29 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2022-05-16 12:57:57 +0200
commit0414b79e8e860407b783548170a2d227c7f51df7 (patch)
tree464b1ce6e6a0eee9d79e39f6aa59e0a8476e94b8 /conf
parentb652240c38cdd1688ad69928295151fafc9304c8 (diff)
machines: follow kernel deployment changes
The kernel binary image is by default deployed into the rootfs, /boot/. openembedded-core changed the way it is done in a not backwards compatible way. I.e. it now RRECOMMENDS instead of RDEPENDS the package which contains the kernel binary image. Commit 1c90b27d2c ("kernel: make kernel-base recommend kernel-image, not depend") So the way to not deploy also changed. Change machines and recipes which want to prevent kernel deployment accordingly. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/apalis-imx8.conf2
-rw-r--r--conf/machine/colibri-imx6ull-emmc.conf2
-rw-r--r--conf/machine/colibri-imx8x.conf2
-rw-r--r--conf/machine/verdin-imx8mm.conf2
-rw-r--r--conf/machine/verdin-imx8mp.conf2
5 files changed, 5 insertions, 5 deletions
diff --git a/conf/machine/apalis-imx8.conf b/conf/machine/apalis-imx8.conf
index 5543dc5..b5a8732 100644
--- a/conf/machine/apalis-imx8.conf
+++ b/conf/machine/apalis-imx8.conf
@@ -17,7 +17,7 @@ DEFAULTTUNE:mx8qm-generic-bsp = "armv8a-crypto"
require conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc
# Don't include kernels in standard images
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
+RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
LOADADDR = ""
diff --git a/conf/machine/colibri-imx6ull-emmc.conf b/conf/machine/colibri-imx6ull-emmc.conf
index e12dfe3..64db068 100644
--- a/conf/machine/colibri-imx6ull-emmc.conf
+++ b/conf/machine/colibri-imx6ull-emmc.conf
@@ -28,7 +28,7 @@ KERNEL_DEVICETREE:use-nxp-bsp = " \
KERNEL_IMAGETYPE = "zImage"
# The kernel lives in its own ubi volume.
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
+RRECOMMENDS_${KERNEL_PACKAGE_NAME}-base = ""
IMX_DEFAULT_BOOTLOADER = "u-boot-toradex"
PREFERRED_PROVIDER_u-boot-default-script ?= "u-boot-script-toradex"
diff --git a/conf/machine/colibri-imx8x.conf b/conf/machine/colibri-imx8x.conf
index 085e6b4..6df8674 100644
--- a/conf/machine/colibri-imx8x.conf
+++ b/conf/machine/colibri-imx8x.conf
@@ -15,7 +15,7 @@ DEFAULTTUNE:mx8qxp-generic-bsp = "armv8a-crypto"
require conf/machine/include/arm/armv8a/tune-cortexa35.inc
# Don't include kernels in standard images
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
+RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
LOADADDR = ""
diff --git a/conf/machine/verdin-imx8mm.conf b/conf/machine/verdin-imx8mm.conf
index f70c2cf..bf58380 100644
--- a/conf/machine/verdin-imx8mm.conf
+++ b/conf/machine/verdin-imx8mm.conf
@@ -17,7 +17,7 @@ DEFAULTTUNE:mx8mm-generic-bsp = "armv8a-crypto"
require conf/machine/include/arm/armv8a/tune-cortexa53.inc
# Don't include kernels in standard images
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
+RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
KERNEL_DEVICETREE = " \
freescale/imx8mm-verdin-nonwifi-dahlia.dtb \
diff --git a/conf/machine/verdin-imx8mp.conf b/conf/machine/verdin-imx8mp.conf
index 0ba87a3..7c2f640 100644
--- a/conf/machine/verdin-imx8mp.conf
+++ b/conf/machine/verdin-imx8mp.conf
@@ -17,7 +17,7 @@ DEFAULTTUNE:mx8mp-generic-bsp = "armv8a-crypto"
require conf/machine/include/arm/armv8a/tune-cortexa53.inc
# Don't include kernels in standard images
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
+RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
KERNEL_DEVICETREE = " \
freescale/imx8mp-verdin-nonwifi-dahlia.dtb \