From: Lauren Post Date: Thu, 24 Dec 2015 07:16:48 +0000 (+0800) Subject: linux-imx: Upgrade to 3.14.52-1.1.0_ga Consolidatd GA release X-Git-Tag: 2.1~85 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=cf90cebe7d92fa5f57ecc861ea86f030a275ff0a;p=meta-freescale.git linux-imx: Upgrade to 3.14.52-1.1.0_ga Consolidatd GA release Signed-off-by: Lauren Post Signed-off-by: Otavio Salvador --- diff --git a/recipes-kernel/linux/linux-imx-3.14.38/0001-ARM-8158-LLVMLinux-use-static-inline-in-ARM-ftrace.patch b/recipes-kernel/linux/linux-imx-3.14.38/0001-ARM-8158-LLVMLinux-use-static-inline-in-ARM-ftrace.patch deleted file mode 100644 index 47f13c71..00000000 --- a/recipes-kernel/linux/linux-imx-3.14.38/0001-ARM-8158-LLVMLinux-use-static-inline-in-ARM-ftrace.patch +++ /dev/null @@ -1,48 +0,0 @@ -From aeea3592a13bf12861943e44fc48f1f270941f8d Mon Sep 17 00:00:00 2001 -From: Behan Webster -Date: Wed, 24 Sep 2014 01:06:46 +0100 -Subject: ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h - -With compilers which follow the C99 standard (like modern versions of gcc and -clang), "extern inline" does the wrong thing (emits code for an externally -linkable version of the inline function). In this case using static inline -and removing the NULL version of return_address in return_address.c does -the right thing. - -Signed-off-by: Behan Webster -Reviewed-by: Mark Charlebois -Acked-by: Steven Rostedt -Signed-off-by: Russell King - -diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h -index 39eb16b..bfe2a2f 100644 ---- a/arch/arm/include/asm/ftrace.h -+++ b/arch/arm/include/asm/ftrace.h -@@ -45,7 +45,7 @@ void *return_address(unsigned int); - - #else - --extern inline void *return_address(unsigned int level) -+static inline void *return_address(unsigned int level) - { - return NULL; - } -diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c -index fafedd8..f6aa84d 100644 ---- a/arch/arm/kernel/return_address.c -+++ b/arch/arm/kernel/return_address.c -@@ -63,11 +63,6 @@ void *return_address(unsigned int level) - #warning "TODO: return_address should use unwind tables" - #endif - --void *return_address(unsigned int level) --{ -- return NULL; --} -- - #endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */ - - EXPORT_SYMBOL_GPL(return_address); --- -cgit v0.10.2 - diff --git a/recipes-kernel/linux/linux-imx-3.14.38/0001-ARM-LLVMLinux-Change-extern-inline-to-static-inline.patch b/recipes-kernel/linux/linux-imx-3.14.38/0001-ARM-LLVMLinux-Change-extern-inline-to-static-inline.patch deleted file mode 100644 index 0ab03fb9..00000000 --- a/recipes-kernel/linux/linux-imx-3.14.38/0001-ARM-LLVMLinux-Change-extern-inline-to-static-inline.patch +++ /dev/null @@ -1,59 +0,0 @@ -From a2561791169351cbf1ac5ca0c4299a0eef7eca65 Mon Sep 17 00:00:00 2001 -From: Behan Webster -Date: Tue, 3 Sep 2013 22:27:26 -0400 -Subject: [PATCH] ARM: LLVMLinux: Change "extern inline" to "static inline" in - glue-cache.h - -With compilers which follow the C99 standard (like modern versions of gcc and -clang), "extern inline" does the wrong thing (emits code for an externally -linkable version of the inline function). "static inline" is the correct choice -instead. - -Author: Behan Webster -Signed-off-by: Behan Webster -Reviewed-by: Mark Charlebois ---- - arch/arm/include/asm/glue-cache.h | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -diff --git a/arch/arm/include/asm/glue-cache.h b/arch/arm/include/asm/glue-cache.h -index c81adc0..a3c24cd 100644 ---- a/arch/arm/include/asm/glue-cache.h -+++ b/arch/arm/include/asm/glue-cache.h -@@ -130,22 +130,22 @@ - #endif - - #ifndef __ASSEMBLER__ --extern inline void nop_flush_icache_all(void) { } --extern inline void nop_flush_kern_cache_all(void) { } --extern inline void nop_flush_kern_cache_louis(void) { } --extern inline void nop_flush_user_cache_all(void) { } --extern inline void nop_flush_user_cache_range(unsigned long a, -+static inline void nop_flush_icache_all(void) { } -+static inline void nop_flush_kern_cache_all(void) { } -+static inline void nop_flush_kern_cache_louis(void) { } -+static inline void nop_flush_user_cache_all(void) { } -+static inline void nop_flush_user_cache_range(unsigned long a, - unsigned long b, unsigned int c) { } - --extern inline void nop_coherent_kern_range(unsigned long a, unsigned long b) { } --extern inline int nop_coherent_user_range(unsigned long a, -+static inline void nop_coherent_kern_range(unsigned long a, unsigned long b) { } -+static inline int nop_coherent_user_range(unsigned long a, - unsigned long b) { return 0; } --extern inline void nop_flush_kern_dcache_area(void *a, size_t s) { } -+static inline void nop_flush_kern_dcache_area(void *a, size_t s) { } - --extern inline void nop_dma_flush_range(const void *a, const void *b) { } -+static inline void nop_dma_flush_range(const void *a, const void *b) { } - --extern inline void nop_dma_map_area(const void *s, size_t l, int f) { } --extern inline void nop_dma_unmap_area(const void *s, size_t l, int f) { } -+static inline void nop_dma_map_area(const void *s, size_t l, int f) { } -+static inline void nop_dma_unmap_area(const void *s, size_t l, int f) { } - #endif - - #ifndef MULTI_CACHE --- -2.1.4 - diff --git a/recipes-kernel/linux/linux-imx-3.14.38/0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch b/recipes-kernel/linux/linux-imx-3.14.38/0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch deleted file mode 100644 index 0743099f..00000000 --- a/recipes-kernel/linux/linux-imx-3.14.38/0003-ARM-imx6sl-Disable-imx6sl-specific-code-when-imx6sl-.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 8340ad4ab71b568e65dfd1b92cc0967152887f97 Mon Sep 17 00:00:00 2001 -From: Nikolay Dimitrov -Date: Sun, 8 Feb 2015 22:18:09 +0200 -Subject: [PATCH 3/3] ARM: imx6sl: Disable imx6sl-specific code when imx6sl SOC - support is disabled - -Currently the build fails when CONFIG_SOC_IMX6SL is disabled, due to some -hard-coded stuff. The patch purpose is to handle enabling/disabling this -config option. - -Signed-off-by: Nikolay Dimitrov -Signed-off-by: Otavio Salvador - -Upstream-Status: Pending - ---- - arch/arm/mach-imx/Makefile | 3 ++- - arch/arm/mach-imx/mxc.h | 4 ++++ - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile -index b76a214..27f1976 100644 ---- a/arch/arm/mach-imx/Makefile -+++ b/arch/arm/mach-imx/Makefile -@@ -122,7 +122,8 @@ obj-$(CONFIG_SOC_IMX6SL) += busfreq_lpddr2.o lpddr2_freq_imx6.o imx6sl_lpm_wfi.o - AFLAGS_lpddr2_freq_imx6sx.o :=-Wa,-march=armv7-a - AFLAGS_ddr3_freq_imx6sx.o :=-Wa,-march=armv7-a - AFLAGS_imx6sx_low_power_idle.o :=-Wa,-march=armv7-a --obj-$(CONFIG_SOC_IMX6SX) += ddr3_freq_imx6sx.o lpddr2_freq_imx6sx.o imx6sx_low_power_idle.o -+obj-$(CONFIG_SOC_IMX6SX) += ddr3_freq_imx6sx.o lpddr2_freq_imx6sx.o imx6sx_low_power_idle.o \ -+ busfreq_lpddr2.o lpddr2_freq_imx6.o - endif - - -diff --git a/arch/arm/mach-imx/mxc.h b/arch/arm/mach-imx/mxc.h -index 1510769..e6af4dd 100644 ---- a/arch/arm/mach-imx/mxc.h -+++ b/arch/arm/mach-imx/mxc.h -@@ -158,10 +158,14 @@ extern unsigned int __mxc_cpu_type; - #endif - - #ifndef __ASSEMBLY__ -+#ifdef CONFIG_SOC_IMX6SL - static inline bool cpu_is_imx6sl(void) - { - return __mxc_cpu_type == MXC_CPU_IMX6SL; - } -+#else -+# define cpu_is_imx6sl() (0) -+#endif - - static inline bool cpu_is_imx6dl(void) - { --- -2.1.4 - diff --git a/recipes-kernel/linux/linux-imx-3.14.38/0004-mmc-sdhci-esdhc-imx-Fixup-runtime-PM-conditions-duri.patch b/recipes-kernel/linux/linux-imx-3.14.52/0004-mmc-sdhci-esdhc-imx-Fixup-runtime-PM-conditions-duri.patch similarity index 100% rename from recipes-kernel/linux/linux-imx-3.14.38/0004-mmc-sdhci-esdhc-imx-Fixup-runtime-PM-conditions-duri.patch rename to recipes-kernel/linux/linux-imx-3.14.52/0004-mmc-sdhci-esdhc-imx-Fixup-runtime-PM-conditions-duri.patch diff --git a/recipes-kernel/linux/linux-imx-3.14.38/imx/defconfig b/recipes-kernel/linux/linux-imx-3.14.52/imx/defconfig similarity index 94% rename from recipes-kernel/linux/linux-imx-3.14.38/imx/defconfig rename to recipes-kernel/linux/linux-imx-3.14.52/imx/defconfig index dd9f7393..e3315f31 100644 --- a/recipes-kernel/linux/linux-imx-3.14.38/imx/defconfig +++ b/recipes-kernel/linux/linux-imx-3.14.52/imx/defconfig @@ -80,7 +80,6 @@ CONFIG_BT_BNEP_MC_FILTER=y CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_HIDP=y CONFIG_BT_HCIBTUSB=y -CONFIG_BT_HCIBTSDIO=y CONFIG_BT_HCIUART=y CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y @@ -117,6 +116,8 @@ CONFIG_MTD_UBI=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=65536 +CONFIG_SENSORS_FXOS8700=y +CONFIG_SENSORS_FXAS2100X=y CONFIG_EEPROM_AT24=y CONFIG_EEPROM_AT25=y # CONFIG_SCSI_PROC_FS is not set @@ -145,33 +146,38 @@ CONFIG_SMC91X=y CONFIG_SMC911X=y CONFIG_SMSC911X=y # CONFIG_NET_VENDOR_STMICRO is not set +CONFIG_MICREL_PHY=y CONFIG_USB_PEGASUS=m CONFIG_USB_RTL8150=m CONFIG_USB_RTL8152=m CONFIG_USB_USBNET=m CONFIG_USB_NET_CDC_EEM=m -CONFIG_ATH_CARDS=y -CONFIG_ATH6KL=m -CONFIG_ATH6KL_SDIO=m -CONFIG_BRCMFMAC=m +CONFIG_BCMDHD=m +CONFIG_BCMDHD_SDIO=y +CONFIG_BCMDHD_FW_PATH="/lib/firmware/bcm/fw_bcmdhd.bin" +CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/bcm/bcmdhd.cal" +# CONFIG_RTL_CARDS is not set # CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_EVDEV=y CONFIG_INPUT_EVBUG=m CONFIG_KEYBOARD_GPIO=y -CONFIG_KEYBOARD_SNVS_PWRKEY=y CONFIG_KEYBOARD_IMX=y CONFIG_MOUSE_PS2=m CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ADS7846=y CONFIG_TOUCHSCREEN_EGALAX=y CONFIG_TOUCHSCREEN_ELAN=y CONFIG_TOUCHSCREEN_MAX11801=y +CONFIG_TOUCHSCREEN_IMX6UL_TSC=y CONFIG_TOUCHSCREEN_MC13783=y CONFIG_TOUCHSCREEN_TSC2007=y CONFIG_TOUCHSCREEN_STMPE=y CONFIG_INPUT_MISC=y CONFIG_INPUT_MMA8450=y CONFIG_INPUT_ISL29023=y +CONFIG_INPUT_MPL3115=y +CONFIG_SENSOR_FXLS8471=y CONFIG_SERIO_SERPORT=m # CONFIG_LEGACY_PTYS is not set # CONFIG_DEVKMEM is not set @@ -194,7 +200,6 @@ CONFIG_GPIO_MAX732X=y CONFIG_GPIO_74X164=y CONFIG_POWER_SUPPLY=y CONFIG_SABRESD_MAX8903=y -CONFIG_IMX6_USB_CHARGER=y CONFIG_SENSORS_MAX17135=y CONFIG_SENSORS_MAG3110=y CONFIG_THERMAL=y @@ -213,6 +218,7 @@ CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_ANATOP=y CONFIG_REGULATOR_DA9052=y +CONFIG_REGULATOR_GPIO=y CONFIG_REGULATOR_MAX17135=y CONFIG_REGULATOR_MC13783=y CONFIG_REGULATOR_MC13892=y @@ -237,6 +243,8 @@ 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_VIDEO_MX3=y CONFIG_V4L_MEM2MEM_DRIVERS=y @@ -256,6 +264,7 @@ CONFIG_BACKLIGHT_PWM=y CONFIG_FB_MXC_SYNC_PANEL=y CONFIG_FB_MXC_LDB=y CONFIG_FB_MXC_MIPI_DSI=y +CONFIG_FB_MXC_MIPI_DSI_SAMSUNG=y CONFIG_FB_MXC_TRULY_WVGA_SYNC_PANEL=y CONFIG_FB_MXC_HDMI=y CONFIG_FB_MXC_EINK_PANEL=y @@ -284,9 +293,11 @@ CONFIG_SND_SOC_IMX_MC13783=y CONFIG_SND_SOC_IMX_HDMI=y CONFIG_SND_SOC_IMX_SI476X=y CONFIG_USB=y +CONFIG_USB_OTG_WHITELIST=y CONFIG_USB_OTG_FSM=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_MXC=y +CONFIG_USB_HCD_TEST_MODE=y CONFIG_USB_ACM=m CONFIG_USB_STORAGE=y CONFIG_USB_CHIPIDEA=y @@ -296,7 +307,7 @@ CONFIG_USB_SERIAL=m CONFIG_USB_SERIAL_GENERIC=y CONFIG_USB_SERIAL_FTDI_SIO=m CONFIG_USB_SERIAL_OPTION=m -CONFIG_USB_EHSET_TEST_FIXTURE=m +CONFIG_USB_EHSET_TEST_FIXTURE=y CONFIG_NOP_USB_XCEIV=y CONFIG_USB_MXS_PHY=y CONFIG_USB_GADGET=y @@ -327,7 +338,6 @@ CONFIG_MXC_IPU=y CONFIG_MXC_GPU_VIV=y CONFIG_MXC_IPU_V3_PRE=y CONFIG_MXC_MIPI_CSI2=y -CONFIG_MXC_MLB150=m CONFIG_MXC_SIM=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y diff --git a/recipes-kernel/linux/linux-imx-mfgtool_3.14.38.bb b/recipes-kernel/linux/linux-imx-mfgtool_3.14.52.bb similarity index 100% rename from recipes-kernel/linux/linux-imx-mfgtool_3.14.38.bb rename to recipes-kernel/linux/linux-imx-mfgtool_3.14.52.bb diff --git a/recipes-kernel/linux/linux-imx_3.14.38.bb b/recipes-kernel/linux/linux-imx_3.14.38.bb deleted file mode 100644 index 886298f7..00000000 --- a/recipes-kernel/linux/linux-imx_3.14.38.bb +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright (C) 2013-2015 Freescale Semiconductor -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "Linux Kernel provided and supported by Freescale" -DESCRIPTION = "Linux Kernel provided and supported by Freescale with focus on \ -i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU and IPU." - -require recipes-kernel/linux/linux-imx.inc -require recipes-kernel/linux/linux-dtb.inc - -DEPENDS += "lzop-native bc-native" - -SRCBRANCH_mx6q = "imx_3.14.38_6qp_ga" -LOCALVERSION_mx6q = "-6QuadPlus" -SRCREV_mx6q = "75a01115a7f53d728e6abeb7b205676cc2a50bc0" - -SRCBRANCH_mx6dl = "imx_3.14.38_6qp_ga" -LOCALVERSION_mx6dl = "-6DualLite" -SRCREV_mx6dl = "75a01115a7f53d728e6abeb7b205676cc2a50bc0" - -SRCBRANCH_mx6sx = "imx_3.14.38_6qp_ga" -LOCALVERSION_mx6sx = "-6SoloX" -SRCREV_mx6sx = "75a01115a7f53d728e6abeb7b205676cc2a50bc0" - -SRCBRANCH_mx6sl = "imx_3.14.38_6qp_ga" -LOCALVERSION_mx6sl = "-6SOloLite" -SRCREV_mx6sl = "75a01115a7f53d728e6abeb7b205676cc2a50bc0" - -SRCBRANCH_mx6ul = "imx_3.14.38_6ul_ga" -LOCALVERSION_mx6ul = "-6UltraLite" -SRCREV_mx6ul = "e4944a51c4bb950a8f13e421eefc000a87350e23" - -SRCBRANCH_mx7 = "imx_3.14.38_6ul_ga" -LOCALVERSION_mx7 = "-7Dual_beta" -SRCREV_mx7 = "e4944a51c4bb950a8f13e421eefc000a87350e23" - -SRC_URI += " \ - file://0004-mmc-sdhci-esdhc-imx-Fixup-runtime-PM-conditions-duri.patch \ - file://0001-ARM-LLVMLinux-Change-extern-inline-to-static-inline.patch \ - file://0001-ARM-8158-LLVMLinux-use-static-inline-in-ARM-ftrace.patch \ -" - -COMPATIBLE_MACHINE = "(mx6|mx6ul|mx7)" diff --git a/recipes-kernel/linux/linux-imx_3.14.52.bb b/recipes-kernel/linux/linux-imx_3.14.52.bb new file mode 100644 index 00000000..bd54de2b --- /dev/null +++ b/recipes-kernel/linux/linux-imx_3.14.52.bb @@ -0,0 +1,23 @@ +# Copyright (C) 2013-2015 Freescale Semiconductor +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Linux Kernel provided and supported by Freescale" +DESCRIPTION = "Linux Kernel provided and supported by Freescale with focus on \ +i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU and IPU." + +require recipes-kernel/linux/linux-imx.inc +require recipes-kernel/linux/linux-dtb.inc + +DEPENDS += "lzop-native bc-native" + +SRCBRANCH = "imx_3.14.52_1.1.0_ga" +LOCALVERSION = "-1.1.0_ga" +SRCREV = "5f6f0a50e6039370078369ddf380179d59024789" + +SRC_URI += " \ + file://0004-mmc-sdhci-esdhc-imx-Fixup-runtime-PM-conditions-duri.patch \ +" + +DEFAULT_PREFERENCE = "1" + +COMPATIBLE_MACHINE = "(mx6|mx6ul|mx7)"