From 0ea64936af24159b1c78993e3444e67ae15cc6d1 Mon Sep 17 00:00:00 2001 From: Chunrong Guo Date: Mon, 1 Apr 2019 14:42:05 +0800 Subject: [PATCH] linux-qoriq/4.14:update to 7e52442 *update to lsdk 1903 tag include the following changes: 7e52442 - vfio/fsl-mc: Reset container on last reference release 66346b1 - Revert "net: phy: aquantia: add pause frame support" 5a51f09 - Merge branch 'linux-4.14-nxp' into linux-4.14 on Mar 21, 2019 0412772 - PCI: controller: dwc: Do not let PCIE_DW_PLAT_HOST default to yes 55f1e5e - i2c: imx: defer probing on dma channel request c42701e - i2c: imx: fix dma_request_chan error handling e16c8a1 - i2c: imx: improve the error handling in i2c_imx_dma_request() 434a13d - i2c: imx: notify about real errors on dma i2c_imx_dma_request ba46a4b - powerpc/dts/fsl: add crypto node alias for B4 1c0ec67 - arm64: dts: ls1043a: add crypto node alias also for qds eb96cdd - soc: fsl: dpio: Increase timeout for QBMan Management Commands a695286 - soc: fsl: qbman: avoid race in clearing QMan interrupt 07977ec - drivers: soc: fsl: fix problem of compiling qixis driver 0529a6d - PCI: endpoint: Correcting nonstandard NXP copyright 70827e4 - Merge branch 'linux-4.14-nxp' into linux-4.14 on Mar 20, 2019 2a71b28 - crypto: caam - fix building job ring as module b87ba6a - soc/fsl/bqman: page align iommu mapping sizes d2e2129 - sdk: dts: remove dma-coherent from sdk dts for QE 788e297 - net: phy: aquantia: add pause frame support fcc8208 - dpaa2-eth: Update pause frames settings on link up 4c86a9c - dpaa2-eth: fix race condition with bql frame accounting e0d959e - dpaa2-eth: configure the cache stashing amount on a queue bafb6b5 - staging: fsl-dpaa2/mac: Fix bug in pause frame advertising 0ed08fd - staging: fsl-dpaa2/mac: add pause frames support for managed phys adcaa66 - of/device: Set bus DMA mask as appropriate 7f97665 - iommu/dma: Respect bus DMA limit for IOVAs *refresh patches Signed-off-by: Chunrong Guo --- .../0001-Makefile-fix-gcc-8-build-error.patch | 25 ------------------ .../0001-Makfefile-add-cflags.patch | 26 +++++++++++++++++++ .../0001-fix-gcc8-build-error.patch | 25 ------------------ recipes-kernel/linux/linux-qoriq_4.14.bb | 4 +-- 4 files changed, 28 insertions(+), 52 deletions(-) delete mode 100644 recipes-kernel/linux/linux-qoriq/0001-Makefile-fix-gcc-8-build-error.patch create mode 100644 recipes-kernel/linux/linux-qoriq/0001-Makfefile-add-cflags.patch delete mode 100644 recipes-kernel/linux/linux-qoriq/0001-fix-gcc8-build-error.patch diff --git a/recipes-kernel/linux/linux-qoriq/0001-Makefile-fix-gcc-8-build-error.patch b/recipes-kernel/linux/linux-qoriq/0001-Makefile-fix-gcc-8-build-error.patch deleted file mode 100644 index b4c4aed8..00000000 --- a/recipes-kernel/linux/linux-qoriq/0001-Makefile-fix-gcc-8-build-error.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5066b8f46b0f2348881923491b93825ac04d13d2 Mon Sep 17 00:00:00 2001 -From: Chunrong Guo -Date: Sat, 29 Sep 2018 14:12:34 +0800 -Subject: [PATCH] Makefile: fix gcc-8 build error - -Signed-off-by: BJ DevOps Team ---- - Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Makefile b/Makefile -index 53d57ac..b7c5fd4 100644 ---- a/Makefile -+++ b/Makefile -@@ -395,6 +395,7 @@ LINUXINCLUDE += $(filter-out $(LINUXINCLUDE),$(USERINCLUDE)) - KBUILD_AFLAGS := -D__ASSEMBLY__ - KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ - -fno-strict-aliasing -fno-common \ -+ -Wno-packed-not-aligned -Wno-tautological-compare \ - -Werror-implicit-function-declaration \ - -Wno-format-security \ - -std=gnu89 --- -1.8.3.1 - diff --git a/recipes-kernel/linux/linux-qoriq/0001-Makfefile-add-cflags.patch b/recipes-kernel/linux/linux-qoriq/0001-Makfefile-add-cflags.patch new file mode 100644 index 00000000..b01545f8 --- /dev/null +++ b/recipes-kernel/linux/linux-qoriq/0001-Makfefile-add-cflags.patch @@ -0,0 +1,26 @@ +From e2283cc7582ba82f346b05fdb38f0057e54de7fa Mon Sep 17 00:00:00 2001 +From: Chunrong Guo +Date: Tue, 12 Mar 2019 03:52:03 +0100 +Subject: [PATCH] Makfefile: add cflags + +Signed-off-by: C.r. Guo +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 967692b..ae395cd 100644 +--- a/Makefile ++++ b/Makefile +@@ -417,7 +417,7 @@ LINUXINCLUDE := \ + KBUILD_AFLAGS := -D__ASSEMBLY__ + KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ + -fno-strict-aliasing -fno-common -fshort-wchar \ +- -Werror-implicit-function-declaration \ ++ -Werror-implicit-function-declaration -Wno-misleading-indentation -Wno-tautological-compare \ + -Wno-format-security \ + -std=gnu89 + KBUILD_CPPFLAGS := -D__KERNEL__ +-- +2.7.4 + diff --git a/recipes-kernel/linux/linux-qoriq/0001-fix-gcc8-build-error.patch b/recipes-kernel/linux/linux-qoriq/0001-fix-gcc8-build-error.patch deleted file mode 100644 index 3cd25014..00000000 --- a/recipes-kernel/linux/linux-qoriq/0001-fix-gcc8-build-error.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 844ce11967bca7b7f68c6cb459e02c9a10f32574 Mon Sep 17 00:00:00 2001 -From: BJ DevOps Team -Date: Tue, 3 Jul 2018 15:06:29 +0800 -Subject: [PATCH] fix gcc8 build error - ---- - Makefile | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Makefile b/Makefile -index d6db01a..85d9d6c 100644 ---- a/Makefile -+++ b/Makefile -@@ -422,6 +422,8 @@ LINUXINCLUDE := \ - KBUILD_AFLAGS := -D__ASSEMBLY__ - KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ - -fno-strict-aliasing -fno-common -fshort-wchar \ -+ -Wno-packed-not-aligned \ -+ -Wno-tautological-compare \ - -Werror-implicit-function-declaration \ - -Wno-format-security \ - -std=gnu89 --- -1.8.3.1 - diff --git a/recipes-kernel/linux/linux-qoriq_4.14.bb b/recipes-kernel/linux/linux-qoriq_4.14.bb index cb06ae43..9f4bcf04 100644 --- a/recipes-kernel/linux/linux-qoriq_4.14.bb +++ b/recipes-kernel/linux/linux-qoriq_4.14.bb @@ -7,9 +7,9 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/linux;nobranch=1 \ - file://0001-fix-gcc8-build-error.patch \ + file://0001-Makfefile-add-cflags.patch \ " -SRCREV = "7e0006ca696756b867abbeb7a4ed97ffe9caf725" +SRCREV = "7e52442b136c439c142c4859a70ce92208c481a9" S = "${WORKDIR}/git" -- 2.40.1