X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-bsp%2Fmeta-raspberrypi%2Frecipes-kernel%2Flinux%2Flinux-raspberrypi_%25.bbappend;h=238dd164371df2fe1902a86f20fec0102dfa8ff0;hb=1c3c06842ac1b9c089d0a08e91c60f44e4844fac;hp=37066068b93afa4a7510866b24b6a07eac70bfcd;hpb=d0310f8e58504d238f629c0532e443ef7f496354;p=AGL%2Fmeta-agl.git

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 37066068b..238dd1643 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,102 +1,26 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
+require recipes-kernel/linux/linux-agl.inc
+
 SRC_URI_append = "\
-    ${@base_conditional('USE_FAYTECH_MONITOR', '1', 'file://0002-faytech-fix-rpi.patch', '', d)} \
+    ${@oe.utils.conditional('USE_FAYTECH_MONITOR', '1', 'file://0002-faytech-fix-rpi.patch', '', d)} \
 "
+#take in account that linux under xen should use the hvc0 console
+SERIAL_OPTION = "${@bb.utils.contains('AGL_XEN_WANTED','1','hvc0','115200;ttyS0',d)}"
+SERIAL = "${@oe.utils.conditional("ENABLE_UART", "1", "console=${SERIAL_OPTION}", "", d)}"
 
-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
-
-# 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
-}
-
-do_configure_append() {
-
-    # 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
-
-    # Enable support for TP-Link TL-W722N USB Wifi adapter
-    kernel_configure_variable ATH_CARDS m
-    kernel_configure_variable ATH9K_HTC m
-
-    # 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
+CMDLINE_DEBUG = ""
 
-    # 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'
+#XEN related option
+CMDLINE_append = ' ${@bb.utils.contains('AGL_XEN_WANTED','1','clk_ignore_unused','',d)}'
 
-      yes '' | oe_runmake oldconfig
-      kernel_do_configure
-}
+#workaround for crash during brcmfmac loading. Disable it at this moment
+CMDLINE_append = ' ${@bb.utils.contains('AGL_XEN_WANTED','1','modprobe.blacklist=brcmfmac','',d)}'
 
-CMDLINE_DEBUG = ""
 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"
@@ -109,3 +33,15 @@ KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/uvc.cfg"
 
 # Enable support for joystick devices
 KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/joystick.cfg"
+
+# Enable support for Pi foundation touchscreen
+SRC_URI_append = " file://raspberrypi-panel.cfg"
+KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/raspberrypi-panel.cfg"
+
+# Enable bt hci uart
+SRC_URI_append = " file://raspberrypi-hciuart.cfg"
+KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/raspberrypi-hciuart.cfg"
+
+# ENABLE NETWORK (built-in)
+SRC_URI_append = " file://raspberrypi_network.cfg"
+KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/raspberrypi_network.cfg"