From bcbf8a883f349998ec0f657dbbbdc699f1c1a5c0 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 31 Aug 2020 16:16:48 -0500 Subject: [PATCH] linux-imx[-mfgtool]: Upgrade kernel recipe to 5.4.24-2.1.0 from NXP Upgrade kernel recipe 5.4.3 -> 5.4.24, drop patches which are applied upstream and re-submit new kernel configuration files for arm32 and aarch64 build configurations. Kernel recipe version 5.4.3 is dropped from this layer in favor of the updated one. Signed-off-by: Tom Hochstein --- ...tool_5.4.3.bb => linux-imx-mfgtool_5.4.bb} | 0 ...erf-able-to-build-with-latest-libbfd.patch | 63 ------------------ recipes-kernel/linux/linux-imx/imx/defconfig | 29 +++++++- recipes-kernel/linux/linux-imx/mx8/defconfig | 66 +++++++++++++++++-- .../{linux-imx_5.4.3.bb => linux-imx_5.4.bb} | 12 ++-- 5 files changed, 94 insertions(+), 76 deletions(-) rename recipes-kernel/linux/{linux-imx-mfgtool_5.4.3.bb => linux-imx-mfgtool_5.4.bb} (100%) delete mode 100644 recipes-kernel/linux/linux-imx/0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch rename recipes-kernel/linux/{linux-imx_5.4.3.bb => linux-imx_5.4.bb} (79%) diff --git a/recipes-kernel/linux/linux-imx-mfgtool_5.4.3.bb b/recipes-kernel/linux/linux-imx-mfgtool_5.4.bb similarity index 100% rename from recipes-kernel/linux/linux-imx-mfgtool_5.4.3.bb rename to recipes-kernel/linux/linux-imx-mfgtool_5.4.bb diff --git a/recipes-kernel/linux/linux-imx/0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch b/recipes-kernel/linux/linux-imx/0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch deleted file mode 100644 index e3df8084..00000000 --- a/recipes-kernel/linux/linux-imx/0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 0ada120c883d4f1f6aafd01cf0fbb10d8bbba015 Mon Sep 17 00:00:00 2001 -From: Changbin Du -Date: Tue, 28 Jan 2020 23:29:38 +0800 -Subject: [PATCH] perf: Make perf able to build with latest libbfd - -libbfd has changed the bfd_section_* macros to inline functions -bfd_section_ since 2019-09-18. See below two commits: - o http://www.sourceware.org/ml/gdb-cvs/2019-09/msg00064.html - o https://www.sourceware.org/ml/gdb-cvs/2019-09/msg00072.html - -This fix make perf able to build with both old and new libbfd. - -Upstream-Status: Submitted [commit 0ada120c883d4f1f6aafd01cf0fbb10d8bbba015 upstream] - -Signed-off-by: Changbin Du -Acked-by: Jiri Olsa -Cc: Peter Zijlstra -Link: http://lore.kernel.org/lkml/20200128152938.31413-1-changbin.du@gmail.com -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Andrey Zhizhikin ---- - tools/perf/util/srcline.c | 16 +++++++++++++++- - 1 file changed, 15 insertions(+), 1 deletion(-) - -diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c -index 6ccf6f6d09df..5b7d6c16d33f 100644 ---- a/tools/perf/util/srcline.c -+++ b/tools/perf/util/srcline.c -@@ -193,16 +193,30 @@ static void find_address_in_section(bfd *abfd, asection *section, void *data) - bfd_vma pc, vma; - bfd_size_type size; - struct a2l_data *a2l = data; -+ flagword flags; - - if (a2l->found) - return; - -- if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) -+#ifdef bfd_get_section_flags -+ flags = bfd_get_section_flags(abfd, section); -+#else -+ flags = bfd_section_flags(section); -+#endif -+ if ((flags & SEC_ALLOC) == 0) - return; - - pc = a2l->addr; -+#ifdef bfd_get_section_vma - vma = bfd_get_section_vma(abfd, section); -+#else -+ vma = bfd_section_vma(section); -+#endif -+#ifdef bfd_get_section_size - size = bfd_get_section_size(section); -+#else -+ size = bfd_section_size(section); -+#endif - - if (pc < vma || pc >= vma + size) - return; --- -2.17.1 - diff --git a/recipes-kernel/linux/linux-imx/imx/defconfig b/recipes-kernel/linux/linux-imx/imx/defconfig index 622e5430..30792d23 100644 --- a/recipes-kernel/linux/linux-imx/imx/defconfig +++ b/recipes-kernel/linux/linux-imx/imx/defconfig @@ -1,5 +1,6 @@ CONFIG_KERNEL_LZO=y CONFIG_SYSVIPC=y +CONFIG_POSIX_MQUEUE=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_PREEMPT=y @@ -7,6 +8,12 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=18 CONFIG_CGROUPS=y +CONFIG_MEMCG=y +CONFIG_CGROUP_PIDS=y +CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_DEVICE=y +CONFIG_NAMESPACES=y +CONFIG_USER_NS=y CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y CONFIG_EXPERT=y @@ -57,6 +64,7 @@ CONFIG_MODULE_SRCVERSION_ALL=y # CONFIG_BLK_DEV_BSG is not set CONFIG_BINFMT_MISC=m CONFIG_CMA=y +CONFIG_SECCOMP=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y @@ -120,6 +128,7 @@ CONFIG_MTD_SPI_NOR=y CONFIG_MTD_UBI=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_MTD_UBI_BLOCK=y +CONFIG_OF_OVERLAY=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=65536 @@ -142,7 +151,7 @@ CONFIG_NETDEVICES=y CONFIG_CS89x0=y CONFIG_CS89x0_PLATFORM=y # CONFIG_NET_VENDOR_FARADAY is not set -# CONFIG_NET_VENDOR_INTEL is not set +CONFIG_E1000E=y # CONFIG_NET_VENDOR_MARVELL is not set # CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICROCHIP is not set @@ -165,6 +174,7 @@ CONFIG_USB_NET_SMSC95XX=y CONFIG_USB_NET_MCS7830=y CONFIG_BRCMFMAC=m CONFIG_HOSTAP=y +CONFIG_MXMWIFIEX=m CONFIG_WL12XX=m CONFIG_WL18XX=m CONFIG_WLCORE_SDIO=m @@ -446,6 +456,8 @@ CONFIG_STAGING_MEDIA=y CONFIG_COMMON_CLK_PWM=y CONFIG_MAILBOX=y CONFIG_IMX_MBOX=y +CONFIG_REMOTEPROC=y +CONFIG_IMX_REMOTEPROC=y CONFIG_EXTCON_USB_GPIO=y CONFIG_IIO=y CONFIG_IMX7D_ADC=y @@ -483,6 +495,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_PRINT_QUOTA_WARNING is not set CONFIG_AUTOFS4_FS=y CONFIG_FUSE_FS=y +CONFIG_OVERLAY_FS=y CONFIG_ISO9660_FS=m CONFIG_JOLIET=y CONFIG_ZISOFS=y @@ -535,6 +548,20 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=m CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y CONFIG_CRYPTO_DEV_SAHARA=y CONFIG_CRYPTO_DEV_MXS_DCP=y +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_VMAC=m +CONFIG_CRYPTO_SM3=m +CONFIG_CRYPTO_STREEBOG=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SM4=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_ANSI_CPRNG=m +CONFIG_CRYPTO_SHA1=m CONFIG_CRC_CCITT=m CONFIG_CRC_T10DIF=y CONFIG_CRC7=m diff --git a/recipes-kernel/linux/linux-imx/mx8/defconfig b/recipes-kernel/linux/linux-imx/mx8/defconfig index 469ee0ef..cf8df95f 100644 --- a/recipes-kernel/linux/linux-imx/mx8/defconfig +++ b/recipes-kernel/linux/linux-imx/mx8/defconfig @@ -66,6 +66,7 @@ CONFIG_EFI_CAPSULE_LOADER=y CONFIG_IMX_DSP=y CONFIG_IMX_SCU=y CONFIG_IMX_SCU_PD=y +CONFIG_IMX_SECO_MU=y CONFIG_ACPI=y CONFIG_ACPI_APEI=y CONFIG_ACPI_APEI_GHES=y @@ -127,9 +128,17 @@ CONFIG_BRIDGE_VLAN_FILTERING=y CONFIG_VLAN_8021Q_GVRP=y CONFIG_VLAN_8021Q_MVRP=y CONFIG_LLC2=y +CONFIG_NET_SCHED=y +CONFIG_NET_SCH_MULTIQ=y +CONFIG_NET_SCH_CBS=y +CONFIG_NET_SCH_TAPRIO=y +CONFIG_NET_SCH_MQPRIO=y +CONFIG_NET_CLS_BASIC=y +CONFIG_NET_CLS_TCINDEX=y CONFIG_TSN=y CONFIG_NET_SWITCHDEV=y CONFIG_BPF_JIT=y +CONFIG_NET_PKTGEN=y CONFIG_CAN=m CONFIG_CAN_FLEXCAN=m CONFIG_BT=y @@ -272,7 +281,7 @@ CONFIG_MSCC_OCELOT_SWITCH=y CONFIG_QCOM_EMAC=m CONFIG_SMC91X=y CONFIG_SMSC911X=y -CONFIG_STMMAC_ETH=m +CONFIG_STMMAC_ETH=y CONFIG_MDIO_BITBANG=y CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y CONFIG_AQUANTIA_PHY=y @@ -300,9 +309,10 @@ CONFIG_USB_NET_MCS7830=m CONFIG_BRCMFMAC=m CONFIG_BRCMFMAC_PCIE=y CONFIG_HOSTAP=y +CONFIG_MXMWIFIEX=m CONFIG_WL18XX=m CONFIG_WLCORE_SDIO=m -CONFIG_IVSHMEM_NET=m +CONFIG_IVSHMEM_NET=y CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_ADC=m CONFIG_KEYBOARD_GPIO=y @@ -351,6 +361,7 @@ CONFIG_I2C_IMX_LPI2C=y CONFIG_I2C_RK3X=y CONFIG_I2C_RPBUS=y CONFIG_I2C_CROS_EC_TUNNEL=y +CONFIG_XEN_I2C_BACKEND=y CONFIG_I2C_SLAVE=y CONFIG_SPI=y CONFIG_SPI_FSL_LPSPI=y @@ -369,9 +380,11 @@ CONFIG_PINCTRL_SINGLE=y CONFIG_PINCTRL_MAX77620=y CONFIG_PINCTRL_IMX8MM=y CONFIG_PINCTRL_IMX8MN=y +CONFIG_PINCTRL_IMX8MP=y CONFIG_PINCTRL_IMX8MQ=y CONFIG_PINCTRL_IMX8QM=y CONFIG_PINCTRL_IMX8QXP=y +CONFIG_PINCTRL_IMX8DXL=y CONFIG_PINCTRL_S32V234=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y @@ -411,8 +424,10 @@ CONFIG_ARM_SBSA_WATCHDOG=y CONFIG_DW_WATCHDOG=y CONFIG_IMX2_WDT=y CONFIG_IMX_SC_WDT=y +CONFIG_XEN_WDT=y CONFIG_MFD_BD9571MWV=y CONFIG_MFD_AXP20X_I2C=y +CONFIG_MFD_IMX_AUDIOMIX=y CONFIG_MFD_HI6421_PMIC=y CONFIG_MFD_MAX77620=y CONFIG_MFD_RK808=y @@ -458,6 +473,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_OV5640=y CONFIG_IMX_DPU_CORE=y CONFIG_IMX_LCDIF_CORE=y +CONFIG_IMX_LCDIFV3_CORE=y CONFIG_DRM=y CONFIG_DRM_I2C_NXP_TDA998X=m CONFIG_DRM_MALI_DISPLAY=m @@ -465,16 +481,24 @@ CONFIG_DRM_NOUVEAU=m CONFIG_DRM_RCAR_LVDS=m CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_PANEL_RAYDIUM_RM67191=y +CONFIG_DRM_PANEL_SEIKO_43WVF1G=y +CONFIG_DRM_FSL_IMX_LVDS_BRIDGE=y CONFIG_DRM_SII902X=m CONFIG_DRM_I2C_ADV7511=y CONFIG_DRM_NWL_MIPI_DSI=y CONFIG_DRM_CDNS_HDMI_CEC=y CONFIG_DRM_DW_HDMI_I2S_AUDIO=m +CONFIG_DRM_DW_HDMI_GP_AUDIO=y +CONFIG_DRM_DW_HDMI_CEC=y CONFIG_DRM_ITE_IT6263=y CONFIG_DRM_IMX=y +CONFIG_DRM_IMX_LCDIF_MUX_DISPLAY=y CONFIG_DRM_IMX_PARALLEL_DISPLAY=y CONFIG_DRM_IMX_TVE=y CONFIG_DRM_IMX_LDB=y +CONFIG_DRM_IMX8QM_LDB=y +CONFIG_DRM_IMX8QXP_LDB=y +CONFIG_DRM_IMX8MP_LDB=y CONFIG_DRM_IMX_HDMI=y CONFIG_DRM_IMX_SEC_DSIM=y CONFIG_DRM_IMX_CDNS_MHDP=y @@ -516,12 +540,14 @@ CONFIG_SND_SOC_IMX_AUDMIX=y CONFIG_SND_SOC_IMX_PDM_MIC=y CONFIG_SND_SOC_IMX_DSP=y CONFIG_SND_SOC_IMX_CDNHDMI=y +CONFIG_SND_SOC_IMX_XCVR=y CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SOF_OF=m CONFIG_SND_SOC_SOF_IMX_TOPLEVEL=y -CONFIG_SND_SOC_SOF_IMX8_SUPPORT=y -CONFIG_SND_SOC_SOF_IMX8=m +CONFIG_SND_SOC_SOF_IMX8_SUPPORT=m +CONFIG_SND_SOC_SOF_IMX8M_SUPPORT=m CONFIG_SND_SOC_AK4613=m +CONFIG_SND_SOC_BT_SCO=y CONFIG_SND_SOC_DMIC=m CONFIG_SND_SOC_ES7134=m CONFIG_SND_SOC_ES7241=m @@ -554,6 +580,11 @@ CONFIG_USB_CHIPIDEA=y CONFIG_USB_CHIPIDEA_UDC=y CONFIG_USB_CHIPIDEA_HOST=y CONFIG_USB_ISP1760=y +CONFIG_USB_SERIAL=y +CONFIG_USB_SERIAL_CONSOLE=y +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_SIMPLE=y +CONFIG_USB_SERIAL_FTDI_SIO=y CONFIG_USB_TEST=m CONFIG_USB_EHSET_TEST_FIXTURE=m CONFIG_USB_HSIC_USB3503=y @@ -619,6 +650,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y CONFIG_LEDS_TRIGGER_PANIC=y CONFIG_EDAC=y CONFIG_EDAC_GHES=y +CONFIG_EDAC_SYNOPSYS=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_DS1307=y CONFIG_RTC_DRV_MAX77686=y @@ -646,6 +678,7 @@ CONFIG_QCOM_HIDMA=y CONFIG_DMATEST=y CONFIG_UIO=y CONFIG_UIO_PCI_GENERIC=y +CONFIG_UIO_IVSHMEM=y CONFIG_VFIO=y CONFIG_VFIO_PCI=y CONFIG_VFIO_FSL_MC=y @@ -680,6 +713,7 @@ CONFIG_COMMON_CLK_XGENE=y CONFIG_COMMON_CLK_PWM=y CONFIG_CLK_IMX8MM=y CONFIG_CLK_IMX8MN=y +CONFIG_CLK_IMX8MP=y CONFIG_CLK_IMX8MQ=y CONFIG_CLK_IMX8QXP=y CONFIG_HWSPINLOCK=y @@ -689,11 +723,13 @@ CONFIG_PLATFORM_MHU=y CONFIG_ARM_SMMU=y CONFIG_ARM_SMMU_V3=y CONFIG_REMOTEPROC=y +CONFIG_IMX_REMOTEPROC=y CONFIG_RPMSG_QCOM_GLINK_RPM=y CONFIG_SOC_BRCMSTB=y CONFIG_FSL_MC_DPIO=y CONFIG_FSL_QIXIS=y CONFIG_IMX_SCU_SOC=y +CONFIG_SECVIO_SC=y CONFIG_SOC_TI=y CONFIG_EXTCON_USB_GPIO=y CONFIG_EXTCON_USBC_CROS_EC=y @@ -707,10 +743,14 @@ CONFIG_PWM=y CONFIG_PWM_CROS_EC=m CONFIG_PWM_IMX27=y CONFIG_PHY_XGENE=y +CONFIG_PHY_MIXEL_LVDS=y +CONFIG_PHY_MIXEL_LVDS_COMBO=y +CONFIG_PHY_FSL_IMX8MP_LVDS=y CONFIG_PHY_MIXEL_MIPI_DPHY=y +CONFIG_PHY_SAMSUNG_HDMI_PHY=y CONFIG_PHY_QCOM_USB_HS=y CONFIG_PHY_SAMSUNG_USB2=y -CONFIG_FSL_IMX8_DDR_PMU=m +CONFIG_FSL_IMX8_DDR_PMU=y CONFIG_HISI_PMU=y CONFIG_NVMEM_IMX_OCOTP=y CONFIG_NVMEM_IMX_OCOTP_SCU=y @@ -784,6 +824,19 @@ CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=m CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=y +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_VMAC=m +CONFIG_CRYPTO_SM3=m +CONFIG_CRYPTO_STREEBOG=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SM4=m +CONFIG_CRYPTO_TEA=m CONFIG_INDIRECT_PIO=y CONFIG_CMA_SIZE_MBYTES=320 CONFIG_PRINTK_TIME=y @@ -795,3 +848,6 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_PREEMPT is not set # CONFIG_FTRACE is not set CONFIG_MEMTEST=y +CONFIG_CORESIGHT=y +CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y +CONFIG_CORESIGHT_SOURCE_ETM4X=y diff --git a/recipes-kernel/linux/linux-imx_5.4.3.bb b/recipes-kernel/linux/linux-imx_5.4.bb similarity index 79% rename from recipes-kernel/linux/linux-imx_5.4.3.bb rename to recipes-kernel/linux/linux-imx_5.4.bb index 6c042184..8c56b986 100644 --- a/recipes-kernel/linux/linux-imx_5.4.3.bb +++ b/recipes-kernel/linux/linux-imx_5.4.bb @@ -1,5 +1,5 @@ # Copyright 2013-2016 (C) Freescale Semiconductor -# Copyright 2017-2019 (C) NXP +# Copyright 2017-2020 (C) NXP # Copyright 2018 (C) O.S. Systems Software LTDA. # Released under the MIT license (see COPYING.MIT for the terms) # @@ -17,18 +17,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "lzop-native bc-native" -SRCBRANCH = "lf-5.4.y" -LOCALVERSION = "-1.0.0" -SRCREV = "f8118585ee3c7025265b28985fdfe0af96a84466" +SRCBRANCH = "imx_5.4.24_2.1.0" +LOCALVERSION = "-2.1.0" +SRCREV = "babac008e5cf168abca1a85bda2e8071ca27a5c0" # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition # required by kernel-yocto.bbclass. # # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and # should be updated once patchlevel is merged. -LINUX_VERSION = "5.4.3" - -SRC_URI += "file://0001-perf-Make-perf-able-to-build-with-latest-libbfd.patch" +LINUX_VERSION = "5.4.24" DEFAULT_PREFERENCE = "1" -- 2.40.1