diff options
-rw-r--r-- | recipes-kernel/linux/linux-fslc-imx/defconfig | 11 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-fslc-imx_4.1-2.0.x.bb (renamed from recipes-kernel/linux/linux-fslc-imx_4.1-1.0.x.bb) | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/recipes-kernel/linux/linux-fslc-imx/defconfig b/recipes-kernel/linux/linux-fslc-imx/defconfig index 7fa0c667..a2a30371 100644 --- a/recipes-kernel/linux/linux-fslc-imx/defconfig +++ b/recipes-kernel/linux/linux-fslc-imx/defconfig | |||
@@ -24,7 +24,7 @@ CONFIG_SOC_IMX53=y | |||
24 | CONFIG_SOC_IMX6Q=y | 24 | CONFIG_SOC_IMX6Q=y |
25 | CONFIG_SOC_IMX6SL=y | 25 | CONFIG_SOC_IMX6SL=y |
26 | CONFIG_SOC_IMX6SX=y | 26 | CONFIG_SOC_IMX6SX=y |
27 | CONFIG_SOC_IMX6UL=y | 27 | CONFIG_SOC_IMX6ULL=y |
28 | CONFIG_SOC_IMX7D=y | 28 | CONFIG_SOC_IMX7D=y |
29 | CONFIG_SOC_VF610=y | 29 | CONFIG_SOC_VF610=y |
30 | # CONFIG_SWP_EMULATE is not set | 30 | # CONFIG_SWP_EMULATE is not set |
@@ -147,7 +147,7 @@ CONFIG_USB_NET_CDC_EEM=m | |||
147 | CONFIG_BCMDHD=y | 147 | CONFIG_BCMDHD=y |
148 | CONFIG_BCMDHD_SDIO=y | 148 | CONFIG_BCMDHD_SDIO=y |
149 | CONFIG_BCMDHD_FW_PATH="/lib/firmware/bcm/ZP_BCM4339/fw_bcmdhd.bin" | 149 | CONFIG_BCMDHD_FW_PATH="/lib/firmware/bcm/ZP_BCM4339/fw_bcmdhd.bin" |
150 | CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/bcm/ZP_BCM4339/bcmdhd.ZP.SDIO.cal" | 150 | CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/bcm/ZP_BCM4339/bcmdhd.ZP.OOB.cal" |
151 | # CONFIG_RTL_CARDS is not set | 151 | # CONFIG_RTL_CARDS is not set |
152 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | 152 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set |
153 | CONFIG_INPUT_EVDEV=y | 153 | CONFIG_INPUT_EVDEV=y |
@@ -167,6 +167,7 @@ CONFIG_TOUCHSCREEN_TSC2007=y | |||
167 | CONFIG_TOUCHSCREEN_STMPE=y | 167 | CONFIG_TOUCHSCREEN_STMPE=y |
168 | CONFIG_INPUT_MISC=y | 168 | CONFIG_INPUT_MISC=y |
169 | CONFIG_INPUT_MMA8450=y | 169 | CONFIG_INPUT_MMA8450=y |
170 | CONFIG_INPUT_MPL3115=y | ||
170 | CONFIG_SENSOR_FXLS8471=y | 171 | CONFIG_SENSOR_FXLS8471=y |
171 | CONFIG_INPUT_ISL29023=y | 172 | CONFIG_INPUT_ISL29023=y |
172 | CONFIG_SERIO_SERPORT=m | 173 | CONFIG_SERIO_SERPORT=m |
@@ -177,6 +178,7 @@ CONFIG_SERIAL_IMX_CONSOLE=y | |||
177 | CONFIG_SERIAL_FSL_LPUART=y | 178 | CONFIG_SERIAL_FSL_LPUART=y |
178 | CONFIG_SERIAL_FSL_LPUART_CONSOLE=y | 179 | CONFIG_SERIAL_FSL_LPUART_CONSOLE=y |
179 | CONFIG_FSL_OTP=y | 180 | CONFIG_FSL_OTP=y |
181 | CONFIG_HW_RANDOM_IMX_RNG=y | ||
180 | # CONFIG_I2C_COMPAT is not set | 182 | # CONFIG_I2C_COMPAT is not set |
181 | CONFIG_I2C_CHARDEV=y | 183 | CONFIG_I2C_CHARDEV=y |
182 | # CONFIG_I2C_HELPER_AUTO is not set | 184 | # CONFIG_I2C_HELPER_AUTO is not set |
@@ -330,6 +332,7 @@ CONFIG_MMC_SDHCI_PLTFM=y | |||
330 | CONFIG_MMC_SDHCI_ESDHC_IMX=y | 332 | CONFIG_MMC_SDHCI_ESDHC_IMX=y |
331 | CONFIG_MXC_IPU=y | 333 | CONFIG_MXC_IPU=y |
332 | CONFIG_MXC_IPU_V3_PRE=y | 334 | CONFIG_MXC_IPU_V3_PRE=y |
335 | CONFIG_MXC_GPU_VIV=y | ||
333 | CONFIG_MXC_SIM=y | 336 | CONFIG_MXC_SIM=y |
334 | CONFIG_MXC_MIPI_CSI2=y | 337 | CONFIG_MXC_MIPI_CSI2=y |
335 | CONFIG_MXC_HDMI_CEC=y | 338 | CONFIG_MXC_HDMI_CEC=y |
@@ -359,7 +362,6 @@ CONFIG_STAGING_MEDIA=y | |||
359 | CONFIG_IIO=y | 362 | CONFIG_IIO=y |
360 | CONFIG_IMX7D_ADC=y | 363 | CONFIG_IMX7D_ADC=y |
361 | CONFIG_VF610_ADC=y | 364 | CONFIG_VF610_ADC=y |
362 | CONFIG_MPL3115=y | ||
363 | CONFIG_PWM=y | 365 | CONFIG_PWM=y |
364 | CONFIG_PWM_IMX=y | 366 | CONFIG_PWM_IMX=y |
365 | CONFIG_EXT2_FS=y | 367 | CONFIG_EXT2_FS=y |
@@ -404,7 +406,6 @@ CONFIG_MAGIC_SYSRQ=y | |||
404 | CONFIG_SECURITYFS=y | 406 | CONFIG_SECURITYFS=y |
405 | CONFIG_CRYPTO_USER=y | 407 | CONFIG_CRYPTO_USER=y |
406 | CONFIG_CRYPTO_TEST=m | 408 | CONFIG_CRYPTO_TEST=m |
407 | CONFIG_CRYPTO_CBC=y | ||
408 | CONFIG_CRYPTO_CTS=y | 409 | CONFIG_CRYPTO_CTS=y |
409 | CONFIG_CRYPTO_LRW=y | 410 | CONFIG_CRYPTO_LRW=y |
410 | CONFIG_CRYPTO_XTS=y | 411 | CONFIG_CRYPTO_XTS=y |
@@ -415,7 +416,6 @@ CONFIG_CRYPTO_RMD128=y | |||
415 | CONFIG_CRYPTO_RMD160=y | 416 | CONFIG_CRYPTO_RMD160=y |
416 | CONFIG_CRYPTO_RMD256=y | 417 | CONFIG_CRYPTO_RMD256=y |
417 | CONFIG_CRYPTO_RMD320=y | 418 | CONFIG_CRYPTO_RMD320=y |
418 | CONFIG_CRYPTO_SHA1=y | ||
419 | CONFIG_CRYPTO_SHA512=y | 419 | CONFIG_CRYPTO_SHA512=y |
420 | CONFIG_CRYPTO_TGR192=y | 420 | CONFIG_CRYPTO_TGR192=y |
421 | CONFIG_CRYPTO_WP512=y | 421 | CONFIG_CRYPTO_WP512=y |
@@ -428,6 +428,7 @@ CONFIG_CRYPTO_DEV_FSL_CAAM=y | |||
428 | CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y | 428 | CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y |
429 | CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=y | 429 | CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=y |
430 | CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y | 430 | CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y |
431 | CONFIG_CRYPTO_DEV_MXS_DCP=y | ||
431 | CONFIG_CRC_CCITT=m | 432 | CONFIG_CRC_CCITT=m |
432 | CONFIG_CRC_T10DIF=y | 433 | CONFIG_CRC_T10DIF=y |
433 | CONFIG_CRC7=m | 434 | CONFIG_CRC7=m |
diff --git a/recipes-kernel/linux/linux-fslc-imx_4.1-1.0.x.bb b/recipes-kernel/linux/linux-fslc-imx_4.1-2.0.x.bb index 40d82bcd..d1e1a15f 100644 --- a/recipes-kernel/linux/linux-fslc-imx_4.1-1.0.x.bb +++ b/recipes-kernel/linux/linux-fslc-imx_4.1-2.0.x.bb | |||
@@ -10,7 +10,7 @@ include linux-fslc.inc | |||
10 | 10 | ||
11 | PV .= "+git${SRCPV}" | 11 | PV .= "+git${SRCPV}" |
12 | 12 | ||
13 | SRCBRANCH = "4.1-1.0.x-imx" | 13 | SRCBRANCH = "4.1-2.0.x-imx" |
14 | SRCREV = "1af16a73ab77f333898f924dd867c417a1de0b01" | 14 | SRCREV = "34002442b17af7220fa52b2d153db90685113947" |
15 | 15 | ||
16 | COMPATIBLE_MACHINE = "(mx6|mx7)" | 16 | COMPATIBLE_MACHINE = "(mx6|mx7)" |