diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-01-30 13:30:25 +0000 |
---|---|---|
committer | Andrei Gherzan <andrei@gherzan.com> | 2018-02-01 13:40:32 +0000 |
commit | ea35d07b5bc7df34e73d86f3566775f8216f1c29 (patch) | |
tree | 2677115662a175d3f69e826a84fa6c0130a05e3f | |
parent | 8643e28c3a6ac72ed19e98b36a9b113e22c87a06 (diff) | |
download | meta-raspberrypi-ea35d07b5bc7df34e73d86f3566775f8216f1c29.tar.gz |
recipes: use oe.utils.conditional instead of deprecated base_conditional
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | recipes-kernel/linux/linux-raspberrypi.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc index 47d7efa..2e62986 100644 --- a/recipes-kernel/linux/linux-raspberrypi.inc +++ b/recipes-kernel/linux/linux-raspberrypi.inc | |||
@@ -22,10 +22,10 @@ KBUILD_DEFCONFIG_raspberrypi3-64 ?= "bcmrpi3_defconfig" | |||
22 | CMDLINE ?= "dwc_otg.lpm_enable=0 console=serial0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" | 22 | CMDLINE ?= "dwc_otg.lpm_enable=0 console=serial0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait" |
23 | 23 | ||
24 | # Add the kernel debugger over console kernel command line option if enabled | 24 | # Add the kernel debugger over console kernel command line option if enabled |
25 | CMDLINE_append = ' ${@base_conditional("ENABLE_KGDB", "1", "kgdboc=serial0,115200", "", d)}' | 25 | CMDLINE_append = ' ${@oe.utils.conditional("ENABLE_KGDB", "1", "kgdboc=serial0,115200", "", d)}' |
26 | 26 | ||
27 | # Disable rpi logo on boot | 27 | # Disable rpi logo on boot |
28 | CMDLINE_append += ' ${@base_conditional("DISABLE_RPI_BOOT_LOGO", "1", "logo.nologo", "", d)}' | 28 | CMDLINE_append += ' ${@oe.utils.conditional("DISABLE_RPI_BOOT_LOGO", "1", "logo.nologo", "", d)}' |
29 | 29 | ||
30 | # You can define CMDLINE_DEBUG as "debug" in your local.conf or distro.conf | 30 | # You can define CMDLINE_DEBUG as "debug" in your local.conf or distro.conf |
31 | # to enable kernel debugging. | 31 | # to enable kernel debugging. |
@@ -38,7 +38,7 @@ UDEV_GE_141 ?= "1" | |||
38 | # Enable OABI compat for people stuck with obsolete userspace | 38 | # Enable OABI compat for people stuck with obsolete userspace |
39 | ARM_KEEP_OABI ?= "1" | 39 | ARM_KEEP_OABI ?= "1" |
40 | 40 | ||
41 | KERNEL_INITRAMFS ?= '${@base_conditional("INITRAMFS_IMAGE_BUNDLE", "1", "1", "", d)}' | 41 | KERNEL_INITRAMFS ?= '${@oe.utils.conditional("INITRAMFS_IMAGE_BUNDLE", "1", "1", "", d)}' |
42 | 42 | ||
43 | KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains("MACHINE_FEATURES", "pitft28r", "stmpe-ts", "", d)}" | 43 | KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains("MACHINE_FEATURES", "pitft28r", "stmpe-ts", "", d)}" |
44 | 44 | ||