aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-kernel
diff options
context:
space:
mode:
authorFabio Berton <fabio.berton@ossystems.com.br>2018-06-08 17:56:14 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2018-06-26 14:21:53 -0300
commitbe585d497f1f374fc9ae9307dd91c1f632431683 (patch)
tree233f4dc51200c3c9bfccf9470e327de312ab4432 /recipes-kernel
parente938a3d962420628180ef204aeb718673aa05a98 (diff)
downloadmeta-freescale-be585d497f1f374fc9ae9307dd91c1f632431683.tar.gz
meta-freescale-be585d497f1f374fc9ae9307dd91c1f632431683.tar.bz2
meta-freescale-be585d497f1f374fc9ae9307dd91c1f632431683.zip
linux-imx: Update to version 4.9.88
- Update to latest revision of 4.9.88 - Sync defconfig file with imx_v7_defconfig - Remove do_configure_prepend from linux-imx-mfgtool, once now the defconfig are the same imx_v7_defconfig - Add and update O.S. Systems Software Copyright Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> (cherry picked from commit caca591f5c8b4f2e8f7dacf4defaf1bd67717313)
Diffstat (limited to 'recipes-kernel')
-rw-r--r--recipes-kernel/linux/linux-imx-4.9.88/imx/defconfig (renamed from recipes-kernel/linux/linux-imx-4.9.11/imx/defconfig)28
-rw-r--r--recipes-kernel/linux/linux-imx-mfgtool_4.9.88.bb (renamed from recipes-kernel/linux/linux-imx-mfgtool_4.9.11.bb)9
-rw-r--r--recipes-kernel/linux/linux-imx_4.9.88.bb (renamed from recipes-kernel/linux/linux-imx_4.9.11.bb)5
3 files changed, 24 insertions, 18 deletions
diff --git a/recipes-kernel/linux/linux-imx-4.9.11/imx/defconfig b/recipes-kernel/linux/linux-imx-4.9.88/imx/defconfig
index 25fbcf67..85410638 100644
--- a/recipes-kernel/linux/linux-imx-4.9.11/imx/defconfig
+++ b/recipes-kernel/linux/linux-imx-4.9.88/imx/defconfig
@@ -32,6 +32,7 @@ CONFIG_SOC_VF610=y
# CONFIG_SWP_EMULATE is not set
CONFIG_SMP=y
CONFIG_VMSPLIT_2G=y
+CONFIG_ARM_PSCI=y
CONFIG_PREEMPT=y
CONFIG_AEABI=y
CONFIG_HIGHMEM=y
@@ -81,6 +82,9 @@ CONFIG_BT_HCIUART_ATH3K=y
CONFIG_BT_HCIBCM203X=y
CONFIG_BT_ATH3K=y
CONFIG_CFG80211=y
+CONFIG_NL80211_TESTMODE=y
+CONFIG_CFG80211_INTERNAL_REGDB=y
+CONFIG_CFG80211_WEXT=y
CONFIG_MAC80211=y
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
@@ -151,6 +155,7 @@ CONFIG_BCMDHD=y
CONFIG_BCMDHD_SDIO=y
CONFIG_BCMDHD_FW_PATH="/lib/firmware/bcm/ZP_BCM4339/fw_bcmdhd.bin"
CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/bcm/ZP_BCM4339/bcmdhd.ZP.OOB.cal"
+CONFIG_HOSTAP=y
# CONFIG_RTL_CARDS is not set
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
CONFIG_INPUT_EVDEV=y
@@ -175,6 +180,7 @@ CONFIG_INPUT_MISC=y
CONFIG_INPUT_MMA8450=y
CONFIG_INPUT_MPL3115=y
CONFIG_SENSOR_FXLS8471=y
+CONFIG_SENSOR_IMX_RPMSG=y
CONFIG_INPUT_ISL29023=y
CONFIG_SERIO_SERPORT=m
# CONFIG_LEGACY_PTYS is not set
@@ -198,6 +204,7 @@ CONFIG_SPI_IMX=y
CONFIG_SPI_FSL_LPSPI=y
CONFIG_SPI_SPIDEV=y
CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_IMX_RPMSG=y
CONFIG_GPIO_MAX732X=y
CONFIG_GPIO_PCA953X=y
CONFIG_GPIO_74X164=y
@@ -245,17 +252,19 @@ CONFIG_USB_VIDEO_CLASS=m
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_MXC_OUTPUT=y
CONFIG_VIDEO_MXC_CAPTURE=m
+CONFIG_VIDEO_MXC_CSI_CAMERA=m
+CONFIG_MXC_VADC=m
+CONFIG_MXC_MIPI_CSI=m
CONFIG_MXC_CAMERA_OV5640=m
+CONFIG_MXC_CAMERA_OV5640_V2=m
CONFIG_MXC_CAMERA_OV5642=m
CONFIG_MXC_CAMERA_OV5640_MIPI=m
+CONFIG_MXC_CAMERA_OV5640_MIPI_V2=m
+CONFIG_MXC_CAMERA_OV5647_MIPI=m
CONFIG_MXC_TVIN_ADV7180=m
CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m
CONFIG_VIDEO_MXC_IPU_OUTPUT=y
CONFIG_VIDEO_MXC_PXP_V4L2=y
-CONFIG_VIDEO_MXC_CSI_CAMERA=m
-CONFIG_MXC_VADC=m
-CONFIG_MXC_MIPI_CSI=m
-CONFIG_MXC_CAMERA_OV5647_MIPI=m
CONFIG_SOC_CAMERA=y
CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_CODA=y
@@ -324,7 +333,7 @@ CONFIG_USB_EHSET_TEST_FIXTURE=y
CONFIG_NOP_USB_XCEIV=y
CONFIG_USB_MXS_PHY=y
CONFIG_USB_GADGET=y
-CONFIG_USB_CONFIGFS=m
+CONFIG_USB_CONFIGFS=y
CONFIG_USB_CONFIGFS_SERIAL=y
CONFIG_USB_CONFIGFS_ACM=y
CONFIG_USB_CONFIGFS_OBEX=y
@@ -334,6 +343,7 @@ CONFIG_USB_CONFIGFS_ECM_SUBSET=y
CONFIG_USB_CONFIGFS_RNDIS=y
CONFIG_USB_CONFIGFS_EEM=y
CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_FSL_UTP=y
CONFIG_USB_CONFIGFS_F_LB_SS=y
CONFIG_USB_CONFIGFS_F_FS=y
CONFIG_USB_ZERO=m
@@ -348,10 +358,10 @@ CONFIG_MMC_SDHCI_PLTFM=y
CONFIG_MMC_SDHCI_ESDHC_IMX=y
CONFIG_MXC_IPU=y
CONFIG_MXC_IPU_V3_PRE=y
-CONFIG_MXC_GPU_VIV=y
-CONFIG_MXC_SIM=y
CONFIG_MXC_MIPI_CSI2=y
CONFIG_MXC_HDMI_CEC=y
+CONFIG_MXC_SIM=y
+CONFIG_MXC_SIMv2=y
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
CONFIG_LEDS_GPIO=y
@@ -366,6 +376,7 @@ CONFIG_RTC_INTF_DEV_UIE_EMUL=y
CONFIG_RTC_DRV_MC13XXX=y
CONFIG_RTC_DRV_MXC=y
CONFIG_RTC_DRV_SNVS=y
+CONFIG_RTC_DRV_IMX_RPMSG=y
CONFIG_DMADEVICES=y
CONFIG_FSL_EDMA=y
CONFIG_IMX_SDMA=y
@@ -385,6 +396,8 @@ CONFIG_VF610_ADC=y
CONFIG_PWM=y
CONFIG_PWM_IMX=y
CONFIG_PWM_TPM=y
+CONFIG_TEE=y
+CONFIG_OPTEE=y
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
@@ -429,7 +442,6 @@ CONFIG_CRYPTO_LRW=y
CONFIG_CRYPTO_XTS=y
CONFIG_CRYPTO_MD4=y
CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_MICHAEL_MIC=y
CONFIG_CRYPTO_RMD128=y
CONFIG_CRYPTO_RMD160=y
CONFIG_CRYPTO_RMD256=y
diff --git a/recipes-kernel/linux/linux-imx-mfgtool_4.9.11.bb b/recipes-kernel/linux/linux-imx-mfgtool_4.9.88.bb
index 0193ba6d..7ffd3c7a 100644
--- a/recipes-kernel/linux/linux-imx-mfgtool_4.9.11.bb
+++ b/recipes-kernel/linux/linux-imx-mfgtool_4.9.88.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2014 O.S. Systems Software LTDA.
+# Copyright (C) 2014-2018 O.S. Systems Software LTDA.
# Copyright (C) 2014-2016 Freescale Semiconductor
SUMMARY = "Produces a Manufacturing Tool compatible Linux Kernel"
@@ -12,13 +12,6 @@ KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
MODULE_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
do_package[vardepsexclude] = "DATETIME"
-do_configure_prepend() {
- if [ ${DO_CONFIG_V7_COPY} = "yes" ]; then
- cp ${S}/arch/arm/configs/imx_v7_mfg_defconfig ${B}/.config
- cp ${S}/arch/arm/configs/imx_v7_mfg_defconfig ${B}/../defconfig
- fi
-}
-
do_deploy () {
install -d ${DEPLOY_DIR_IMAGE}
install arch/arm/boot/zImage ${DEPLOY_DIR_IMAGE}/zImage_mfgtool
diff --git a/recipes-kernel/linux/linux-imx_4.9.11.bb b/recipes-kernel/linux/linux-imx_4.9.88.bb
index 5f2caa82..f873d152 100644
--- a/recipes-kernel/linux/linux-imx_4.9.11.bb
+++ b/recipes-kernel/linux/linux-imx_4.9.88.bb
@@ -1,5 +1,6 @@
# Copyright (C) 2013-2016 Freescale Semiconductor
# Copyright 2017 NXP
+# Copyright 2018 (C) O.S. Systems Software LTDA.
# Released under the MIT license (see COPYING.MIT for the terms)
SUMMARY = "Linux Kernel provided and supported by NXP"
@@ -10,9 +11,9 @@ require recipes-kernel/linux/linux-imx.inc
DEPENDS += "lzop-native bc-native"
-SRCBRANCH = "imx_4.9.11_1.0.0_ga"
+SRCBRANCH = "imx_4.9.88_2.0.0_ga"
LOCALVERSION = "-1.0.0"
-SRCREV = "c27010d99a3d91703ea2d1a3f9630a9dedc3f86f"
+SRCREV = "6507266728a7806d850ce22ec923d90cf4aa4318"
DEFAULT_PREFERENCE = "1"