machine configs: don't deploy the kernel in /boot

In our images this has been done during do_rootfs and friends,
do it the oe-core way.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

6 files changed, 12 insertions, 16 deletions

diff --git a/conf/machine/apalis-t30.conf b/conf/machine/apalis-t30.conf
index fb95e73..8537f46 100644
--- a/conf/machine/apalis-t30.conf
+++ b/conf/machine/apalis-t30.conf
@@ -6,12 +6,6 @@ require conf/machine/include/tegra-base.inc
 
 SOC_FAMILY = "tegra:tegra3"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
-
-KERNEL_IMAGETYPE = "uImage"
-
-PREFERRED_PROVIDER_u-boot = "u-boot-toradex"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex"
 UBOOT_MACHINE = "apalis_t30_defconfig"
 UBOOT_ENTRYPOINT = "0x82008000"
 UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
diff --git a/conf/machine/apalis-tk1-mainline.conf b/conf/machine/apalis-tk1-mainline.conf
index 8d95716..270f093 100644
--- a/conf/machine/apalis-tk1-mainline.conf
+++ b/conf/machine/apalis-tk1-mainline.conf
@@ -12,6 +12,8 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-mainline"
 KERNEL_IMAGETYPE = "uImage"
 KERNEL_DEFCONFIG = "tegra_defconfig"
 KERNEL_DEVICETREE += "tegra124-apalis-eval.dtb"
+# The kernel lives in a seperate FAT or UBI partition, don't deploy it in /boot
+RDEPENDS_kernel-base = ""
 
 PREFERRED_PROVIDER_u-boot = "u-boot-toradex"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex"
diff --git a/conf/machine/apalis-tk1.conf b/conf/machine/apalis-tk1.conf
index 29ae5c5..8f58763 100644
--- a/conf/machine/apalis-tk1.conf
+++ b/conf/machine/apalis-tk1.conf
@@ -11,6 +11,8 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
 
 KERNEL_IMAGETYPE = "uImage"
 KERNEL_DEVICETREE += "tegra124-apalis-eval.dtb"
+# The kernel lives in a seperate FAT or UBI partition, don't deploy it in /boot
+RDEPENDS_kernel-base = ""
 
 PREFERRED_PROVIDER_u-boot = "u-boot-toradex"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex"
diff --git a/conf/machine/colibri-t20.conf b/conf/machine/colibri-t20.conf
index 2c6e7f9..07e004a 100644
--- a/conf/machine/colibri-t20.conf
+++ b/conf/machine/colibri-t20.conf
@@ -6,15 +6,11 @@ require conf/machine/include/tegra-base.inc
 
 SOC_FAMILY = "tegra:tegra2"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
-
 KERNEL_IMAGETYPE = "zImage"
 
 # U-Boot expects the kernel directly in /boot of the rootfs
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image"
 
-PREFERRED_PROVIDER_u-boot = "u-boot-toradex"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex"
 UBOOT_MACHINE = "colibri_t20_defconfig"
 UBOOT_ENTRYPOINT = "0x00008000"
 
diff --git a/conf/machine/colibri-t30.conf b/conf/machine/colibri-t30.conf
index f4d7e7c..9fb3416 100644
--- a/conf/machine/colibri-t30.conf
+++ b/conf/machine/colibri-t30.conf
@@ -6,12 +6,6 @@ require conf/machine/include/tegra-base.inc
 
 SOC_FAMILY = "tegra:tegra3"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
-
-KERNEL_IMAGETYPE = "uImage"
-
-PREFERRED_PROVIDER_u-boot = "u-boot-toradex"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex"
 UBOOT_MACHINE = "colibri_t30_defconfig"
 UBOOT_ENTRYPOINT = "0x82008000"
 UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
diff --git a/conf/machine/include/tegra-base.inc b/conf/machine/include/tegra-base.inc
index 69d45a2..8477e02 100644
--- a/conf/machine/include/tegra-base.inc
+++ b/conf/machine/include/tegra-base.inc
@@ -11,6 +11,14 @@ XSERVER = "xserver-xorg \
            xf86-video-fbdev \
            xf86-input-keyboard"
 
+PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
+KERNEL_IMAGETYPE = "uImage"
+# The kernel lives in a seperate FAT or UBI partition, don't deploy it in /boot
+RDEPENDS_kernel-base = ""
+
+PREFERRED_PROVIDER_u-boot = "u-boot-toradex"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex"
+
 PREFERRED_PROVIDER_virtual/mesa = "mesa"
 PREFERRED_PROVIDER_virtual/egl = "trdx-nv-binaries"
 PREFERRED_PROVIDER_virtual/libgles1 = "trdx-nv-binaries"