diff options
Diffstat (limited to 'meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend')
| -rw-r--r-- | meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend | 121 |
1 files changed, 27 insertions, 94 deletions
diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend index 6557ce03c..ec3fa910b 100644 --- a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend +++ b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend @@ -1,113 +1,46 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" -SRC_URI_append = "\ - ${@base_conditional('USE_FAYTECH_MONITOR', '1', 'file://0002-faytech-fix-rpi.patch', '', d)} \ -" +require recipes-kernel/linux/linux-yocto-agl.inc -# Fix CVE-2017-1000364 -SRC_URI_append = "\ - file://0001-mm-larger-stack-guard-gap-between-vmas.patch \ - file://0002-Allow-stack-to-grow-up-to-address-space-limit.patch \ - file://0003-mm-fix-new-crash-in-unmapped_area_topdown.patch \ +SRC_URI:append = " \ + ${@oe.utils.conditional('USE_FAYTECH_MONITOR', '1', 'file://0002-faytech-fix-rpi.patch', '', d)} \ + file://0001-mconf-menuconfig.patch \ " +# Enable support for Pi foundation touchscreen +AGL_KCONFIG_FRAGMENTS += "raspberrypi-panel.cfg" -do_configure_append_smack() { - # SMACK and Co - kernel_configure_variable IP_NF_SECURITY m - kernel_configure_variable IP6_NF_SECURITY m - kernel_configure_variable EXT2_FS_SECURITY y - kernel_configure_variable EXT3_FS_SECURITY y - kernel_configure_variable EXT4_FS_SECURITY y - kernel_configure_variable SECURITY y - kernel_configure_variable SECURITY_SMACK y - kernel_configure_variable TMPFS_XATTR y - kernel_configure_variable DEFAULT_SECURITY "smack" - kernel_configure_variable DEFAULT_SECURITY_SMACK y - kernel_configure_variable FANOTIFY_ACCESS_PERMISSIONS y -} - -do_configure_append_netboot() { - # NBD for netboot - kernel_configure_variable BLK_DEV_NBD y - # ramblk for inird - kernel_configure_variable BLK_DEV_RAM y -} - -do_configure_append_sota() { - # ramblk for inird - kernel_configure_variable BLK_DEV_RAM y -} - -# can -do_configure_append() { - - kernel_configure_variable TASKSTATS y - kernel_configure_variable TASK_DELAY_ACCT y - kernel_configure_variable USER_RETURN_NOTIFIER y - kernel_configure_variable PREEMPT_NOTIFIERS y - kernel_configure_variable CAN m - kernel_configure_variable CAN_RAW m - kernel_configure_variable CAN_BCM m - kernel_configure_variable CAN_GW m - kernel_configure_variable CAN_VCAN m - kernel_configure_variable CAN_SLCAN m - kernel_configure_variable CAN_DEV m - kernel_configure_variable CAN_CALC_BITTIMING y - kernel_configure_variable CAN_MCP251X m - kernel_configure_variable CAN_ESD_USB2 m - kernel_configure_variable CAN_GS_USB m - kernel_configure_variable CAN_KVASER_USB m - kernel_configure_variable CAN_PEAK_USB m - kernel_configure_variable CAN_8DEV_USB m +# Enable bt hci uart +AGL_KCONFIG_FRAGMENTS += "raspberrypi-hciuart.cfg" -# not enabled, yet ? -# kernel_configure_variable CAN_LEDS is not set -# kernel_configure_variable CAN_SJA1000 is not set -# kernel_configure_variable CAN_C_CAN is not set -# kernel_configure_variable CAN_M_CAN is not set -# kernel_configure_variable CAN_CC770 is not set -# kernel_configure_variable CAN_EMS_USB is not set -# kernel_configure_variable CAN_SOFTING is not set -# kernel_configure_variable CAN_DEBUG_DEVICES is not set -} +# ENABLE NETWORK (built-in) +AGL_KCONFIG_FRAGMENTS += "raspberrypi_network.cfg" -do_configure_append() { +# For Xen +AGL_KCONFIG_FRAGMENTS += " \ + ${@bb.utils.contains('AGL_XEN_WANTED','1','xen-be.cfg','',d)} \ +" - # VC4 Wayland/Weston - kernel_configure_variable I2C_BCM2835 y - kernel_configure_variable DRM y - kernel_configure_variable DRM_PANEL_RASPBERRYPI_TOUCHSCREEN y - kernel_configure_variable DRM_VC4 y - kernel_configure_variable FB_BCM2708 n +# Take in account that linux under Xen should use the hvc0 console +SERIAL_OPTION = "${@bb.utils.contains('AGL_XEN_WANTED','1','hvc0','ttyS0,115200',d)}" +SERIAL = "${@oe.utils.conditional("ENABLE_UART", "1", "console=${SERIAL_OPTION}", "", d)}" - # Enable support for TP-Link TL-W722N USB Wifi adapter - kernel_configure_variable ATH_CARDS m - kernel_configure_variable ATH9K_HTC m +CMDLINE_DEBUG = "" - # Enable support for RTLSDR - kernel_configure_variable MEDIA_USB_SUPPORT y - kernel_configure_variable MEDIA_DIGITAL_TV_SUPPORT y - kernel_configure_variable DVB_USB_V2 m - kernel_configure_variable DVB_USB_RTL28XXU m +# Xen related option +CMDLINE:append = ' ${@bb.utils.contains('AGL_XEN_WANTED','1','clk_ignore_unused','',d)}' - # KEEP until fixed upstream: - # Keep this the last line - # Remove all modified configs and add the rest to .config - sed -e "${CONF_SED_SCRIPT}" < '${WORKDIR}/defconfig' >> '${B}/.config' +# Workaround for crash during brcmfmac loading. Disable it at this moment +CMDLINE:append = ' ${@bb.utils.contains('AGL_XEN_WANTED','1','modprobe.blacklist=brcmfmac','',d)}' - yes '' | oe_runmake oldconfig - kernel_do_configure -} - -CMDLINE_DEBUG = "" -CMDLINE_append = " usbhid.mousepoll=0" +CMDLINE:append = " usbhid.mousepoll=0" # Add options to allow CMA to operate -CMDLINE_append = ' ${@base_conditional("ENABLE_CMA", "1", "coherent_pool=6M smsc95xx.turbo_mode=N", "", d)}' +CMDLINE:append = '${@oe.utils.conditional("ENABLE_CMA", "1", " coherent_pool=6M smsc95xx.turbo_mode=N", "", d)}' KERNEL_MODULE_AUTOLOAD += "snd-bcm2835" KERNEL_MODULE_AUTOLOAD += "hid-multitouch" -RDEPENDS_${PN} += "kernel-module-snd-bcm2835" PACKAGES += "kernel-module-snd-bcm2835" + +RDEPENDS:${PN} += "kernel-module-snd-bcm2835" |