From 4f26ef647b983dcfb93b8601f14fa4b512fd79b5 Mon Sep 17 00:00:00 2001
From: Quanyang Wang <quanyang.wang@windriver.com>
Date: Tue, 31 Aug 2021 18:38:33 +0800
Subject: [PATCH 001/146] axxia: add hugetlb support for axxiaarm64 and
axxiaarm
Enable hugetlb support for axm56xx. And also enable hugetlb for axm55xx
since it supports LPAE.
Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/axxiaarm/axxiaarm.scc | 1 +
bsp/axxiaarm64/axxiaarm64.scc | 1 +
2 files changed, 2 insertions(+)
diff --git a/bsp/axxiaarm/axxiaarm.scc b/bsp/axxiaarm/axxiaarm.scc
index 4d06c9968..ab9e939a6 100644
--- a/bsp/axxiaarm/axxiaarm.scc
+++ b/bsp/axxiaarm/axxiaarm.scc
@@ -2,6 +2,7 @@
include arch/arm/arm.scc nopatch
include features/usb/ehci-hcd.scc
+include features/hugetlb/hugetlb.scc
include cfg/usb-mass-storage.scc
include rapidio.scc
diff --git a/bsp/axxiaarm64/axxiaarm64.scc b/bsp/axxiaarm64/axxiaarm64.scc
index c8611b18d..a6bfe567f 100644
--- a/bsp/axxiaarm64/axxiaarm64.scc
+++ b/bsp/axxiaarm64/axxiaarm64.scc
@@ -1,4 +1,5 @@
include features/usb/xhci-hcd.scc
+include features/hugetlb/hugetlb.scc
include cfg/usb-mass-storage.scc
include bsp/axxiaarm/rapidio.scc
--
GitLab
From 40cf59b844654b88c610fea48992844f8d66f66e Mon Sep 17 00:00:00 2001
From: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Date: Wed, 1 Sep 2021 15:20:11 +0800
Subject: [PATCH 002/146] marvell-cn96xx: Enable the GHES driver
This is needed by some customers, so enable it.
Signed-off-by: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/marvell-cn96xx/marvell-cn96xx.cfg | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/bsp/marvell-cn96xx/marvell-cn96xx.cfg b/bsp/marvell-cn96xx/marvell-cn96xx.cfg
index 1b1c4af31..522f81e2f 100644
--- a/bsp/marvell-cn96xx/marvell-cn96xx.cfg
+++ b/bsp/marvell-cn96xx/marvell-cn96xx.cfg
@@ -122,3 +122,7 @@ CONFIG_COMMON_CLK_SCMI=y
# CPU freq
CONFIG_CPU_FREQ=y
CONFIG_ARM_SCMI_CPUFREQ=y
+
+# GHES
+CONFIG_ACPI=y
+CONFIG_OCTEONTX2_SDEI_GHES=y
--
GitLab
From c2e2a0b6d68eef04eb8678971b1065f6b0e5b264 Mon Sep 17 00:00:00 2001
From: Anuj Mittal <anuj.mittal@intel.com>
Date: Wed, 1 Sep 2021 23:43:28 +0800
Subject: [PATCH 003/146] features/media-platform: enable
MEDIA_PLATFORM_SUPPORT
Commit 06b93644f4d10 (media: Kconfig: add an option to filter in/out
platform drivers) adds an option to filter out platform drivers.
Enable MEDIA_PLATFORM_SUPPORT when that feature is requested.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
features/media/media-platform.cfg | 1 +
1 file changed, 1 insertion(+)
diff --git a/features/media/media-platform.cfg b/features/media/media-platform.cfg
index 58ad73304..135e3eeb5 100644
--- a/features/media/media-platform.cfg
+++ b/features/media/media-platform.cfg
@@ -2,5 +2,6 @@
#
# Media Platform Configuration
#
+CONFIG_MEDIA_PLATFORM_SUPPORT=y
CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
--
GitLab
From 45005ebd99b5f278b0fb8aeeed6e384cf4a8b7fa Mon Sep 17 00:00:00 2001
From: Yongxin Liu <yongxin.liu@windriver.com>
Date: Thu, 2 Sep 2021 08:23:07 +0800
Subject: [PATCH 004/146] bsp/intel-x86: remove cfg80211 related overrides
Fix the following warning:
platform regulatory.0: Direct firmware load for regulatory.db failed with error -2
cfg80211: failed to load regulatory.db
If CFG80211 is a built-in driver, it will try to load regulatory.db from
/lib/firmware. But file system may not be ready at that time. So remove the
override and make CFG80211 a loadable module.
Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/intel-x86/intel-x86-cfg80211-overrides.cfg | 3 ---
bsp/intel-x86/intel-x86.scc | 1 -
2 files changed, 4 deletions(-)
delete mode 100644 bsp/intel-x86/intel-x86-cfg80211-overrides.cfg
diff --git a/bsp/intel-x86/intel-x86-cfg80211-overrides.cfg b/bsp/intel-x86/intel-x86-cfg80211-overrides.cfg
deleted file mode 100644
index 26957814a..000000000
--- a/bsp/intel-x86/intel-x86-cfg80211-overrides.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: MIT
-CONFIG_CFG80211=y
-CONFIG_MAC80211=y
diff --git a/bsp/intel-x86/intel-x86.scc b/bsp/intel-x86/intel-x86.scc
index e1afd0719..90eb0b093 100644
--- a/bsp/intel-x86/intel-x86.scc
+++ b/bsp/intel-x86/intel-x86.scc
@@ -61,6 +61,5 @@ kconf hardware intel-x86-acpi.cfg
kconf hardware intel-x86-igb-overrides.cfg
kconf hardware intel-x86-ixgbe-overrides.cfg
kconf hardware intel-x86-i915-overrides.cfg
-kconf hardware intel-x86-cfg80211-overrides.cfg
kconf hardware intel-x86-dptf-overrides.cfg
kconf hardware intel-x86-serial-8250-overrides.cfg
--
GitLab
From b9e8de4b4f58e1dfae6dfe1ba384628f5a835977 Mon Sep 17 00:00:00 2001
From: Yongxin Liu <yongxin.liu@windriver.com>
Date: Thu, 2 Sep 2021 08:23:08 +0800
Subject: [PATCH 005/146] bsp/intel-x86: add NVMe hardware monitoring support
Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/intel-x86/intel-x86.cfg | 1 +
1 file changed, 1 insertion(+)
diff --git a/bsp/intel-x86/intel-x86.cfg b/bsp/intel-x86/intel-x86.cfg
index f4b75f0e5..3aa03c3c8 100644
--- a/bsp/intel-x86/intel-x86.cfg
+++ b/bsp/intel-x86/intel-x86.cfg
@@ -320,6 +320,7 @@ CONFIG_NOP_USB_XCEIV=y
# NVMe support
CONFIG_BLK_DEV_NVME=y
+CONFIG_NVME_HWMON=y
# PMC
CONFIG_MFD_INTEL_PMC_BXT=m
--
GitLab
From 26d9822e2f6bb1b437a4b209f1de0e94ca1d2600 Mon Sep 17 00:00:00 2001
From: Meng Li <Meng.Li@windriver.com>
Date: Mon, 6 Sep 2021 16:07:40 +0800
Subject: [PATCH 006/146] nxp-lx2xxx: enable CONFIG_AT803X_PHY to use the
correct phy driver
In nxp-lx2160 SoC dts file, the dpmac17/18 connect with AR8035 PHY.
So, enable CONFIG_AT803X_PHY to use the correct phy driver like sdk
kernel.
Signed-off-by: Meng Li <Meng.Li@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-lx2xxx/nxp-lx2xxx.cfg | 2 ++
1 file changed, 2 insertions(+)
diff --git a/bsp/nxp-lx2xxx/nxp-lx2xxx.cfg b/bsp/nxp-lx2xxx/nxp-lx2xxx.cfg
index e1dbbb4b7..d6ba3a6f3 100644
--- a/bsp/nxp-lx2xxx/nxp-lx2xxx.cfg
+++ b/bsp/nxp-lx2xxx/nxp-lx2xxx.cfg
@@ -121,6 +121,8 @@ CONFIG_PHYLIB=y
CONFIG_AQUANTIA_PHY=y
CONFIG_CORTINA_PHY=y
CONFIG_INPHI_PHY=y
+CONFIG_REGULATOR=y
+CONFIG_AT803X_PHY=y
#
# I2C support
--
GitLab
From 87d369a2845d88588a2a320d2f3149a62d2c1374 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Wed, 8 Sep 2021 13:56:46 -0400
Subject: [PATCH 007/146] kver: bumping to v5.13.14
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index aff05882d..fb46ad241 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.61
+v5.13.14
--
GitLab
From 570cacbfd37414ad796aba128a35b9ee876590f6 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Wed, 8 Sep 2021 13:58:01 -0400
Subject: [PATCH 008/146] kver: bumping to v5.13.15
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index fb46ad241..8c8e1f513 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.13.14
+v5.13.15
--
GitLab
From bf9b571143990bcf7e89fec291b469352b0be454 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Wed, 8 Sep 2021 23:01:03 -0400
Subject: [PATCH 009/146] Revert "kver: bumping to v5.13.15"
This reverts commit 570cacbfd37414ad796aba128a35b9ee876590f6.
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index 8c8e1f513..fb46ad241 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.13.15
+v5.13.14
--
GitLab
From 748ceebd92259d8c09ba987de6cfdba17aab5cc0 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Wed, 8 Sep 2021 23:01:05 -0400
Subject: [PATCH 010/146] Revert "kver: bumping to v5.13.14"
This reverts commit 87d369a2845d88588a2a320d2f3149a62d2c1374.
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index fb46ad241..aff05882d 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.13.14
+v5.10.61
--
GitLab
From c85a5592a6a6ddf3ba46e134c378d936472eb984 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Wed, 8 Sep 2021 23:01:39 -0400
Subject: [PATCH 011/146] kver: bumping to v5.10.63
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index aff05882d..c7fb23a01 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.61
+v5.10.63
--
GitLab
From 2ff573547145a420a65cc8cd16c2f51518ec3235 Mon Sep 17 00:00:00 2001
From: Quanyang Wang <quanyang.wang@windriver.com>
Date: Thu, 2 Sep 2021 09:44:07 +0800
Subject: [PATCH 012/146] axxiaarm: inhibit CONFIG_CC_OPTIMIZE_FOR_SIZE and
CONFIG_FUNCTION_GRAPH_TRACER
Disable CONFIG_CC_OPTIMIZE_FOR_SIZE and CONFIG_FUNCTION_GRAPH_TRACER to
fix the warning when do_kernel_configcheck:
[NOTE]: 'CONFIG_FUNCTION_GRAPH_TRACER' last val (y) and .config val (n) do not match
[INFO]: CONFIG_FUNCTION_GRAPH_TRACER : n ## .config: 4212 :configs/v5.10/standard/preempt-rt/arch/arm/arm.cfg (n) configs/v5.10/standard/preempt-rt/features/ftrace/ftrace.cfg (y)
[NOTE]: 'CONFIG_CC_OPTIMIZE_FOR_SIZE' last val (n) and .config val (y) do not match
[INFO]: CONFIG_CC_OPTIMIZE_FOR_SIZE : y ## .config: 179 :configs/v5.10/standard/preempt-rt/arch/arm/arm.cfg (y) configs/v5.10/standard/preempt-rt/ktypes/preempt-rt/preempt-rt.cfg (n)
Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/axxiaarm/axxiaarm.cfg | 2 ++
1 file changed, 2 insertions(+)
diff --git a/bsp/axxiaarm/axxiaarm.cfg b/bsp/axxiaarm/axxiaarm.cfg
index c2fd717a3..a11248b18 100644
--- a/bsp/axxiaarm/axxiaarm.cfg
+++ b/bsp/axxiaarm/axxiaarm.cfg
@@ -41,6 +41,8 @@ CONFIG_SMP=y
CONFIG_HAVE_ARM_ARCH_TIMER=y
CONFIG_HIGHMEM=y
CONFIG_NR_CPUS=16
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+# CONFIG_FUNCTION_GRAPH_TRACER is not set
#
# Boot options
--
GitLab
From 2d4427c664165a5273259658254abf2e3f36e4f1 Mon Sep 17 00:00:00 2001
From: Quanyang Wang <quanyang.wang@windriver.com>
Date: Thu, 2 Sep 2021 09:44:08 +0800
Subject: [PATCH 013/146] axxiaarm64: add CONFIG_MICREL_PHY to axm56xx board
Since *_skew_ps properties have been added to axm56xx.dts,
we can use micrel phy driver again. Let's enable it.
Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/axxiaarm64/axxiaarm64.cfg | 1 +
1 file changed, 1 insertion(+)
diff --git a/bsp/axxiaarm64/axxiaarm64.cfg b/bsp/axxiaarm64/axxiaarm64.cfg
index 0104ad766..f114fd7a6 100644
--- a/bsp/axxiaarm64/axxiaarm64.cfg
+++ b/bsp/axxiaarm64/axxiaarm64.cfg
@@ -80,6 +80,7 @@ CONFIG_RTC_DRV_EFI=y
# PHY Subsystem
#
CONFIG_GENERIC_PHY=y
+CONFIG_MICREL_PHY=y
#
# Watchdog
--
GitLab
From 4bdd59969afd25a9b9a44625d877c4cb1816f9e5 Mon Sep 17 00:00:00 2001
From: Xulin Sun <xulin.sun@windriver.com>
Date: Wed, 8 Sep 2021 14:05:56 +0800
Subject: [PATCH 014/146] ti-j72xx: remove CONFIG_VIDEO_IMG_VXD_DEC kernel
config
The IMG VXD DEC (Video Decoder) driver for the Imagination D5520
(Video Decoder) hardware is not ready yet on TI SDK 8.0. So drop
this kernel config.
Signed-off-by: Xulin Sun <xulin.sun@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/ti-j72xx/ti-j72xx.cfg | 1 -
1 file changed, 1 deletion(-)
diff --git a/bsp/ti-j72xx/ti-j72xx.cfg b/bsp/ti-j72xx/ti-j72xx.cfg
index 1afcaec53..ce5f2a5e1 100755
--- a/bsp/ti-j72xx/ti-j72xx.cfg
+++ b/bsp/ti-j72xx/ti-j72xx.cfg
@@ -337,7 +337,6 @@ CONFIG_MEDIA_SUPPORT=y
CONFIG_VIDEO_DEV=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_VIDEO_V4L2=y
-CONFIG_VIDEO_IMG_VXD_DEC=m
CONFIG_TI_PRUSS_INTC=m
CONFIG_VIDEO_CADENCE=y
CONFIG_VIDEO_CADENCE_CSI2RX=m
--
GitLab
From e0602b13a46b3de816cf21fac528dd90ee5d9612 Mon Sep 17 00:00:00 2001
From: Xiaolei Wang <xiaolei.wang@windriver.com>
Date: Wed, 15 Sep 2021 13:59:08 +0800
Subject: [PATCH 015/146] nxp-imx8: Remove IMX_SCU_SOC config
IMX_SCU_SOC has been removed in SDK v5.10, so delete this config option
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-imx8/nxp-imx8.cfg | 1 -
1 file changed, 1 deletion(-)
diff --git a/bsp/nxp-imx8/nxp-imx8.cfg b/bsp/nxp-imx8/nxp-imx8.cfg
index 773265038..6dc0f1532 100644
--- a/bsp/nxp-imx8/nxp-imx8.cfg
+++ b/bsp/nxp-imx8/nxp-imx8.cfg
@@ -481,7 +481,6 @@ CONFIG_OF_OVERLAY=y
CONFIG_MAILBOX=y
CONFIG_IMX_MBOX=y
CONFIG_IMX_SCU=y
-CONFIG_IMX_SCU_SOC=y
CONFIG_IMX_DSP=y
CONFIG_IMX_SCU_PD=y
CONFIG_IIO=y
--
GitLab
From 7a8c73f2686e5a10392b400f1ae46568c4ce7f1b Mon Sep 17 00:00:00 2001
From: Meng Li <Meng.Li@windriver.com>
Date: Thu, 16 Sep 2021 12:56:38 +0800
Subject: [PATCH 016/146] nxp-ls1043: add scc and cfg files for nxp-ls1043
platform
Refer to scc and cfg files in wrlinux LTS1019, add new scc and cfg
files for BSP nxp-ls1043in wrlinux LTS1021.
Signed-off-by: Meng Li <Meng.Li@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-ls1043/nxp-ls1043-preempt-rt.scc | 8 ++
bsp/nxp-ls1043/nxp-ls1043-standard.scc | 8 ++
bsp/nxp-ls1043/nxp-ls1043.cfg | 153 +++++++++++++++++++++++
bsp/nxp-ls1043/nxp-ls1043.scc | 9 ++
4 files changed, 178 insertions(+)
create mode 100644 bsp/nxp-ls1043/nxp-ls1043-preempt-rt.scc
create mode 100644 bsp/nxp-ls1043/nxp-ls1043-standard.scc
create mode 100755 bsp/nxp-ls1043/nxp-ls1043.cfg
create mode 100644 bsp/nxp-ls1043/nxp-ls1043.scc
diff --git a/bsp/nxp-ls1043/nxp-ls1043-preempt-rt.scc b/bsp/nxp-ls1043/nxp-ls1043-preempt-rt.scc
new file mode 100644
index 000000000..29f0a993d
--- /dev/null
+++ b/bsp/nxp-ls1043/nxp-ls1043-preempt-rt.scc
@@ -0,0 +1,8 @@
+define KMACHINE nxp-ls1043
+define KTYPE preempt-rt
+define KARCH arm64
+
+include ktypes/preempt-rt
+branch nxp-ls1043
+
+include nxp-ls1043.scc
diff --git a/bsp/nxp-ls1043/nxp-ls1043-standard.scc b/bsp/nxp-ls1043/nxp-ls1043-standard.scc
new file mode 100644
index 000000000..9c85ada61
--- /dev/null
+++ b/bsp/nxp-ls1043/nxp-ls1043-standard.scc
@@ -0,0 +1,8 @@
+define KMACHINE nxp-ls1043
+define KTYPE standard
+define KARCH arm64
+
+include ktypes/standard
+branch nxp-ls1043
+
+include nxp-ls1043.scc
diff --git a/bsp/nxp-ls1043/nxp-ls1043.cfg b/bsp/nxp-ls1043/nxp-ls1043.cfg
new file mode 100755
index 000000000..997e979f9
--- /dev/null
+++ b/bsp/nxp-ls1043/nxp-ls1043.cfg
@@ -0,0 +1,153 @@
+..........................................................................
+. WARNING
+.
+. This file is a kernel configuration fragment, and not a full kernel
+. configuration file. The final kernel configuration is made up of
+. an assembly of processed fragments, each of which is designed to
+. capture a specific part of the final configuration (e.g. platform
+. configuration, feature configuration, and board specific hardware
+. configuration). For more information on kernel configuration, please
+. consult the product documentation.
+.
+..........................................................................
+
+CONFIG_ARM64=y
+CONFIG_ARM64_VA_BITS_48=y
+CONFIG_ARCH_LAYERSCAPE=y
+CONFIG_SCHED_MC=y
+CONFIG_ARM_SMMU=y
+
+CONFIG_PCI=y
+CONFIG_PCI_LAYERSCAPE=y
+CONFIG_PCI_HOST_GENERIC=y
+CONFIG_PCI_XGENE=y
+CONFIG_PCI_MSI=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+
+CONFIG_CPU_IDLE=y
+CONFIG_ARM_CPUIDLE=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_QORIQ_CPUFREQ=y
+
+CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_CFI_STAA=y
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_PHYSMAP_OF=y
+CONFIG_MTD_DATAFLASH=y
+CONFIG_MTD_M25P80=y
+CONFIG_MTD_SST25L=y
+CONFIG_MTD_NAND_DENALI_DT=y
+CONFIG_MTD_NAND_FSL_IFC=y
+CONFIG_MTD_RAW_NAND=y
+CONFIG_MEMORY=y
+CONFIG_MTD_SPI_NOR=y
+CONFIG_SPI_FSL_QUADSPI=y
+CONFIG_ATA=y
+CONFIG_SATA_AHCI=y
+CONFIG_AHCI_QORIQ=y
+
+CONFIG_FSL_XGMAC_MDIO=y
+
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_DW=y
+CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_SERIAL_FSL_LPUART=y
+CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
+
+CONFIG_SPI=y
+CONFIG_SPI_FSL_DSPI=y
+CONFIG_SPI_PL022=y
+
+CONFIG_POWER_RESET_XGENE=y
+CONFIG_POWER_RESET_SYSCON=y
+CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
+
+CONFIG_CPU_THERMAL=y
+CONFIG_WATCHDOG=y
+CONFIG_IMX2_WDT=y
+
+CONFIG_USB=y
+CONFIG_USB_OTG=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_HOST=y
+CONFIG_USB_GADGET=y
+
+CONFIG_MMC=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PLTFM=y
+CONFIG_MMC_SDHCI_OF_ESDHC=y
+
+CONFIG_GPIOLIB=y
+CONFIG_OF_GPIO=y
+CONFIG_GPIO_MPC8XXX=y
+
+CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_BITBANG=y
+CONFIG_PHYLIB=y
+CONFIG_AQUANTIA_PHY=y
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_I2C_IMX=y
+
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_PCF2127=y
+CONFIG_RTC_DRV_DS3232=y
+CONFIG_RTC_DRV_DS1307=y
+
+CONFIG_DMADEVICES=y
+CONFIG_FSL_EDMA=y
+CONFIG_CMA=y
+CONFIG_DMA_CMA=y
+
+CONFIG_VFIO=y
+
+CONFIG_STAGING=y
+
+CONFIG_CLK_QORIQ=y
+
+CONFIG_FSL_GUTS=y
+
+CONFIG_PHY_XGENE=y
+
+CONFIG_CRYPTO_DEV_FSL_CAAM=y
+CONFIG_ARM64_CRYPTO=y
+CONFIG_CRYPTO_SHA1_ARM64_CE=y
+CONFIG_CRYPTO_SHA2_ARM64_CE=y
+CONFIG_CRYPTO_GHASH_ARM64_CE=y
+CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
+CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
+
+# dpaa1
+CONFIG_FSL_SDK_DPA=y
+CONFIG_FSL_SDK_FMAN=y
+CONFIG_FSL_SDK_DPAA_ETH=y
+CONFIG_FSL_DPAA_TS=y
+CONFIG_PTP_1588_CLOCK=y
+CONFIG_PTP_1588_CLOCK_QORIQ=y
+CONFIG_FSL_DPAA_1588=y
+
+# EDAC
+CONFIG_EDAC_LAYERSCAPE=y
+
+# Thermal
+CONFIG_THERMAL=y
+CONFIG_QORIQ_THERMAL=y
diff --git a/bsp/nxp-ls1043/nxp-ls1043.scc b/bsp/nxp-ls1043/nxp-ls1043.scc
new file mode 100644
index 000000000..36b17ec45
--- /dev/null
+++ b/bsp/nxp-ls1043/nxp-ls1043.scc
@@ -0,0 +1,9 @@
+kconf hardware nxp-ls1043.cfg
+kconf hardware features/edac/edac.cfg
+
+include cfg/usb-mass-storage.scc
+
+include features/hugetlb/hugetlb.scc
+include arch/arm/32bit-compat.scc
+include features/profiling/profiling.scc
+
--
GitLab
From 5c759138cced8639a489c23f4a01b0ce3633d06f Mon Sep 17 00:00:00 2001
From: Meng Li <Meng.Li@windriver.com>
Date: Thu, 16 Sep 2021 13:47:15 +0800
Subject: [PATCH 017/146] nxp-ls1043: update kernel config for nxp-ls1043
platform
- remove the obsolete config -CONFIG_MTD_M25P80
- enable config CONFIG_ENERGY_MODEL, because kernel config
CONFIG_THERMAL_GOV_POWER_ALLOCATOR depend on it.
Signed-off-by: Meng Li <Meng.Li@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-ls1043/nxp-ls1043.cfg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bsp/nxp-ls1043/nxp-ls1043.cfg b/bsp/nxp-ls1043/nxp-ls1043.cfg
index 997e979f9..9aa73949d 100755
--- a/bsp/nxp-ls1043/nxp-ls1043.cfg
+++ b/bsp/nxp-ls1043/nxp-ls1043.cfg
@@ -47,7 +47,6 @@ CONFIG_MTD_CFI_STAA=y
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_PHYSMAP_OF=y
CONFIG_MTD_DATAFLASH=y
-CONFIG_MTD_M25P80=y
CONFIG_MTD_SST25L=y
CONFIG_MTD_NAND_DENALI_DT=y
CONFIG_MTD_NAND_FSL_IFC=y
@@ -74,6 +73,7 @@ CONFIG_SPI_PL022=y
CONFIG_POWER_RESET_XGENE=y
CONFIG_POWER_RESET_SYSCON=y
+CONFIG_ENERGY_MODEL=y
CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
CONFIG_CPU_THERMAL=y
--
GitLab
From 4e30647a26712fe487149fe4ac7d2ce76c8759df Mon Sep 17 00:00:00 2001
From: Meng Li <Meng.Li@windriver.com>
Date: Thu, 16 Sep 2021 17:28:43 +0800
Subject: [PATCH 018/146] nxp-ls1043: enable necessary kernel config for
nxp-ls1043 platform
- enable CONFIG_CPUFREQ_DT for CPU frequency scaling feature
- enable config CONFIG_DEVICE_THERMAL, because kernel config
CONFIG_QORIQ_THERMAL depend on it.
Signed-off-by: Meng Li <Meng.Li@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-ls1043/nxp-ls1043.cfg | 2 ++
1 file changed, 2 insertions(+)
diff --git a/bsp/nxp-ls1043/nxp-ls1043.cfg b/bsp/nxp-ls1043/nxp-ls1043.cfg
index 9aa73949d..c39bff88e 100755
--- a/bsp/nxp-ls1043/nxp-ls1043.cfg
+++ b/bsp/nxp-ls1043/nxp-ls1043.cfg
@@ -34,6 +34,7 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
CONFIG_CPU_FREQ_GOV_USERSPACE=y
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPUFREQ_DT=y
CONFIG_QORIQ_CPUFREQ=y
CONFIG_MTD=y
@@ -150,4 +151,5 @@ CONFIG_EDAC_LAYERSCAPE=y
# Thermal
CONFIG_THERMAL=y
+CONFIG_DEVICE_THERMAL=y
CONFIG_QORIQ_THERMAL=y
--
GitLab
From e0147386e9f3c4cabc6f6d256d457fd4e67eb221 Mon Sep 17 00:00:00 2001
From: Zhantao Tang <zhantao.tang@windriver.com>
Date: Thu, 16 Sep 2021 21:43:05 +0800
Subject: [PATCH 019/146] nxp-s32g2xx: add preemt-rt support for s32g platform
Now the preempt-rt kernel should be supported for s32g platform,
so update and add support for it.
Signed-off-by: Zhantao Tang <zhantao.tang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-s32g2xx/nxp-s32g2xx-preempt-rt.scc | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100755 bsp/nxp-s32g2xx/nxp-s32g2xx-preempt-rt.scc
diff --git a/bsp/nxp-s32g2xx/nxp-s32g2xx-preempt-rt.scc b/bsp/nxp-s32g2xx/nxp-s32g2xx-preempt-rt.scc
new file mode 100755
index 000000000..0335e4ba8
--- /dev/null
+++ b/bsp/nxp-s32g2xx/nxp-s32g2xx-preempt-rt.scc
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: MIT
+define KMACHINE nxp-s32g2xx
+define KTYPE preempt-rt
+define KARCH arm64
+
+include ktypes/preempt-rt
+branch nxp-s32g2xx
+
+include nxp-s32g2xx.scc
--
GitLab
From ad81d35ed0c058ae10ea85d30e30546428014cbb Mon Sep 17 00:00:00 2001
From: Jon Mason <jdmason@kudzu.us>
Date: Thu, 16 Sep 2021 18:25:47 -0400
Subject: [PATCH 020/146] README: Update mail address
linux-yocto@yoctoproject.org bounces with a:
I'm sorry to have to inform you that your message could not
be delivered to one or more recipients. It's attached below.
Update the email address to the new one to correct the issue.
Signed-off-by: Jon Mason <jdmason@kudzu.us>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
00-README | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/00-README b/00-README
index 85e7c85e8..214a3a7fd 100644
--- a/00-README
+++ b/00-README
@@ -9,7 +9,7 @@ mailing list (subscripion only) and should cc' the maintainer.
When sending single patches, please using something like:
- $ git send-email -1 --to linux-yocto@yoctoproject.org --subject-prefix='kernel-cache][PATCH'
+ $ git send-email -1 --to=linux-yocto@lists.yoctoproject.org --subject-prefix='kernel-cache][PATCH'
1.0 Overview
============
--
GitLab
From 6550045254f2cba88769562536a0bf5b8e7f0e08 Mon Sep 17 00:00:00 2001
From: Meng Li <Meng.Li@windriver.com>
Date: Wed, 22 Sep 2021 14:34:33 +0800
Subject: [PATCH 021/146] nxp- ls1043: enable fmt alarm driver for nxp-ls1043
platform
Enable the specific alarm driver for nxp-ls1043 platform.
Signed-off-by: Meng Li <Meng.Li@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-ls1043/nxp-ls1043.cfg | 1 +
1 file changed, 1 insertion(+)
diff --git a/bsp/nxp-ls1043/nxp-ls1043.cfg b/bsp/nxp-ls1043/nxp-ls1043.cfg
index c39bff88e..42ce38900 100755
--- a/bsp/nxp-ls1043/nxp-ls1043.cfg
+++ b/bsp/nxp-ls1043/nxp-ls1043.cfg
@@ -113,6 +113,7 @@ CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_PCF2127=y
CONFIG_RTC_DRV_DS3232=y
CONFIG_RTC_DRV_DS1307=y
+CONFIG_RTC_DRV_FSL_FTM_ALARM=y
CONFIG_DMADEVICES=y
CONFIG_FSL_EDMA=y
--
GitLab
From 4ee40666966cf3cb07c45a5e12b68952492e2efc Mon Sep 17 00:00:00 2001
From: Meng Li <Meng.Li@windriver.com>
Date: Fri, 24 Sep 2021 08:37:08 +0800
Subject: [PATCH 022/146] nxp- ls1043: enable CONFIG_FSL_RCPM kernel config
ftm-alarm driver on rcpm driver, so enable it for nxp-ls1043 platform.
Signed-off-by: Meng Li <Meng.Li@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-ls1043/nxp-ls1043.cfg | 1 +
1 file changed, 1 insertion(+)
diff --git a/bsp/nxp-ls1043/nxp-ls1043.cfg b/bsp/nxp-ls1043/nxp-ls1043.cfg
index 42ce38900..be705905b 100755
--- a/bsp/nxp-ls1043/nxp-ls1043.cfg
+++ b/bsp/nxp-ls1043/nxp-ls1043.cfg
@@ -114,6 +114,7 @@ CONFIG_RTC_DRV_PCF2127=y
CONFIG_RTC_DRV_DS3232=y
CONFIG_RTC_DRV_DS1307=y
CONFIG_RTC_DRV_FSL_FTM_ALARM=y
+CONFIG_FSL_RCPM=y
CONFIG_DMADEVICES=y
CONFIG_FSL_EDMA=y
--
GitLab
From 917c420111475e33a26f46a9a2855b973ffffadb Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Mon, 27 Sep 2021 11:41:41 -0400
Subject: [PATCH 023/146] kver: bumping to v5.10.69
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index c7fb23a01..7ef0d440b 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.63
+v5.10.69
--
GitLab
From f8afd84b117f336477846b9e22178ebefb26c08d Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Sun, 3 Oct 2021 21:27:49 -0400
Subject: [PATCH 024/146] kver: bumping to v5.10.70
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index 7ef0d440b..cdf7baaff 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.69
+v5.10.70
--
GitLab
From d79f0544c734b00440add69cb484c6830aca4c6e Mon Sep 17 00:00:00 2001
From: Jate Sujjavanich <jatedev@gmail.com>
Date: Sat, 2 Oct 2021 14:00:48 +0000
Subject: [PATCH 025/146] cfg/vmware-guest.cfg: Fix warnings with
vmware-guest.cfg
Add SCSI_FC_ATTRS for FUSION_FC
Add NET_FC for FUSION_LAN
Remove SCSI LOGGING configuration options no longer in kernel
Signed-off-by: Jate Sujjavanich <jatedev@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
cfg/vmware-guest.cfg | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cfg/vmware-guest.cfg b/cfg/vmware-guest.cfg
index 00b1131d5..499a02b91 100644
--- a/cfg/vmware-guest.cfg
+++ b/cfg/vmware-guest.cfg
@@ -15,9 +15,9 @@ CONFIG_FUSION_MAX_SGE=128
CONFIG_FUSION_CTL=y
CONFIG_FUSION_LAN=y
CONFIG_FUSION_LOGGING=y
+CONFIG_NET_FC=y
+CONFIG_SCSI_FC_ATTRS=y
CONFIG_SCSI_MPT2SAS=y
CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-CONFIG_SCSI_MPT2SAS_LOGGING=y
CONFIG_SCSI_MPT3SAS=y
CONFIG_SCSI_MPT3SAS_MAX_SGE=128
-CONFIG_SCSI_MPT3SAS_LOGGING=y
--
GitLab
From 661aeb3be3206fc7fccdae35b221aa3750c615a7 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Wed, 13 Oct 2021 16:07:49 -0400
Subject: [PATCH 026/146] kver: bumping to v5.10.73
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index cdf7baaff..357edb095 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.70
+v5.10.73
--
GitLab
From ceb117a36d87042f235184f9fac32e079b68f7fd Mon Sep 17 00:00:00 2001
From: Meng Li <Meng.Li@windriver.com>
Date: Mon, 18 Oct 2021 16:01:28 +0800
Subject: [PATCH 027/146] nxp-ls1043: enable PSCI CPU idle Driver for nxp
ls1043-rdb plarform
Signed-off-by: Meng Li <Meng.Li@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-ls1043/nxp-ls1043.cfg | 1 +
1 file changed, 1 insertion(+)
diff --git a/bsp/nxp-ls1043/nxp-ls1043.cfg b/bsp/nxp-ls1043/nxp-ls1043.cfg
index be705905b..319812e8c 100755
--- a/bsp/nxp-ls1043/nxp-ls1043.cfg
+++ b/bsp/nxp-ls1043/nxp-ls1043.cfg
@@ -28,6 +28,7 @@ CONFIG_HOTPLUG_PCI_PCIE=y
CONFIG_CPU_IDLE=y
CONFIG_ARM_CPUIDLE=y
+CONFIG_ARM_PSCI_CPUIDLE=y
CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
--
GitLab
From 7676dde0569ceba548579dafcf8235b4eececbc8 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Mon, 18 Oct 2021 23:10:55 -0400
Subject: [PATCH 028/146] kver: bumping to v5.10.74
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index 357edb095..f6a0e2671 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.73
+v5.10.74
--
GitLab
From f3ca54fbebb1b80b55982d56789cfee5e626f0bd Mon Sep 17 00:00:00 2001
From: Xiaolei Wang <xiaolei.wang@windriver.com>
Date: Wed, 20 Oct 2021 10:05:02 +0800
Subject: [PATCH 029/146] nxp-imx8: add kernel-cache configuration files for
preempt-rt kernel
add kernel-cache configuration files for preempt-rt kernel
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-imx8/nxp-imx8-preempt-rt.scc | 8 ++++++++
1 file changed, 8 insertions(+)
create mode 100644 bsp/nxp-imx8/nxp-imx8-preempt-rt.scc
diff --git a/bsp/nxp-imx8/nxp-imx8-preempt-rt.scc b/bsp/nxp-imx8/nxp-imx8-preempt-rt.scc
new file mode 100644
index 000000000..79fa27cb3
--- /dev/null
+++ b/bsp/nxp-imx8/nxp-imx8-preempt-rt.scc
@@ -0,0 +1,8 @@
+define KMACHINE nxp-imx8
+define KTYPE preempt-rt
+define KARCH arm64
+
+include ktypes/preempt-rt
+branch nxp-imx8
+
+include nxp-imx8.scc
--
GitLab
From d946f3fc08705ad3c8051fdf2869e9f8696e9747 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Wed, 20 Oct 2021 21:43:58 -0400
Subject: [PATCH 030/146] yaffs: replace IS_ERR with IS_ERR_OR_NULL to check
both ERR and NULL
1/1 [
Author: Meng Li
Email: Meng.Li@windriver.com
Subject: yaffs: replace IS_ERR with IS_ERR_OR_NULL to check both ERR and NULL
Date: Thu, 21 Oct 2021 09:27:20 +0800
When run below command to mount a yaffs2 FS to nor flash, there
is kernel panic as below:
Unable to handle kernel NULL pointer dereference at virtual address 0000000000000020
......
Internal error: Oops: 96000004 [#1] PREEMPT SMP
Modules linked in:
CPU: 1 PID: 335 Comm: mount Not tainted 5.10.73-yocto-standard #1
......
Call trace:
yaffs_internal_read_super.constprop.0+0x24c/0x6fc
yaffs2_internal_read_super_mtd+0x28/0x40
mount_bdev+0x1cc/0x200
......
el0_sync_handler+0x1a4/0x1b0
el0_sync+0x180/0x1c0
Because in function yaffs_get_mtd_device(), it check the type of
mtd device. If it is not NAND flash, NULL will be returned. This
causes kernel panic if the ret value is not checked whether it
is NULL or not. So, replace IS_ERR with IS_ERR_OR_NULL to check
both ERR and NULL.
Signed-off-by: Meng Li <Meng.Li@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
]
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
..._ERR-with-IS_ERR_OR_NULL-to-check-bo.patch | 49 +++++++++++++++++++
features/yaffs2/yaffs2.scc | 1 +
2 files changed, 50 insertions(+)
create mode 100644 features/yaffs2/yaffs-replace-IS_ERR-with-IS_ERR_OR_NULL-to-check-bo.patch
diff --git a/features/yaffs2/yaffs-replace-IS_ERR-with-IS_ERR_OR_NULL-to-check-bo.patch b/features/yaffs2/yaffs-replace-IS_ERR-with-IS_ERR_OR_NULL-to-check-bo.patch
new file mode 100644
index 000000000..e0022e555
--- /dev/null
+++ b/features/yaffs2/yaffs-replace-IS_ERR-with-IS_ERR_OR_NULL-to-check-bo.patch
@@ -0,0 +1,49 @@
+From a8f317c1a17e3cab01708912f09c5e8fbc3702dc Mon Sep 17 00:00:00 2001
+From: Meng Li <Meng.Li@windriver.com>
+Date: Thu, 21 Oct 2021 09:27:20 +0800
+Subject: [PATCH] yaffs: replace IS_ERR with IS_ERR_OR_NULL to check both ERR
+ and NULL
+
+When run below command to mount a yaffs2 FS to nor flash, there
+is kernel panic as below:
+Unable to handle kernel NULL pointer dereference at virtual address 0000000000000020
+......
+Internal error: Oops: 96000004 [#1] PREEMPT SMP
+Modules linked in:
+CPU: 1 PID: 335 Comm: mount Not tainted 5.10.73-yocto-standard #1
+......
+Call trace:
+ yaffs_internal_read_super.constprop.0+0x24c/0x6fc
+ yaffs2_internal_read_super_mtd+0x28/0x40
+ mount_bdev+0x1cc/0x200
+ ......
+ el0_sync_handler+0x1a4/0x1b0
+ el0_sync+0x180/0x1c0
+Because in function yaffs_get_mtd_device(), it check the type of
+mtd device. If it is not NAND flash, NULL will be returned. This
+causes kernel panic if the ret value is not checked whether it
+is NULL or not. So, replace IS_ERR with IS_ERR_OR_NULL to check
+both ERR and NULL.
+
+Signed-off-by: Meng Li <Meng.Li@windriver.com>
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+---
+ fs/yaffs2/yaffs_vfs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c
+index a9cf8edc2245..eeb1b480d70e 100644
+--- a/fs/yaffs2/yaffs_vfs.c
++++ b/fs/yaffs2/yaffs_vfs.c
+@@ -2964,7 +2964,7 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version,
+
+
+ mtd = yaffs_get_mtd_device(sb->s_dev);
+- if (IS_ERR(mtd)) {
++ if (IS_ERR_OR_NULL(mtd)) {
+ return NULL;
+ }
+
+--
+2.19.1
+
diff --git a/features/yaffs2/yaffs2.scc b/features/yaffs2/yaffs2.scc
index a558a3db5..be1247ffa 100644
--- a/features/yaffs2/yaffs2.scc
+++ b/features/yaffs2/yaffs2.scc
@@ -13,3 +13,4 @@ patch yaffs2-v5.6-build-fixups.patch
patch yaffs-fix-misplaced-variable-declaration.patch
patch yaffs-include-blkdev.h.patch
patch yaffs-fix-Wstringop-overread-compile-warning-in-yaff.patch
+patch yaffs-replace-IS_ERR-with-IS_ERR_OR_NULL-to-check-bo.patch
--
GitLab
From fbb347d70e276b87d65ff41593228e8c918f8460 Mon Sep 17 00:00:00 2001
From: Xiaolei Wang <xiaolei.wang@windriver.com>
Date: Thu, 21 Oct 2021 20:32:32 +0800
Subject: [PATCH 031/146] nxp-imx8: disable TRANSPARENT_HUGEPAGE and
CONFIG_LEDS_TRIGGER_CPU
Fix a warning 'CONFIG_TRANSPARENT_HUGEPAGE' last
val (y) and .config val (n) do not match and
'CONFIG_LEDS_TRIGGER_CPU' last val (y) and .config
val (n) do not match, TRANSPARENT_HUGEPAGE and
CONFIG_LEDS_TRIGGER_CPU are prohibited in preempt-rt kernel.
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-imx8/nxp-imx8-preempt-rt.cfg | 15 +++++++++++++++
bsp/nxp-imx8/nxp-imx8-preempt-rt.scc | 2 ++
2 files changed, 17 insertions(+)
create mode 100644 bsp/nxp-imx8/nxp-imx8-preempt-rt.cfg
diff --git a/bsp/nxp-imx8/nxp-imx8-preempt-rt.cfg b/bsp/nxp-imx8/nxp-imx8-preempt-rt.cfg
new file mode 100644
index 000000000..780e974a4
--- /dev/null
+++ b/bsp/nxp-imx8/nxp-imx8-preempt-rt.cfg
@@ -0,0 +1,15 @@
+..........................................................................
+. WARNING
+.
+. This file is a kernel configuration fragment, and not a full kernel
+. configuration file. The final kernel configuration is made up of
+. an assembly of processed fragments, each of which is designed to
+. capture a specific part of the final configuration (e.g. platform
+. configuration, feature configuration, and board specific hardware
+. configuration). For more information on kernel configuration, please
+. consult the product documentation.
+.
+..........................................................................
+
+# CONFIG_TRANSPARENT_HUGEPAGE is not set
+# CONFIG_LEDS_TRIGGER_CPU is not set
diff --git a/bsp/nxp-imx8/nxp-imx8-preempt-rt.scc b/bsp/nxp-imx8/nxp-imx8-preempt-rt.scc
index 79fa27cb3..677790ee9 100644
--- a/bsp/nxp-imx8/nxp-imx8-preempt-rt.scc
+++ b/bsp/nxp-imx8/nxp-imx8-preempt-rt.scc
@@ -6,3 +6,5 @@ include ktypes/preempt-rt
branch nxp-imx8
include nxp-imx8.scc
+
+kconf hardware nxp-imx8-preempt-rt.cfg
--
GitLab
From 9ff1e75562075e35b5c8649b0a1aece50d8531b7 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Tue, 26 Oct 2021 14:20:31 -0400
Subject: [PATCH 032/146] kver: bumping to v5.10.75
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index f6a0e2671..a7dc1fdac 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.74
+v5.10.75
--
GitLab
From e1979ceb171bc91ef2cb71cfcde548a101dab687 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Thu, 28 Oct 2021 21:39:28 -0400
Subject: [PATCH 033/146] kver: bumping to v5.10.76
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index a7dc1fdac..9ec375014 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.75
+v5.10.76
--
GitLab
From 257ed971bc7fd76ccb27f622df1ef6412f6b340d Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Thu, 4 Nov 2021 16:28:32 -0400
Subject: [PATCH 034/146] kver: bumping to v5.10.77
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index 9ec375014..43d74c2d0 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.76
+v5.10.77
--
GitLab
From fac878adee6222a7af8b3b60b253f8ba0d5a28a1 Mon Sep 17 00:00:00 2001
From: Meng Li <Meng.Li@windriver.com>
Date: Sat, 6 Nov 2021 14:21:19 +0800
Subject: [PATCH 035/146] intel-socfpga: add preempt-rt support for stratix10
platform
Create a scc file to support preempt-rt kernel on stratix10 platform.
Signed-off-by: Meng Li <Meng.Li@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/intel-socfpga/intel-socfpga-64-preempt-rt.scc | 8 ++++++++
1 file changed, 8 insertions(+)
create mode 100644 bsp/intel-socfpga/intel-socfpga-64-preempt-rt.scc
diff --git a/bsp/intel-socfpga/intel-socfpga-64-preempt-rt.scc b/bsp/intel-socfpga/intel-socfpga-64-preempt-rt.scc
new file mode 100644
index 000000000..4814ac8c6
--- /dev/null
+++ b/bsp/intel-socfpga/intel-socfpga-64-preempt-rt.scc
@@ -0,0 +1,8 @@
+define KMACHINE intel-socfpga-64
+define KTYPE preempt-rt
+define KARCH arm64
+
+include ktypes/preempt-rt
+branch intel-socfpga-64
+
+include intel-socfpga-64.scc
--
GitLab
From a0238f7f4f2222d08bb18147bb5e24cc877b0546 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Tue, 9 Nov 2021 11:40:34 -0500
Subject: [PATCH 036/146] kver: bumping to v5.10.78
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index 43d74c2d0..efd21df5d 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.77
+v5.10.78
--
GitLab
From d905215c391c9011a790d337be3c27393181cb6a Mon Sep 17 00:00:00 2001
From: Meng Li <Meng.Li@windriver.com>
Date: Mon, 8 Nov 2021 21:02:50 +0800
Subject: [PATCH 037/146] marvell-cn106xx: update kernel config to match with
latest sdk
- replace CONFIG_CRYPTO_DEV_CN10K_CPT with
CONFIG_CRYPTO_DEV_OCTEONTX2_CPT, because cn10k folder has
been removed, and octeontx2 common driver is being used for both
cn10k and octeontx2 platform.
- remove CONFIG_MMC_SDHCI_CADENCE_WORKAROUND, because
this workaround is not necessary any more.
Signed-off-by: Meng Li <Meng.Li@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/marvell-cn106xx/marvell-cn106xx.cfg | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/bsp/marvell-cn106xx/marvell-cn106xx.cfg b/bsp/marvell-cn106xx/marvell-cn106xx.cfg
index 36b8d049a..33ef20456 100644
--- a/bsp/marvell-cn106xx/marvell-cn106xx.cfg
+++ b/bsp/marvell-cn106xx/marvell-cn106xx.cfg
@@ -69,7 +69,6 @@ CONFIG_MMC_CAVIUM_THUNDERX=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_PLTFM=y
CONFIG_MMC_SDHCI_CADENCE=y
-CONFIG_MMC_SDHCI_CADENCE_WORKAROUND=y
# GPIO
CONFIG_GPIOLIB=y
@@ -123,7 +122,7 @@ CONFIG_CPU_FREQ=y
CONFIG_ARM_SCMI_CPUFREQ=y
# CRYPT
-CONFIG_CRYPTO_DEV_CN10K_CPT=y
+CONFIG_CRYPTO_DEV_OCTEONTX2_CPT=y
# NPA
CONFIG_OCTEONTX2_NPA_PF=y
--
GitLab
From 8cfe4c586fe824553ecaaad0283c4ecdabeb6817 Mon Sep 17 00:00:00 2001
From: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Date: Tue, 9 Nov 2021 17:33:19 +0800
Subject: [PATCH 038/146] marvell-cn96xx: Add CoreSight support
CoreSight code has been integrated to our kernel. It's time to enable
related configuration.
Signed-off-by: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/marvell-cn96xx/marvell-cn96xx.cfg | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/bsp/marvell-cn96xx/marvell-cn96xx.cfg b/bsp/marvell-cn96xx/marvell-cn96xx.cfg
index 522f81e2f..fcb9d5f8a 100644
--- a/bsp/marvell-cn96xx/marvell-cn96xx.cfg
+++ b/bsp/marvell-cn96xx/marvell-cn96xx.cfg
@@ -126,3 +126,15 @@ CONFIG_ARM_SCMI_CPUFREQ=y
# GHES
CONFIG_ACPI=y
CONFIG_OCTEONTX2_SDEI_GHES=y
+
+# CORESIGHT
+CONFIG_CORESIGHT=y
+CONFIG_CORESIGHT_LINKS_AND_SINKS=y
+CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y
+CONFIG_CORESIGHT_CATU=y
+CONFIG_CORESIGHT_SINK_TPIU=y
+CONFIG_CORESIGHT_SINK_ETBV10=y
+CONFIG_CORESIGHT_SOURCE_ETM4X=y
+CONFIG_CORESIGHT_CPU_DEBUG=y
+CONFIG_CORESIGHT_CTI=y
+CONFIG_CORESIGHT_CTI_INTEGRATION_REGS=y
--
GitLab
From e8352e8546d52a7e44e1027ff14a3c44f8718093 Mon Sep 17 00:00:00 2001
From: Zhantao Tang <zhantao.tang@windriver.com>
Date: Wed, 10 Nov 2021 13:12:58 +0800
Subject: [PATCH 039/146] nxp-s32g2xx: drop the CRYPTO_DEV_NXP_HSE_UIO config
The CRYPTO_DEV_NXP_HSE_UIO has been dropped in the driver's Kconfig,
so delete in kernel cache to fix the following build warning:
[INFO]: the following symbols were not found in the active configuration:
- CONFIG_CRYPTO_DEV_NXP_HSE_UIO
Signed-off-by: Zhantao Tang <zhantao.tang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-s32g2xx/nxp-s32g2xx.cfg | 1 -
1 file changed, 1 deletion(-)
diff --git a/bsp/nxp-s32g2xx/nxp-s32g2xx.cfg b/bsp/nxp-s32g2xx/nxp-s32g2xx.cfg
index 758953386..920143cd7 100644
--- a/bsp/nxp-s32g2xx/nxp-s32g2xx.cfg
+++ b/bsp/nxp-s32g2xx/nxp-s32g2xx.cfg
@@ -156,7 +156,6 @@ CONFIG_REGULATOR=y
#HSE UIO
CONFIG_UIO=y
CONFIG_CRYPTO_DEV_NXP_HSE=y
-CONFIG_CRYPTO_DEV_NXP_HSE_UIO=y
#RANDOM
CONFIG_HW_RANDOM=y
--
GitLab
From fd252bedcdc2e4fa8e222d43aa4cec3f57206dfb Mon Sep 17 00:00:00 2001
From: Xiaolei Wang <xiaolei.wang@windriver.com>
Date: Mon, 15 Nov 2021 15:16:59 +0800
Subject: [PATCH 040/146] nxp-imx8: Enable imx8mq clk and pinctrl config
Enable CONFIG_CLK_IMX8MQ and CONFIG_PINCTRL_IMX8MQ
for support imx8mq board, because many drivers rely on pinctrl.
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-imx8/nxp-imx8.cfg | 2 ++
1 file changed, 2 insertions(+)
diff --git a/bsp/nxp-imx8/nxp-imx8.cfg b/bsp/nxp-imx8/nxp-imx8.cfg
index 6dc0f1532..78bfd22a3 100644
--- a/bsp/nxp-imx8/nxp-imx8.cfg
+++ b/bsp/nxp-imx8/nxp-imx8.cfg
@@ -3,6 +3,7 @@ CONFIG_ARCH_MXC=y
CONFIG_ARM64_VA_BITS_48=y
CONFIG_SCHED_MC=y
CONFIG_CLK_IMX8QXP=y
+CONFIG_CLK_IMX8MQ=y
CONFIG_MXC_CLK=y
#
@@ -143,6 +144,7 @@ CONFIG_INPUT_ISL29023=y
#
CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX8QM=y
+CONFIG_PINCTRL_IMX8MQ=y
CONFIG_GPIOLIB=y
CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_DWAPB=y
--
GitLab
From 1a4cd99824c919ba17dc62935532f3748ef18469 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Mon, 15 Nov 2021 22:58:14 -0500
Subject: [PATCH 041/146] kver: bumping to v5.10.79
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index efd21df5d..e7bf595db 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.78
+v5.10.79
--
GitLab
From 7bc21f3a9f3fa42a4caaddb17183f7494994d3c0 Mon Sep 17 00:00:00 2001
From: Xiaolei Wang <xiaolei.wang@windriver.com>
Date: Wed, 17 Nov 2021 09:41:44 +0800
Subject: [PATCH 042/146] nxp-imx8: Enable CONFIG_IMX_REMOTEPROC config
We have observed that the testcase is hang when doing the CPU
hotplug validation. This issue is disappeared when the m4
powerdomain is active (The side effect of enabling the IMX
remoteproc driver). We are not sure if this is an ATF issue
or hardware issue and since this kernel option is also enabled
in the SDK kernel, so we enable it by default to workaround
this issue.
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-imx8/nxp-imx8.cfg | 1 +
bsp/nxp-imx8/nxp-imx8.scc | 1 +
2 files changed, 2 insertions(+)
diff --git a/bsp/nxp-imx8/nxp-imx8.cfg b/bsp/nxp-imx8/nxp-imx8.cfg
index 78bfd22a3..41bf75958 100644
--- a/bsp/nxp-imx8/nxp-imx8.cfg
+++ b/bsp/nxp-imx8/nxp-imx8.cfg
@@ -463,6 +463,7 @@ CONFIG_RPMSG_VIRTIO=y
CONFIG_HAVE_IMX_RPMSG=y
CONFIG_IMX_RPMSG_PINGPONG=m
CONFIG_IMX_RPMSG_TTY=m
+CONFIG_IMX_REMOTEPROC=y
#
## Misc
diff --git a/bsp/nxp-imx8/nxp-imx8.scc b/bsp/nxp-imx8/nxp-imx8.scc
index 5ab69a06a..b3454fbf3 100644
--- a/bsp/nxp-imx8/nxp-imx8.scc
+++ b/bsp/nxp-imx8/nxp-imx8.scc
@@ -1,4 +1,5 @@
# Core arm configuation settings
+include cfg/remoteproc.cfg
kconf hardware nxp-imx8.cfg
include features/profiling/profiling.scc
--
GitLab
From d17e9fb4594c7ff90f9f47463fc439a58e9530fe Mon Sep 17 00:00:00 2001
From: Xiaolei Wang <xiaolei.wang@windriver.com>
Date: Wed, 17 Nov 2021 09:41:43 +0800
Subject: [PATCH 043/146] cfg/remoteproc: Modify REMOTEPROC from'M' to'Y'
The REMOTEPROC has been changed to bool type by
commit 6334150e9a36 ("remoteproc: don't allow modular
build"), so we should set it to "Y" instead of "M".
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
cfg/remoteproc.cfg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cfg/remoteproc.cfg b/cfg/remoteproc.cfg
index b4f13fd7b..dacb8505d 100644
--- a/cfg/remoteproc.cfg
+++ b/cfg/remoteproc.cfg
@@ -1,3 +1,3 @@
# SPDX-License-Identifier: MIT
-CONFIG_REMOTEPROC=m
+CONFIG_REMOTEPROC=y
CONFIG_WKUP_M3_RPROC=m
--
GitLab
From dff07355f48e576f1747d52d5befba6d770254c4 Mon Sep 17 00:00:00 2001
From: Xiaolei Wang <xiaolei.wang@windriver.com>
Date: Wed, 24 Nov 2021 10:24:14 +0800
Subject: [PATCH 044/146] nxp-imx8: Enable RESET_IMX7 and MUX_MMIO for imx8mq
display
Imx8mq mipi_dsi controller mipi_dsi controller requires
RESET_IMX7 and MUX_MMIO
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-imx8/nxp-imx8.cfg | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/bsp/nxp-imx8/nxp-imx8.cfg b/bsp/nxp-imx8/nxp-imx8.cfg
index 41bf75958..6f204246c 100644
--- a/bsp/nxp-imx8/nxp-imx8.cfg
+++ b/bsp/nxp-imx8/nxp-imx8.cfg
@@ -371,6 +371,15 @@ CONFIG_PHY_MIXEL_MIPI_DPHY=y
CONFIG_PHY_QCOM_USB_HS=y
CONFIG_VIDEO_OV5640=y
+#
+# Multiplexer drivers
+#
+CONFIG_MUX_MMIO=y
+
+#
+# reset
+#
+CONFIG_RESET_IMX7=y
#
## Network options
--
GitLab
From e2f792a996eb4ace257b7dd12d3890ce504741c3 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Tue, 30 Nov 2021 21:24:45 -0500
Subject: [PATCH 045/146] kver: bumping to v5.10.82
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index e7bf595db..32442c5cd 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.79
+v5.10.82
--
GitLab
From 4a01072a90de74c71dc3357bc34e28a06fc8bf57 Mon Sep 17 00:00:00 2001
From: Quanyang Wang <quanyang.wang@windriver.com>
Date: Thu, 25 Nov 2021 20:03:45 +0800
Subject: [PATCH 046/146] xilinx-zynqmp: add preempt-rt support
Add xilinx-zynqmp-preempt-rt.scc to enable preempt-rt for xilinx-zynqmp.
Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/xilinx-zynqmp/xilinx-zynqmp-preempt-rt.scc | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 bsp/xilinx-zynqmp/xilinx-zynqmp-preempt-rt.scc
diff --git a/bsp/xilinx-zynqmp/xilinx-zynqmp-preempt-rt.scc b/bsp/xilinx-zynqmp/xilinx-zynqmp-preempt-rt.scc
new file mode 100644
index 000000000..b6b42972f
--- /dev/null
+++ b/bsp/xilinx-zynqmp/xilinx-zynqmp-preempt-rt.scc
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: MIT
+define KMACHINE xilinx-zynqmp
+define KTYPE preempt-rt
+define KARCH arm64
+
+include ktypes/preempt-rt
+branch xilinx-zynqmp
+
+include xilinx-zynqmp.scc
--
GitLab
From 64fb693a6c11f21bab3ff9bb8dcb65a70abe05e3 Mon Sep 17 00:00:00 2001
From: Quanyang Wang <quanyang.wang@windriver.com>
Date: Thu, 25 Nov 2021 20:03:46 +0800
Subject: [PATCH 047/146] xilinx-zynqmp: disable CONFIG_ARM_CCI_PMU for
preempt-rt
CONFIG_ARM_CCI_PMU depends on PERF_EVENTS which is not enabled for
preempt-rt, so the building warning as below can be caught:
[NOTE]: 'CONFIG_ARM_CCI_PMU' last val (y) and .config val (n) do not match
[INFO]: CONFIG_ARM_CCI_PMU : n
[INFO]: raw config text:
config ARM_CCI_PMU
tristate "ARM CCI PMU driver"
select ARM_CCI
depends on ((ARM && CPU_V7) || ARM64) && PERF_EVENTS
help
Support for PMU events monitoring on the ARM CCI (Cache Coherent
Interconnect) family of products.
If compiled as a module, it will be called arm-cci.
Config 'ARM_CCI_PMU' has the following Direct dependencies (ARM_CCI_PMU=n):
(ARM(undefined/n) && CPU_V7(undefined/n)) || ARM64(=y) (=y) && PERF_EVENTS(=n)
Parent dependencies are:
PERF_EVENTS [n] CPU_V7 [CPU_V7] ARM64 [y] ARM [ARM]
[INFO]: config 'CONFIG_ARM_CCI_PMU' was set, but it wasn't assignable, check (parent) dependencies
Disable CONFIG_ARM_CCI_PMU to fix this.
Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/xilinx-zynqmp/xilinx-zynqmp-preempt-rt.cfg | 3 +++
bsp/xilinx-zynqmp/xilinx-zynqmp-preempt-rt.scc | 2 ++
2 files changed, 5 insertions(+)
create mode 100644 bsp/xilinx-zynqmp/xilinx-zynqmp-preempt-rt.cfg
diff --git a/bsp/xilinx-zynqmp/xilinx-zynqmp-preempt-rt.cfg b/bsp/xilinx-zynqmp/xilinx-zynqmp-preempt-rt.cfg
new file mode 100644
index 000000000..af791ac98
--- /dev/null
+++ b/bsp/xilinx-zynqmp/xilinx-zynqmp-preempt-rt.cfg
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: MIT
+
+# CONFIG_ARM_CCI_PMU is not set
diff --git a/bsp/xilinx-zynqmp/xilinx-zynqmp-preempt-rt.scc b/bsp/xilinx-zynqmp/xilinx-zynqmp-preempt-rt.scc
index b6b42972f..6efecd974 100644
--- a/bsp/xilinx-zynqmp/xilinx-zynqmp-preempt-rt.scc
+++ b/bsp/xilinx-zynqmp/xilinx-zynqmp-preempt-rt.scc
@@ -7,3 +7,5 @@ include ktypes/preempt-rt
branch xilinx-zynqmp
include xilinx-zynqmp.scc
+
+kconf hardware xilinx-zynqmp-preempt-rt.cfg
--
GitLab
From 413b7202686fc4f2c88aa4915547bc184b267422 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Wed, 8 Dec 2021 16:27:37 -0500
Subject: [PATCH 048/146] kver: bumping to v5.10.83
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index 32442c5cd..eb069e70f 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.82
+v5.10.83
--
GitLab
From 5bdb3bf9619c5f2b928fc784aa0082d399d83fbb Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Wed, 8 Dec 2021 16:31:34 -0500
Subject: [PATCH 049/146] kver: bumping to v5.10.84
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index eb069e70f..8502f5fb8 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.83
+v5.10.84
--
GitLab
From 2672389bca7481501a9f8e192e0dea9e605a0e67 Mon Sep 17 00:00:00 2001
From: He Zhe <zhe.he@windriver.com>
Date: Mon, 13 Dec 2021 17:22:19 +0800
Subject: [PATCH 050/146] intel-x86: preempt-rt: Disable CONFIG_NUMA_BALANCING
CONFIG_NUMA_BALANCING has been set to depend on !PREEMPT_RT according to
https://git.yoctoproject.org/linux-yocto/commit/?h=v5.10/standard/preempt-rt/base&id=53ecacfc9c6861e44f4e0a3754f038224aa7fb23
and thus causes the following warnings on all preempt branches.
[NOTE]: 'CONFIG_NUMA_BALANCING' last val (y) and .config val (n) do not match
[NOTE]: 'CONFIG_NUMA_BALANCING_DEFAULT_ENABLED' last val (y) and .config val (n) do not match
Signed-off-by: He Zhe <zhe.he@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/intel-x86/intel-x86-64-preempt-rt.scc | 1 +
intel-x86-64-preempt-rt.cfg | 4 ++++
2 files changed, 5 insertions(+)
create mode 100644 intel-x86-64-preempt-rt.cfg
diff --git a/bsp/intel-x86/intel-x86-64-preempt-rt.scc b/bsp/intel-x86/intel-x86-64-preempt-rt.scc
index bd31121b8..197b50645 100644
--- a/bsp/intel-x86/intel-x86-64-preempt-rt.scc
+++ b/bsp/intel-x86/intel-x86-64-preempt-rt.scc
@@ -8,3 +8,4 @@ include ktypes/preempt-rt
include intel-x86-64.scc
include features/tsn/tsn.scc
kconf hardware cfs-bandwidth.cfg
+kconf hardware intel-x86-64-preempt-rt.cfg
diff --git a/intel-x86-64-preempt-rt.cfg b/intel-x86-64-preempt-rt.cfg
new file mode 100644
index 000000000..9880d740d
--- /dev/null
+++ b/intel-x86-64-preempt-rt.cfg
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: MIT
+
+# CONFIG_NUMA_BALANCING is not set
+# CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set
--
GitLab
From be7b73b2c0e453724d18520ae165b5d474735578 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Tue, 14 Dec 2021 11:46:04 -0500
Subject: [PATCH 051/146] kver: bumping to v5.10.85
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index 8502f5fb8..a047bebe9 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.84
+v5.10.85
--
GitLab
From 66e5d4d7cc636704a3b0b79972d8c78ebac6270c Mon Sep 17 00:00:00 2001
From: Xiaolei Wang <xiaolei.wang@windriver.com>
Date: Wed, 15 Dec 2021 13:56:50 +0800
Subject: [PATCH 052/146] nxp-imx8: Enable thermal and audio related config for
imx8mq
Enable CONFIG_QORIQ_THERMAL, CONFIG_SND_SOC_HDMI_CODEC,
CONFIG_SND_SOC_IMX_CDNHDMI, CONFIG_SND_SOC_WM8524 config for imx8mq
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-imx8/nxp-imx8.cfg | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/bsp/nxp-imx8/nxp-imx8.cfg b/bsp/nxp-imx8/nxp-imx8.cfg
index 6f204246c..580e7b5ab 100644
--- a/bsp/nxp-imx8/nxp-imx8.cfg
+++ b/bsp/nxp-imx8/nxp-imx8.cfg
@@ -256,6 +256,7 @@ CONFIG_THERMAL_EMULATION=y
CONFIG_IMX_SC_THERMAL=y
CONFIG_DEVICE_THERMAL=y
CONFIG_IMX8MM_THERMAL=y
+CONFIG_QORIQ_THERMAL=y
#
## Watchdog Device Drivers
@@ -408,6 +409,9 @@ CONFIG_SND_SOC_IMX_AUDMIX=y
CONFIG_SND_SIMPLE_CARD=y
CONFIG_SND_SOC_FSL_ASOC_CARD=y
CONFIG_SND_SOC_WM8960=y
+CONFIG_SND_SOC_HDMI_CODEC=y
+CONFIG_SND_SOC_IMX_CDNHDMI=y
+CONFIG_SND_SOC_WM8524=y
#
## LED Driver
--
GitLab
From 1b5a52522601fc2f9cc091c9a4fee88ea007e9c0 Mon Sep 17 00:00:00 2001
From: Xiaolei Wang <xiaolei.wang@windriver.com>
Date: Tue, 14 Dec 2021 07:36:08 +0800
Subject: [PATCH 053/146] nxp-imx8: Enable CONFIG_USB_DWC3 config for imx8mq
USB
Imx8mq requires CONFIG_USB_DWC3 config for USB feature.
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-imx8/nxp-imx8.cfg | 1 +
1 file changed, 1 insertion(+)
diff --git a/bsp/nxp-imx8/nxp-imx8.cfg b/bsp/nxp-imx8/nxp-imx8.cfg
index 580e7b5ab..aafe0bc04 100644
--- a/bsp/nxp-imx8/nxp-imx8.cfg
+++ b/bsp/nxp-imx8/nxp-imx8.cfg
@@ -72,6 +72,7 @@ CONFIG_USB_CHIPIDEA=y
CONFIG_USB_CHIPIDEA_UDC=y
CONFIG_USB_CHIPIDEA_HOST=y
CONFIG_PHY_CADENCE_SALVO=y
+CONFIG_USB_DWC3=y
#
## Random Number Generation
--
GitLab
From 1ab943530f4016a9ee7bd8fc3d10acf702c23c44 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Sun, 19 Dec 2021 22:19:58 -0500
Subject: [PATCH 054/146] kver: bumping to v5.10.87
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index a047bebe9..ff9b7fa8b 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.85
+v5.10.87
--
GitLab
From af4414156d8b9e3a8fb1b5086ef689ca0fd00c58 Mon Sep 17 00:00:00 2001
From: Quanyang Wang <quanyang.wang@windriver.com>
Date: Tue, 21 Dec 2021 17:15:58 +0800
Subject: [PATCH 055/146] xilinx-zynqmp: add event device support for zynqmp
Since graphic system use /dev/input/eventX as input device, we need
enable CONFIG_INPUT_EVDEV kernel option.
Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/xilinx-zynqmp/xilinx-zynqmp.cfg | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/bsp/xilinx-zynqmp/xilinx-zynqmp.cfg b/bsp/xilinx-zynqmp/xilinx-zynqmp.cfg
index 6005eaeb0..d4a186893 100644
--- a/bsp/xilinx-zynqmp/xilinx-zynqmp.cfg
+++ b/bsp/xilinx-zynqmp/xilinx-zynqmp.cfg
@@ -91,6 +91,10 @@ CONFIG_USB_OTG_FSM=m
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_XILINX=y
+CONFIG_INPUT=y
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_EVDEV=y
+
CONFIG_MMC=y
CONFIG_MMC_BLOCK=y
CONFIG_MMC_SDHCI=y
--
GitLab
From 38b4f2e3bc974717352e8bc5491664e47542d237 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Thu, 30 Dec 2021 10:53:46 -0500
Subject: [PATCH 056/146] kver: bumping to v5.10.89
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index ff9b7fa8b..126855799 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.87
+v5.10.89
--
GitLab
From 9214e51282733cacc1d88b664df1e23252d1d69a Mon Sep 17 00:00:00 2001
From: Xulin Sun <xulin.sun@windriver.com>
Date: Fri, 31 Dec 2021 10:21:18 +0800
Subject: [PATCH 057/146] ti-j72xx: add video decoder and encoder support
J721E on TI SDK 8.1 adds Video Decoder (DECODER) based on D5520MP2
and Video Encoder (ENCODER) based on VXE384MP2, here the related kernel
configurations are added.
Signed-off-by: Xulin Sun <xulin.sun@windriver.com>
---
bsp/ti-j72xx/ti-j72xx.cfg | 2 ++
1 file changed, 2 insertions(+)
diff --git a/bsp/ti-j72xx/ti-j72xx.cfg b/bsp/ti-j72xx/ti-j72xx.cfg
index ce5f2a5e1..7a742ec41 100755
--- a/bsp/ti-j72xx/ti-j72xx.cfg
+++ b/bsp/ti-j72xx/ti-j72xx.cfg
@@ -345,6 +345,8 @@ CONFIG_VIDEO_TI_J721E_CSI2RX=m
CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_V4L2_SUBDEV_API=y
CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_IMG_VXE_ENC=m
+CONFIG_VIDEO_IMG_VXD_DEC=m
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
--
GitLab
From fdabd97ceceb2e3e74a132332c875f68b47b755b Mon Sep 17 00:00:00 2001
From: Ovidiu Panait <ovidiu.panait@windriver.com>
Date: Sun, 2 Jan 2022 16:47:24 +0200
Subject: [PATCH 058/146] cfg/debug: add kcov kernel configs
KCOV exposes kernel code coverage information in a form suitable for
coverage-guided fuzzing. This debug feature can be enabled to add support for
kernel fuzzing (with tools such as syzkaller).
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
---
cfg/debug/kcov/debug-kcov.cfg | 4 ++++
cfg/debug/kcov/debug-kcov.scc | 5 +++++
2 files changed, 9 insertions(+)
create mode 100644 cfg/debug/kcov/debug-kcov.cfg
create mode 100644 cfg/debug/kcov/debug-kcov.scc
diff --git a/cfg/debug/kcov/debug-kcov.cfg b/cfg/debug/kcov/debug-kcov.cfg
new file mode 100644
index 000000000..9cdd37ce1
--- /dev/null
+++ b/cfg/debug/kcov/debug-kcov.cfg
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: MIT
+CONFIG_KCOV=y
+CONFIG_KCOV_ENABLE_COMPARISONS=y
+CONFIG_KCOV_INSTRUMENT_ALL=y
diff --git a/cfg/debug/kcov/debug-kcov.scc b/cfg/debug/kcov/debug-kcov.scc
new file mode 100644
index 000000000..325c6f999
--- /dev/null
+++ b/cfg/debug/kcov/debug-kcov.scc
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: MIT
+define KFEATURE_DESCRIPTION "Enable kernel code coverage support"
+define KFEATURE_COMPATIBILITY all
+
+kconf non-hardware debug-kcov.cfg
--
GitLab
From 65d66ac9789372923b42be0683a87955e52705a5 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Thu, 6 Jan 2022 11:51:27 -0500
Subject: [PATCH 059/146] kver: bumping to v5.10.90
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index 126855799..454523f0d 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.89
+v5.10.90
--
GitLab
From 30501fc0e40751cb1563a1b02bea95db2fa0b2ad Mon Sep 17 00:00:00 2001
From: Xiaolei Wang <xiaolei.wang@windriver.com>
Date: Wed, 5 Jan 2022 14:04:46 +0800
Subject: [PATCH 060/146] nxp-imx6: Enable imx6q machine config
Enable imx6q machine config for imx6qsabresd board
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-imx6/nxp-imx6.cfg | 1 +
1 file changed, 1 insertion(+)
diff --git a/bsp/nxp-imx6/nxp-imx6.cfg b/bsp/nxp-imx6/nxp-imx6.cfg
index 76d7811b4..ed843ca43 100644
--- a/bsp/nxp-imx6/nxp-imx6.cfg
+++ b/bsp/nxp-imx6/nxp-imx6.cfg
@@ -1,5 +1,6 @@
CONFIG_ARCH_MXC=y
CONFIG_SOC_IMX6UL=y
+CONFIG_SOC_IMX6Q=y
CONFIG_FW_LOADER=y
CONFIG_FW_LOADER_USER_HELPER=y
--
GitLab
From 415006b06807f520581a1e830bd026379287de0b Mon Sep 17 00:00:00 2001
From: Xiaolei Wang <xiaolei.wang@windriver.com>
Date: Wed, 5 Jan 2022 14:04:47 +0800
Subject: [PATCH 061/146] nxp-imx6: Enable hdmi and LVDS config
Enable hdmi and LVDS config for HDMI display interface
and LCD expansion
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-imx6/nxp-imx6.cfg | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/bsp/nxp-imx6/nxp-imx6.cfg b/bsp/nxp-imx6/nxp-imx6.cfg
index ed843ca43..f3617331e 100644
--- a/bsp/nxp-imx6/nxp-imx6.cfg
+++ b/bsp/nxp-imx6/nxp-imx6.cfg
@@ -117,6 +117,11 @@ CONFIG_LCD_CLASS_DEVICE=y
CONFIG_LCD_L4F00242T03=y
CONFIG_LCD_PLATFORM=y
CONFIG_BACKLIGHT_PWM=y
+CONFIG_IMX_IPUV3_CORE=y
+CONFIG_DRM_IMX=y
+CONFIG_DRM_IMX_LDB=y
+CONFIG_DRM_MXSFB=y
+CONFIG_DRM_PANEL_SIMPLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
--
GitLab
From cdcc56b4c12f0e870d11bc1e2a346c0bdb5d4810 Mon Sep 17 00:00:00 2001
From: Xiaolei Wang <xiaolei.wang@windriver.com>
Date: Thu, 6 Jan 2022 09:55:17 +0800
Subject: [PATCH 062/146] nxp-imx6: Enable audio related config
Enable audio related config for imx6qsabresd
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-imx6/nxp-imx6.cfg | 3 +++
1 file changed, 3 insertions(+)
diff --git a/bsp/nxp-imx6/nxp-imx6.cfg b/bsp/nxp-imx6/nxp-imx6.cfg
index f3617331e..ee2c7da25 100644
--- a/bsp/nxp-imx6/nxp-imx6.cfg
+++ b/bsp/nxp-imx6/nxp-imx6.cfg
@@ -162,6 +162,9 @@ CONFIG_SND_SOC_FSL_ASRC=y
CONFIG_SND_SOC_FSL_SPDIF=y
CONFIG_SND_SOC_IMX_SPDIF=y
CONFIG_SND_SOC_FSL_ESAI=y
+CONFIG_SND_SOC_WM8962=y
+CONFIG_SND_SOC_FSL_ASOC_CARD=y
+CONFIG_SND_SOC_FSL_SSI=y
CONFIG_ATA=y
CONFIG_AHCI_IMX=y
--
GitLab
From f473c3391b937efdba74c863c5b9d87900197220 Mon Sep 17 00:00:00 2001
From: Xiaolei Wang <xiaolei.wang@windriver.com>
Date: Thu, 6 Jan 2022 09:55:18 +0800
Subject: [PATCH 063/146] nxp-imx6: Enable PCI config
Enable PCI config for imx6
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-imx6/nxp-imx6.cfg | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/bsp/nxp-imx6/nxp-imx6.cfg b/bsp/nxp-imx6/nxp-imx6.cfg
index ee2c7da25..0e67e8022 100644
--- a/bsp/nxp-imx6/nxp-imx6.cfg
+++ b/bsp/nxp-imx6/nxp-imx6.cfg
@@ -148,6 +148,11 @@ CONFIG_MMC_SDHCI_ESDHC_IMX=y
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
+CONFIG_PCI=y
+CONFIG_PCI_IMX6=y
+CONFIG_PCI_MSI=y
+CONFIG_PCIEPORTBUS=y
+
CONFIG_RTC_CLASS=y
CONFIG_RTC_INTF_DEV_UIE_EMUL=y
CONFIG_RTC_DRV_MC13XXX=y
--
GitLab
From 6ae0df8ad491b366371f8c11606bb0cdaa76dffd Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Mon, 27 Dec 2021 12:01:49 +0100
Subject: [PATCH 064/146] preempt-rt.scc: arm should come after ftrace
arm.cfg unsets CONFIG_FUNCTION_GRAPH_TRACER and sets
CONFIG_UNWINDER_ARM; this needs to happen after ftrace,
otherwise this warning occurs in arm(32) builds:
======
[NOTE]: 'CONFIG_UNWINDER_ARM' last val (y) and .config val (n) do not match
[INFO]: CONFIG_UNWINDER_ARM : n
[INFO]: raw config text:
config UNWINDER_ARM
bool "ARM EABI stack unwinder"
select ARM_UNWIND
depends on AEABI && !FUNCTION_GRAPH_TRACER && <choice>
help
This option enables stack unwinding support in the kernel
using the information automatically generated by the
compiler. The resulting kernel image is slightly bigger but
the performance is not affected. Currently, this feature
only works with EABI compilers.
Config 'UNWINDER_ARM' has the following Direct dependencies (UNWINDER_ARM=n):
AEABI(=y) && !FUNCTION_GRAPH_TRACER(=y) (=n) && <choice>
Parent dependencies are:
choice [y] FUNCTION_GRAPH_TRACER [y] AEABI [y]
[INFO]: config 'CONFIG_UNWINDER_ARM' was set, but it wasn't assignable, check (parent) dependencies
======
standard.scc already has this in the correct order.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
ktypes/preempt-rt/preempt-rt.scc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ktypes/preempt-rt/preempt-rt.scc b/ktypes/preempt-rt/preempt-rt.scc
index 0b4104743..1361d466d 100644
--- a/ktypes/preempt-rt/preempt-rt.scc
+++ b/ktypes/preempt-rt/preempt-rt.scc
@@ -4,9 +4,9 @@ branch preempt-rt
# feature block
include features/blktrace/blktrace.scc
-include arch/arm/arm.scc nopatch
include features/hrt/hrt.scc
include features/ftrace/ftrace.scc
+include arch/arm/arm.scc nopatch
include features/cgroups/cgroups.scc
include features/net_sched/net_sched.scc
include features/kprobes/kprobes.scc
--
GitLab
From ad119826536616f28e4309e825b61e16357f4c7e Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Mon, 27 Dec 2021 14:52:54 +0100
Subject: [PATCH 065/146] drivers-zynq.cfg: update CONFIG_NET_CADENCE option
It was renamed in
https://github.com/torvalds/linux/commit/0df5f81c481e383f37f9f97eb014c885898b1773
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/xilinx/soc/drivers-zynq.cfg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bsp/xilinx/soc/drivers-zynq.cfg b/bsp/xilinx/soc/drivers-zynq.cfg
index 560e0cb89..61373be99 100644
--- a/bsp/xilinx/soc/drivers-zynq.cfg
+++ b/bsp/xilinx/soc/drivers-zynq.cfg
@@ -29,7 +29,7 @@ CONFIG_WATCHDOG=y
CONFIG_CADENCE_WATCHDOG=y
# Ethernet
-CONFIG_NET_CADENCE=y
+CONFIG_NET_VENDOR_CADENCE=y
CONFIG_MACB=y
# GPIO
--
GitLab
From 17b7b81554185d7d5b8a341afa6ed519a9ac9fc5 Mon Sep 17 00:00:00 2001
From: Meng Li <Meng.Li@windriver.com>
Date: Wed, 12 Jan 2022 15:23:28 +0800
Subject: [PATCH 066/146] intel-socfpga: enable Intel Agilex platform
Signed-off-by: Meng Li <Meng.Li@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/intel-socfpga/intel-socfpga-64.cfg | 1 +
1 file changed, 1 insertion(+)
diff --git a/bsp/intel-socfpga/intel-socfpga-64.cfg b/bsp/intel-socfpga/intel-socfpga-64.cfg
index 6ea0afa40..6d4a716e2 100644
--- a/bsp/intel-socfpga/intel-socfpga-64.cfg
+++ b/bsp/intel-socfpga/intel-socfpga-64.cfg
@@ -13,6 +13,7 @@
CONFIG_ARM64=y
CONFIG_ARCH_STRATIX10=y
+CONFIG_ARCH_AGILEX=y
# Kernel Features
CONFIG_SMP=y
--
GitLab
From c50415e668c11a79ffd25213686109fb09205acd Mon Sep 17 00:00:00 2001
From: Meng Li <Meng.Li@windriver.com>
Date: Wed, 12 Jan 2022 15:23:29 +0800
Subject: [PATCH 067/146] intel-socfpga: enable jffs2 fs support on
intel-socfpga platform
intel-socfpga platforms need to support for booting from NAND
flash and deploy system on NAND flash. So, enable jffs2 fs support.
Signed-off-by: Meng Li <Meng.Li@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/intel-socfpga/intel-socfpga-64.scc | 1 +
1 file changed, 1 insertion(+)
diff --git a/bsp/intel-socfpga/intel-socfpga-64.scc b/bsp/intel-socfpga/intel-socfpga-64.scc
index d398f474d..172411b83 100644
--- a/bsp/intel-socfpga/intel-socfpga-64.scc
+++ b/bsp/intel-socfpga/intel-socfpga-64.scc
@@ -4,3 +4,4 @@ include cfg/usb-mass-storage.scc
include features/profiling/profiling.scc
# enable the ability to run 32 bit apps
include arch/arm/32bit-compat.scc
+include cfg/fs/flash_fs.scc
--
GitLab
From de35f8006d0f932924752ddda94dd24e2da67fbc Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Wed, 12 Jan 2022 23:08:08 -0500
Subject: [PATCH 068/146] kver: bumping to v5.10.91
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index 454523f0d..a118e3b4c 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.90
+v5.10.91
--
GitLab
From 309f925e5789facf9928c8cfba33110629457df3 Mon Sep 17 00:00:00 2001
From: Xiaolei Wang <xiaolei.wang@windriver.com>
Date: Thu, 13 Jan 2022 16:08:14 +0800
Subject: [PATCH 069/146] nxp-imx6: Enable imx6SX soc config
Enable imx6SX soc config.
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-imx6/nxp-imx6.cfg | 1 +
1 file changed, 1 insertion(+)
diff --git a/bsp/nxp-imx6/nxp-imx6.cfg b/bsp/nxp-imx6/nxp-imx6.cfg
index 0e67e8022..345bef604 100644
--- a/bsp/nxp-imx6/nxp-imx6.cfg
+++ b/bsp/nxp-imx6/nxp-imx6.cfg
@@ -1,6 +1,7 @@
CONFIG_ARCH_MXC=y
CONFIG_SOC_IMX6UL=y
CONFIG_SOC_IMX6Q=y
+CONFIG_SOC_IMX6SX=y
CONFIG_FW_LOADER=y
CONFIG_FW_LOADER_USER_HELPER=y
--
GitLab
From 292958f347c103d79dd17bded67ef9b26c1ef0ab Mon Sep 17 00:00:00 2001
From: Xiaolei Wang <xiaolei.wang@windriver.com>
Date: Thu, 13 Jan 2022 16:08:15 +0800
Subject: [PATCH 070/146] nxp-imx6: Enable imx6ul audio config
Enable asoc card and 8960 codec for imx6ul.
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-imx6/nxp-imx6.cfg | 3 +++
1 file changed, 3 insertions(+)
diff --git a/bsp/nxp-imx6/nxp-imx6.cfg b/bsp/nxp-imx6/nxp-imx6.cfg
index 345bef604..3b7ae059d 100644
--- a/bsp/nxp-imx6/nxp-imx6.cfg
+++ b/bsp/nxp-imx6/nxp-imx6.cfg
@@ -171,6 +171,9 @@ CONFIG_SND_SOC_FSL_ESAI=y
CONFIG_SND_SOC_WM8962=y
CONFIG_SND_SOC_FSL_ASOC_CARD=y
CONFIG_SND_SOC_FSL_SSI=y
+CONFIG_SND_SOC_WM8960=y
+CONFIG_SND_SOC_FSL_SAI=y
+CONFIG_SND_SOC_FSL_ASOC_CARD=y
CONFIG_ATA=y
CONFIG_AHCI_IMX=y
--
GitLab
From 940dd7a24ebe6ad709d6912a24660dadf34ece83 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Mon, 17 Jan 2022 14:46:26 -0500
Subject: [PATCH 071/146] kver: bumping to v5.10.92
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index a118e3b4c..159631583 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.91
+v5.10.92
--
GitLab
From 76d3d88572c5eac779b0b6a66f56568a7f7a5823 Mon Sep 17 00:00:00 2001
From: Xiaolei Wang <xiaolei.wang@windriver.com>
Date: Wed, 19 Jan 2022 08:45:26 +0800
Subject: [PATCH 072/146] Fix a build error undefined reference to
`mbox_send_message'
refer to commit a86473962139a("arm: arch: enable rpmsg for imx amp soc")
imx6sx soc has seleted HAVE_IMX_RPMSG, so enable MAILBOX config
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-imx6/nxp-imx6.cfg | 2 ++
1 file changed, 2 insertions(+)
diff --git a/bsp/nxp-imx6/nxp-imx6.cfg b/bsp/nxp-imx6/nxp-imx6.cfg
index 3b7ae059d..dd92c39a8 100644
--- a/bsp/nxp-imx6/nxp-imx6.cfg
+++ b/bsp/nxp-imx6/nxp-imx6.cfg
@@ -207,3 +207,5 @@ CONFIG_CMA_AREAS=7
CONFIG_GPIO_74X164=y
CONFIG_GPIO_MXC=y
CONFIG_GPIO_PCA953X=y
+
+CONFIG_MAILBOX=y
--
GitLab
From 7df27e6d296dfa16f289883c0661eed45059360c Mon Sep 17 00:00:00 2001
From: Xiaolei Wang <xiaolei.wang@windriver.com>
Date: Wed, 19 Jan 2022 08:45:27 +0800
Subject: [PATCH 073/146] nxp-imx6: Fix a build error undefined reference to
`dw_pcie_read_dbi'
refer to commit 4e9a723c0902("pci: imx: add the imx8qxp ep support")
modify PCI_IMX6 to PCI_IMX6_HOST
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-imx6/nxp-imx6.cfg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bsp/nxp-imx6/nxp-imx6.cfg b/bsp/nxp-imx6/nxp-imx6.cfg
index dd92c39a8..e19395ffc 100644
--- a/bsp/nxp-imx6/nxp-imx6.cfg
+++ b/bsp/nxp-imx6/nxp-imx6.cfg
@@ -150,7 +150,7 @@ CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
CONFIG_PCI=y
-CONFIG_PCI_IMX6=y
+CONFIG_PCI_IMX6_HOST=y
CONFIG_PCI_MSI=y
CONFIG_PCIEPORTBUS=y
--
GitLab
From 8bf0619ce850e1e9fc35d546f715aaf528c5ac7f Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Tue, 25 Jan 2022 09:38:15 -0500
Subject: [PATCH 074/146] kver: bumping to v5.10.93
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index 159631583..0f356300e 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.92
+v5.10.93
--
GitLab
From b3c72478a55f4f8845d2999056d66a503ae61ad2 Mon Sep 17 00:00:00 2001
From: Xulin Sun <xulin.sun@windriver.com>
Date: Fri, 28 Jan 2022 09:16:41 +0800
Subject: [PATCH 075/146] ti-j72xx: add preempt-rt support
Create scc & preempt-rt cfg files to support preempt-rt kernel.
Signed-off-by: Xulin Sun <xulin.sun@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/ti-j72xx/ti-j72xx-preempt-rt.cfg | 15 +++++++++++++++
bsp/ti-j72xx/ti-j72xx-preempt-rt.scc | 10 ++++++++++
2 files changed, 25 insertions(+)
create mode 100644 bsp/ti-j72xx/ti-j72xx-preempt-rt.cfg
create mode 100755 bsp/ti-j72xx/ti-j72xx-preempt-rt.scc
diff --git a/bsp/ti-j72xx/ti-j72xx-preempt-rt.cfg b/bsp/ti-j72xx/ti-j72xx-preempt-rt.cfg
new file mode 100644
index 000000000..5e3915711
--- /dev/null
+++ b/bsp/ti-j72xx/ti-j72xx-preempt-rt.cfg
@@ -0,0 +1,15 @@
+..........................................................................
+. WARNING
+.
+. This file is a kernel configuration fragment, and not a full kernel
+. configuration file. The final kernel configuration is made up of
+. an assembly of processed fragments, each of which is designed to
+. capture a specific part of the final configuration (e.g. platform
+. configuration, feature configuration, and board specific hardware
+. configuration). For more information on kernel configuration, please
+. consult the product documentation.
+.
+..........................................................................
+
+# CONFIG_TRANSPARENT_HUGEPAGE is not set
+# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
diff --git a/bsp/ti-j72xx/ti-j72xx-preempt-rt.scc b/bsp/ti-j72xx/ti-j72xx-preempt-rt.scc
new file mode 100755
index 000000000..9ac678bbf
--- /dev/null
+++ b/bsp/ti-j72xx/ti-j72xx-preempt-rt.scc
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: MIT
+define KMACHINE ti-j72xx
+define KTYPE preempt-rt
+define KARCH arm64
+
+include ktypes/preempt-rt
+branch ti-j72xx
+
+include ti-j72xx.scc
+kconf hardware ti-j72xx-preempt-rt.cfg
--
GitLab
From 39662ca6b688e47bcdcaef96852f9c07b32a0434 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Thu, 3 Feb 2022 10:40:02 -0500
Subject: [PATCH 076/146] kver: bumping to v5.10.96
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index 0f356300e..6fb7074e4 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.93
+v5.10.96
--
GitLab
From 0db3f511b2a553a5ea31ac45249a42f084fc287c Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Thu, 3 Feb 2022 10:40:13 -0500
Subject: [PATCH 077/146] kver: bumping to v5.10.93
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index 6fb7074e4..0f356300e 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.96
+v5.10.93
--
GitLab
From a58f4e7cca3973e04d3f9a40356ef9c2c0bb10a5 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Wed, 9 Feb 2022 17:31:20 -0500
Subject: [PATCH 078/146] kver: bumping to v5.10.99
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index 0f356300e..d2c736cc6 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.93
+v5.10.99
--
GitLab
From f064d53ed9aca7d4206f0721af4d64f2fd41763d Mon Sep 17 00:00:00 2001
From: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Date: Thu, 10 Feb 2022 13:39:26 +0800
Subject: [PATCH 079/146] marvell-cn96xx: support for octeontx2 CCU
Add kernel config for OcteonTX2 Cache Controller Unit (CCU) driver.
This driver supports configuring and monitoring the OcteonTX2 Cache
Controller Unit. The driver provides debugfs files to mask LLC ways
for a single or multiple cpus.
Signed-off-by: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/marvell-cn96xx/marvell-cn96xx.cfg | 3 +++
1 file changed, 3 insertions(+)
diff --git a/bsp/marvell-cn96xx/marvell-cn96xx.cfg b/bsp/marvell-cn96xx/marvell-cn96xx.cfg
index fcb9d5f8a..a4abd19bf 100644
--- a/bsp/marvell-cn96xx/marvell-cn96xx.cfg
+++ b/bsp/marvell-cn96xx/marvell-cn96xx.cfg
@@ -138,3 +138,6 @@ CONFIG_CORESIGHT_SOURCE_ETM4X=y
CONFIG_CORESIGHT_CPU_DEBUG=y
CONFIG_CORESIGHT_CTI=y
CONFIG_CORESIGHT_CTI_INTEGRATION_REGS=y
+
+# OCTEONTX2_CCU
+CONFIG_OCTEONTX2_CCU=y
--
GitLab
From b53e11ea46f4e78ff4cb48532a11e1dbad7939b1 Mon Sep 17 00:00:00 2001
From: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Date: Thu, 10 Feb 2022 13:39:27 +0800
Subject: [PATCH 080/146] marvell-cn106xx: FWLOG support for CN10K
Add supported for firmware log interface. It provides interface to
read firmware boot logs.
Signed-off-by: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/marvell-cn106xx/marvell-cn106xx.cfg | 3 +++
1 file changed, 3 insertions(+)
diff --git a/bsp/marvell-cn106xx/marvell-cn106xx.cfg b/bsp/marvell-cn106xx/marvell-cn106xx.cfg
index 33ef20456..b5982d460 100644
--- a/bsp/marvell-cn106xx/marvell-cn106xx.cfg
+++ b/bsp/marvell-cn106xx/marvell-cn106xx.cfg
@@ -129,3 +129,6 @@ CONFIG_OCTEONTX2_NPA_PF=y
# Unsupported by simulator
# CONFIG_ARM_PMU is not set
+
+# FWLOG
+CONFIG_MARVELL_CN10K_FWLOG=y
--
GitLab
From 0ff754d6a863c6622f34f18f2e0768ced10c0816 Mon Sep 17 00:00:00 2001
From: Xiaolei Wang <xiaolei.wang@windriver.com>
Date: Thu, 17 Feb 2022 09:47:49 +0800
Subject: [PATCH 081/146] nxp-imx6: Enable imx6 camera related configs
According to SDK 5.10, enable imx6 v4l2 related configs
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-imx6/nxp-imx6.cfg | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/bsp/nxp-imx6/nxp-imx6.cfg b/bsp/nxp-imx6/nxp-imx6.cfg
index e19395ffc..6f9094eab 100644
--- a/bsp/nxp-imx6/nxp-imx6.cfg
+++ b/bsp/nxp-imx6/nxp-imx6.cfg
@@ -110,6 +110,17 @@ CONFIG_VIDEO_CODA=y
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_STAGING=y
CONFIG_STAGING_MEDIA=y
+CONFIG_VIDEO_MXC_CAPTURE=m
+CONFIG_VIDEO_MXC_OUTPUT=y
+CONFIG_VIDEO_MXC_CSI_CAMERA=m
+CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=m
+CONFIG_MXC_CAMERA_OV5640=m
+CONFIG_MXC_CAMERA_OV5640_V2=m
+CONFIG_MXC_CAMERA_OV5640_MIPI=m
+CONFIG_MXC_CAMERA_OV5640_MIPI_V2=m
+CONFIG_MXC_MIPI_CSI=m
+CONFIG_MXC_MIPI_CSI2=y
+CONFIG_VIDEO_MXC_PXP_V4L2=y
CONFIG_DRM=y
CONFIG_FB=y
--
GitLab
From 91308d1068287d7a363e7cb7850ef5c385c88e45 Mon Sep 17 00:00:00 2001
From: Xiaolei Wang <xiaolei.wang@windriver.com>
Date: Wed, 16 Feb 2022 11:18:02 +0800
Subject: [PATCH 082/146] nxp-imx6: Update hdmi and LVDS config
Since commit 415006b06807("nxp-imx6: Enable hdmi and LVDS config")
is based on the configs added by the standard base branch, now
imx6 has been switched to standard/nxp-sdk-5.10/nxp-soc, and SDK
5.10 still uses fbdev, so re-update the configs.
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-imx6/nxp-imx6.cfg | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/bsp/nxp-imx6/nxp-imx6.cfg b/bsp/nxp-imx6/nxp-imx6.cfg
index 6f9094eab..7f81accd1 100644
--- a/bsp/nxp-imx6/nxp-imx6.cfg
+++ b/bsp/nxp-imx6/nxp-imx6.cfg
@@ -129,11 +129,12 @@ CONFIG_LCD_CLASS_DEVICE=y
CONFIG_LCD_L4F00242T03=y
CONFIG_LCD_PLATFORM=y
CONFIG_BACKLIGHT_PWM=y
-CONFIG_IMX_IPUV3_CORE=y
-CONFIG_DRM_IMX=y
-CONFIG_DRM_IMX_LDB=y
-CONFIG_DRM_MXSFB=y
-CONFIG_DRM_PANEL_SIMPLE=y
+CONFIG_MXC_IPU=y
+CONFIG_FB_MXC_SYNC_PANEL=y
+CONFIG_FB_MXS=y
+CONFIG_FB_MXC_MIPI_DSI=y
+CONFIG_FB_MXC_LDB=y
+CONFIG_FB_MXC_HDMI=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
--
GitLab
From 7a012dfacdc82bce2279c26af29cf40b5fdbeed2 Mon Sep 17 00:00:00 2001
From: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
Date: Fri, 18 Feb 2022 17:24:15 +0100
Subject: [PATCH 083/146] features/zram: remove CONFIG_ZRAM_DEF_COMP
This is not available in v5.10:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit?id=3d711a382735d2c34d3ba2075a5aa83a894f4a57
Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
features/zram/zram.cfg | 7 -------
1 file changed, 7 deletions(-)
diff --git a/features/zram/zram.cfg b/features/zram/zram.cfg
index 3174ae860..995ed8763 100644
--- a/features/zram/zram.cfg
+++ b/features/zram/zram.cfg
@@ -2,13 +2,6 @@
CONFIG_ZSMALLOC=y
# CONFIG_ZSMALLOC_STAT is not set
CONFIG_ZRAM=y
-CONFIG_ZRAM_DEF_COMP_LZORLE=y
-# CONFIG_ZRAM_DEF_COMP_ZSTD is not set
-# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
-# CONFIG_ZRAM_DEF_COMP_LZO is not set
-# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set
-# CONFIG_ZRAM_DEF_COMP_842 is not set
-CONFIG_ZRAM_DEF_COMP="lzo-rle"
# CONFIG_ZRAM_WRITEBACK is not set
# CONFIG_ZRAM_MEMORY_TRACKING is not set
CONFIG_CRYPTO_LZO=y
--
GitLab
From ff60a2ddb31e54be0f8ac63a28247e58f9c8cd23 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Sun, 20 Feb 2022 23:30:43 -0500
Subject: [PATCH 084/146] kver: bumping to v5.10.101
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index d2c736cc6..54dcd4edb 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.99
+v5.10.101
--
GitLab
From f323785b54712f92ad8cae06e2711a01d66d4fdf Mon Sep 17 00:00:00 2001
From: Xiaolei Wang <xiaolei.wang@windriver.com>
Date: Mon, 21 Feb 2022 13:56:05 +0800
Subject: [PATCH 085/146] nxp-imx6: add preempt-rt config for nxp-imx6
add preempt-rt config for nxp-imx6.
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-imx6/nxp-imx6-preempt-rt.scc | 8 ++++++++
1 file changed, 8 insertions(+)
create mode 100644 bsp/nxp-imx6/nxp-imx6-preempt-rt.scc
diff --git a/bsp/nxp-imx6/nxp-imx6-preempt-rt.scc b/bsp/nxp-imx6/nxp-imx6-preempt-rt.scc
new file mode 100644
index 000000000..0497046a8
--- /dev/null
+++ b/bsp/nxp-imx6/nxp-imx6-preempt-rt.scc
@@ -0,0 +1,8 @@
+define KMACHINE nxp-imx6
+define KTYPE preempt-rt
+define KARCH arm
+
+include ktypes/preempt-rt
+branch nxp-imx6
+
+include nxp-imx6.scc
--
GitLab
From 6a13ec341c9a205030830a81b1e474606c5b4188 Mon Sep 17 00:00:00 2001
From: Xiaolei Wang <xiaolei.wang@windriver.com>
Date: Wed, 2 Mar 2022 11:11:06 +0800
Subject: [PATCH 086/146] nxp-imx6: Enable at8031 config
Refer to upstream commit 63477a5d4c59a("net: phy:
at803x: add MDIX support to AR8031/33"), AR8031 has
been included in at803x.c, so enable at803x config
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-imx6/nxp-imx6.cfg | 1 +
1 file changed, 1 insertion(+)
diff --git a/bsp/nxp-imx6/nxp-imx6.cfg b/bsp/nxp-imx6/nxp-imx6.cfg
index 7f81accd1..aa517af7d 100644
--- a/bsp/nxp-imx6/nxp-imx6.cfg
+++ b/bsp/nxp-imx6/nxp-imx6.cfg
@@ -29,6 +29,7 @@ CONFIG_DMA_OF=y
CONFIG_CFG80211=y
CONFIG_MAC80211=y
+CONFIG_AT803X_PHY=y
CONFIG_CAN=y
CONFIG_CAN_VCAN=y
CONFIG_CAN_FLEXCAN=y
--
GitLab
From 792f1272dd0d68d5dba0ff35949b2094f818227e Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Wed, 2 Mar 2022 16:42:22 -0500
Subject: [PATCH 087/146] kver: bumping to v5.10.103
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index 54dcd4edb..7aedf96ec 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.101
+v5.10.103
--
GitLab
From 6ca1d510a03ef3bd5660323cff2e22afc5bfd600 Mon Sep 17 00:00:00 2001
From: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
Date: Fri, 18 Feb 2022 18:26:34 +0100
Subject: [PATCH 088/146] features/tpm: split into tpm-1.2, tpm-2.0,
tpm-2.0-crb and vtpm feature
Split the tpm feature into individual features as the tpm feature is
only usable on x86 because of its dependencies:
Config 'TCG_NSC' has the following Direct dependencies (TCG_NSC=n):
X86(undefined/n) && TCG_TPM(=y)
Config 'TCG_ATMEL' has the following Direct dependencies (TCG_ATMEL=n):
PPC64(undefined/n) || HAS_IOPORT_MAP(=n) (=n) && TCG_TPM(=y)
Config 'TCG_INFINEON' has the following Direct dependencies (TCG_INFINEON=n):
PNP(=n) && TCG_TPM(=y)
Config 'TCG_CRB' has the following Direct dependencies (TCG_CRB=n):
ACPI(undefined/n) && TCG_TPM(=y)
Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
features/tpm/tpm-1.2.cfg | 11 +++++++++++
features/tpm/tpm-1.2.scc | 7 +++++++
features/tpm/tpm-2.0-crb.cfg | 3 +++
features/tpm/tpm-2.0-crb.scc | 7 +++++++
features/tpm/tpm-2.0.cfg | 4 ++++
features/tpm/tpm-2.0.scc | 7 +++++++
features/tpm/tpm-common.cfg | 7 +++++++
features/tpm/tpm-common.scc | 5 +++++
features/tpm/tpm.cfg | 20 --------------------
features/tpm/tpm.scc | 8 ++++++--
features/tpm/vtpm.cfg | 3 +++
features/tpm/vtpm.scc | 7 +++++++
12 files changed, 67 insertions(+), 22 deletions(-)
create mode 100644 features/tpm/tpm-1.2.cfg
create mode 100644 features/tpm/tpm-1.2.scc
create mode 100644 features/tpm/tpm-2.0-crb.cfg
create mode 100644 features/tpm/tpm-2.0-crb.scc
create mode 100644 features/tpm/tpm-2.0.cfg
create mode 100644 features/tpm/tpm-2.0.scc
create mode 100644 features/tpm/tpm-common.cfg
create mode 100644 features/tpm/tpm-common.scc
delete mode 100644 features/tpm/tpm.cfg
create mode 100644 features/tpm/vtpm.cfg
create mode 100644 features/tpm/vtpm.scc
diff --git a/features/tpm/tpm-1.2.cfg b/features/tpm/tpm-1.2.cfg
new file mode 100644
index 000000000..d1fcf98cd
--- /dev/null
+++ b/features/tpm/tpm-1.2.cfg
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: MIT
+# Enable TPM 1.2 device drivers.
+CONFIG_TCG_TIS_I2C_ATMEL=y
+CONFIG_TCG_TIS_I2C_INFINEON=y
+CONFIG_TCG_TIS_I2C_NUVOTON=y
+CONFIG_TCG_NSC=y
+CONFIG_TCG_ATMEL=y
+CONFIG_TCG_INFINEON=y
+CONFIG_TCG_TIS_ST33ZP24=y
+CONFIG_TCG_TIS_ST33ZP24_I2C=y
+CONFIG_TCG_TIS_ST33ZP24_SPI=y
\ No newline at end of file
diff --git a/features/tpm/tpm-1.2.scc b/features/tpm/tpm-1.2.scc
new file mode 100644
index 000000000..74900486b
--- /dev/null
+++ b/features/tpm/tpm-1.2.scc
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: MIT
+define KFEATURE_DESCRIPTION "Enable TCG TPM (Trusted Computing Group Trusted Platform Module) 1.2 drivers"
+define KFEATURE_COMPATIBILITY board
+
+include tpm-common.scc
+
+kconf hardware tpm-1.2.cfg
diff --git a/features/tpm/tpm-2.0-crb.cfg b/features/tpm/tpm-2.0-crb.cfg
new file mode 100644
index 000000000..27a1ba251
--- /dev/null
+++ b/features/tpm/tpm-2.0-crb.cfg
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: MIT
+# Enable TPM device drivers.
+CONFIG_TCG_CRB=y
diff --git a/features/tpm/tpm-2.0-crb.scc b/features/tpm/tpm-2.0-crb.scc
new file mode 100644
index 000000000..508755968
--- /dev/null
+++ b/features/tpm/tpm-2.0-crb.scc
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: MIT
+define KFEATURE_DESCRIPTION "Enable TCG CRB TPM (Trusted Computing Group Command Response Buffer Trusted Platform Module) 2.0 driver"
+define KFEATURE_COMPATIBILITY board
+
+include tpm-common.scc
+
+kconf hardware tpm2-crb.cfg
diff --git a/features/tpm/tpm-2.0.cfg b/features/tpm/tpm-2.0.cfg
new file mode 100644
index 000000000..9f427afac
--- /dev/null
+++ b/features/tpm/tpm-2.0.cfg
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: MIT
+# Enable TPM device drivers.
+CONFIG_SPI=y
+CONFIG_TCG_TIS_SPI=y
diff --git a/features/tpm/tpm-2.0.scc b/features/tpm/tpm-2.0.scc
new file mode 100644
index 000000000..68f987022
--- /dev/null
+++ b/features/tpm/tpm-2.0.scc
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: MIT
+define KFEATURE_DESCRIPTION "Enable TCG TPM (Trusted Computing Group Trusted Platform Module) 2.0 drivers"
+define KFEATURE_COMPATIBILITY board
+
+include tpm-common.scc
+
+kconf hardware tpm2.cfg
diff --git a/features/tpm/tpm-common.cfg b/features/tpm/tpm-common.cfg
new file mode 100644
index 000000000..7e2ea6c12
--- /dev/null
+++ b/features/tpm/tpm-common.cfg
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: MIT
+# Enable TPM hardware support.
+CONFIG_TCG_TPM=y
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TPM=y
+CONFIG_TCG_TIS_CORE=y
+CONFIG_TCG_TIS=y
diff --git a/features/tpm/tpm-common.scc b/features/tpm/tpm-common.scc
new file mode 100644
index 000000000..31a070c04
--- /dev/null
+++ b/features/tpm/tpm-common.scc
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: MIT
+define KFEATURE_DESCRIPTION "Enable common TCG TPM (Trusted Computing Group Trusted Platform Module) features"
+define KFEATURE_COMPATIBILITY board
+
+kconf hardware tpm-common.cfg
diff --git a/features/tpm/tpm.cfg b/features/tpm/tpm.cfg
deleted file mode 100644
index ea10c1fb3..000000000
--- a/features/tpm/tpm.cfg
+++ /dev/null
@@ -1,20 +0,0 @@
-# SPDX-License-Identifier: MIT
-# Enable TPM device drivers.
-CONFIG_TCG_TPM=y
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_TPM=y
-CONFIG_TCG_TIS_CORE=y
-CONFIG_TCG_TIS=y
-CONFIG_SPI=y
-CONFIG_TCG_TIS_SPI=y
-CONFIG_TCG_TIS_I2C_ATMEL=y
-CONFIG_TCG_TIS_I2C_INFINEON=y
-CONFIG_TCG_TIS_I2C_NUVOTON=y
-CONFIG_TCG_NSC=y
-CONFIG_TCG_ATMEL=y
-CONFIG_TCG_INFINEON=y
-CONFIG_TCG_CRB=y
-CONFIG_TCG_VTPM_PROXY=y
-CONFIG_TCG_TIS_ST33ZP24=y
-CONFIG_TCG_TIS_ST33ZP24_I2C=y
-CONFIG_TCG_TIS_ST33ZP24_SPI=y
diff --git a/features/tpm/tpm.scc b/features/tpm/tpm.scc
index a14354800..1f3ba9cf4 100644
--- a/features/tpm/tpm.scc
+++ b/features/tpm/tpm.scc
@@ -1,5 +1,9 @@
# SPDX-License-Identifier: MIT
-define KFEATURE_DESCRIPTION "Enable TCG TPM driver (Trusted Computing Group Trusted Platform Module)"
+define KFEATURE_DESCRIPTION "Enable TCG TPM (Trusted Computing Group Trusted Platform Module) drivers"
define KFEATURE_COMPATIBILITY board
-kconf hardware tpm.cfg
+include tpm-common.scc
+include tpm-1.2.scc
+include tpm-2.0.scc
+include tpm-2.0-crb.scc
+include vtpm.scc
diff --git a/features/tpm/vtpm.cfg b/features/tpm/vtpm.cfg
new file mode 100644
index 000000000..eeb58e968
--- /dev/null
+++ b/features/tpm/vtpm.cfg
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: MIT
+# Enable vTPM device drivers.
+CONFIG_TCG_VTPM_PROXY=y
diff --git a/features/tpm/vtpm.scc b/features/tpm/vtpm.scc
new file mode 100644
index 000000000..e927ffb67
--- /dev/null
+++ b/features/tpm/vtpm.scc
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: MIT
+define KFEATURE_DESCRIPTION "Enable virtual TCG TPM (Trusted Computing Group Trusted Platform Module) proxy driver"
+define KFEATURE_COMPATIBILITY board
+
+include tpm-common.scc
+
+kconf hardware vtpm.cfg
--
GitLab
From b814c7ebf2a92fc361bcbeaf6efdd40b8cd0816a Mon Sep 17 00:00:00 2001
From: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
Date: Wed, 9 Mar 2022 08:47:58 +0100
Subject: [PATCH 089/146] features/tpm: fix tpm-2.0 cfg names
Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
features/tpm/tpm-2.0-crb.scc | 2 +-
features/tpm/tpm-2.0.scc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/features/tpm/tpm-2.0-crb.scc b/features/tpm/tpm-2.0-crb.scc
index 508755968..1274b3c7b 100644
--- a/features/tpm/tpm-2.0-crb.scc
+++ b/features/tpm/tpm-2.0-crb.scc
@@ -4,4 +4,4 @@ define KFEATURE_COMPATIBILITY board
include tpm-common.scc
-kconf hardware tpm2-crb.cfg
+kconf hardware tpm-2.0-crb.cfg
diff --git a/features/tpm/tpm-2.0.scc b/features/tpm/tpm-2.0.scc
index 68f987022..83440f8b1 100644
--- a/features/tpm/tpm-2.0.scc
+++ b/features/tpm/tpm-2.0.scc
@@ -4,4 +4,4 @@ define KFEATURE_COMPATIBILITY board
include tpm-common.scc
-kconf hardware tpm2.cfg
+kconf hardware tpm-2.0.cfg
--
GitLab
From fa2d617a2e524edd53027c231556985782bdfdaf Mon Sep 17 00:00:00 2001
From: Kevin Hao <kexin.hao@windriver.com>
Date: Wed, 9 Mar 2022 21:00:56 +0800
Subject: [PATCH 090/146] marvell-cn106xx: Enable the A32 application support
We need to enable these kernel options for the multilib support.
Signed-off-by: Kevin Hao <kexin.hao@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/marvell-cn106xx/marvell-cn106xx.cfg | 3 +++
bsp/marvell-cn106xx/marvell-cn106xx.scc | 1 +
2 files changed, 4 insertions(+)
diff --git a/bsp/marvell-cn106xx/marvell-cn106xx.cfg b/bsp/marvell-cn106xx/marvell-cn106xx.cfg
index b5982d460..f2431bd64 100644
--- a/bsp/marvell-cn106xx/marvell-cn106xx.cfg
+++ b/bsp/marvell-cn106xx/marvell-cn106xx.cfg
@@ -20,6 +20,9 @@ CONFIG_NR_CPUS=24
CONFIG_ARCH_THUNDER=y
CONFIG_JUMP_LABEL=y
+# Since we use the 64K pages, so we have to enable this for the multilib support
+CONFIG_EXPERT=y
+
# PCIe
CONFIG_PCI=y
CONFIG_PCIEPORTBUS=y
diff --git a/bsp/marvell-cn106xx/marvell-cn106xx.scc b/bsp/marvell-cn106xx/marvell-cn106xx.scc
index 559887838..a809af529 100644
--- a/bsp/marvell-cn106xx/marvell-cn106xx.scc
+++ b/bsp/marvell-cn106xx/marvell-cn106xx.scc
@@ -6,3 +6,4 @@ include cfg/usb-mass-storage.scc
include features/hugetlb/hugetlb.scc
include features/profiling/profiling.scc
+include arch/arm/32bit-compat.scc
--
GitLab
From ae48b977f6199374ec15174b26ceac8d86228a98 Mon Sep 17 00:00:00 2001
From: Ovidiu Panait <ovidiu.panait@windriver.com>
Date: Fri, 4 Mar 2022 15:20:51 +0200
Subject: [PATCH 091/146] cfg/debug: add configs for kcsan
Add support for enabling Kernel Concurrency Sanitizer (KCSAN). It's desirable
to have this feature enabled when doing kernel fuzzing with syzkaller.
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
cfg/debug/kcsan/debug-kcsan.cfg | 2 ++
cfg/debug/kcsan/debug-kcsan.scc | 5 +++++
2 files changed, 7 insertions(+)
create mode 100644 cfg/debug/kcsan/debug-kcsan.cfg
create mode 100644 cfg/debug/kcsan/debug-kcsan.scc
diff --git a/cfg/debug/kcsan/debug-kcsan.cfg b/cfg/debug/kcsan/debug-kcsan.cfg
new file mode 100644
index 000000000..57c4352e4
--- /dev/null
+++ b/cfg/debug/kcsan/debug-kcsan.cfg
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: MIT
+CONFIG_KCSAN=y
diff --git a/cfg/debug/kcsan/debug-kcsan.scc b/cfg/debug/kcsan/debug-kcsan.scc
new file mode 100644
index 000000000..b726d6b01
--- /dev/null
+++ b/cfg/debug/kcsan/debug-kcsan.scc
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: MIT
+define KFEATURE_DESCRIPTION "Enable kernel concurrency sanitizer support"
+define KFEATURE_COMPATIBILITY all
+
+kconf non-hardware debug-kcsan.cfg
--
GitLab
From c7bf42227e377b368c116b8c0ab6d86c43344773 Mon Sep 17 00:00:00 2001
From: Ovidiu Panait <ovidiu.panait@windriver.com>
Date: Fri, 4 Mar 2022 15:20:52 +0200
Subject: [PATCH 092/146] cfg/debug: add configs for fault injection debugfs
Add support for enabling fault injection debugfs capabilities. It's desirable
to have this feature enabled when doing kernel fuzzing with syzkaller.
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
cfg/debug/fault-inject/debug-fault-injection-debugfs.cfg | 6 ++++++
cfg/debug/fault-inject/debug-fault-injection-debugfs.scc | 7 +++++++
2 files changed, 13 insertions(+)
create mode 100644 cfg/debug/fault-inject/debug-fault-injection-debugfs.cfg
create mode 100644 cfg/debug/fault-inject/debug-fault-injection-debugfs.scc
diff --git a/cfg/debug/fault-inject/debug-fault-injection-debugfs.cfg b/cfg/debug/fault-inject/debug-fault-injection-debugfs.cfg
new file mode 100644
index 000000000..7e5b692a0
--- /dev/null
+++ b/cfg/debug/fault-inject/debug-fault-injection-debugfs.cfg
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: MIT
+# dependencies
+CONFIG_SYSFS=y
+CONFIG_DEBUG_FS=y
+
+CONFIG_FAULT_INJECTION_DEBUG_FS=y
diff --git a/cfg/debug/fault-inject/debug-fault-injection-debugfs.scc b/cfg/debug/fault-inject/debug-fault-injection-debugfs.scc
new file mode 100644
index 000000000..d12af7027
--- /dev/null
+++ b/cfg/debug/fault-inject/debug-fault-injection-debugfs.scc
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: MIT
+define KFEATURE_DESCRIPTION "Enable fault injection debugfs capabilities"
+define KFEATURE_COMPATIBILITY all
+
+include debug-fault-injection.scc
+
+kconf non-hardware debug-fault-injection-debugfs.cfg
--
GitLab
From 99aea8bc07b3a4410290045ca4fe96eb2a0f53a8 Mon Sep 17 00:00:00 2001
From: Ovidiu Panait <ovidiu.panait@windriver.com>
Date: Fri, 4 Mar 2022 15:20:53 +0200
Subject: [PATCH 093/146] features/mac80211: add configs for mac80211 hwsim
Add support for enabling simulated radio testing tool for mac80211. It's
desirable to have this feature enabled when doing kernel fuzzing with
syzkaller.
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
features/mac80211/mac80211-hwsim.cfg | 6 ++++++
features/mac80211/mac80211-hwsim.scc | 5 +++++
2 files changed, 11 insertions(+)
create mode 100644 features/mac80211/mac80211-hwsim.cfg
create mode 100644 features/mac80211/mac80211-hwsim.scc
diff --git a/features/mac80211/mac80211-hwsim.cfg b/features/mac80211/mac80211-hwsim.cfg
new file mode 100644
index 000000000..863a041f8
--- /dev/null
+++ b/features/mac80211/mac80211-hwsim.cfg
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: MIT
+# dependencies
+CONFIG_CFG80211=y
+CONFIG_MAC80211=y
+
+CONFIG_MAC80211_HWSIM=y
diff --git a/features/mac80211/mac80211-hwsim.scc b/features/mac80211/mac80211-hwsim.scc
new file mode 100644
index 000000000..71df2daf6
--- /dev/null
+++ b/features/mac80211/mac80211-hwsim.scc
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: MIT
+define KFEATURE_DESCRIPTION "Enable simulated radio testing tool for mac80211"
+define KFEATURE_COMPATIBILITY all
+
+kconf non-hardware mac80211-hwsim.cfg
--
GitLab
From e8c765f559f2b23e36804a5119767a668a094009 Mon Sep 17 00:00:00 2001
From: Ovidiu Panait <ovidiu.panait@windriver.com>
Date: Fri, 4 Mar 2022 15:20:54 +0200
Subject: [PATCH 094/146] features/ieee802154: add configs for mac802154 hwsim
Add support for enabling simulated radio testing tool for mac802154. It's
desirable to have this feature enabled when doing kernel fuzzing with
syzkaller.
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
features/ieee802154/ieee802154-hwsim.cfg | 8 ++++++++
features/ieee802154/ieee802154-hwsim.scc | 5 +++++
2 files changed, 13 insertions(+)
create mode 100644 features/ieee802154/ieee802154-hwsim.cfg
create mode 100644 features/ieee802154/ieee802154-hwsim.scc
diff --git a/features/ieee802154/ieee802154-hwsim.cfg b/features/ieee802154/ieee802154-hwsim.cfg
new file mode 100644
index 000000000..5fe6f5c63
--- /dev/null
+++ b/features/ieee802154/ieee802154-hwsim.cfg
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: MIT
+# dependencies
+CONFIG_MAC802154=y
+CONFIG_NETDEVICES=y
+CONFIG_IEEE802154=y
+CONFIG_IEEE802154_DRIVERS=y
+
+CONFIG_IEEE802154_HWSIM=y
diff --git a/features/ieee802154/ieee802154-hwsim.scc b/features/ieee802154/ieee802154-hwsim.scc
new file mode 100644
index 000000000..c29d43f5f
--- /dev/null
+++ b/features/ieee802154/ieee802154-hwsim.scc
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: MIT
+define KFEATURE_DESCRIPTION "Enable simulated radio testing tool for mac802154"
+define KFEATURE_COMPATIBILITY all
+
+kconf non-hardware ieee802154-hwsim.cfg
--
GitLab
From 0bd038864a52c84255729f56a45868b48ea50fa2 Mon Sep 17 00:00:00 2001
From: Ovidiu Panait <ovidiu.panait@windriver.com>
Date: Fri, 4 Mar 2022 15:20:55 +0200
Subject: [PATCH 095/146] features/usb: add configs for dummy HCD
Add support for enabling emulated USB host and device support. It's
desirable to have this feature enabled when doing kernel fuzzing with
syzkaller.
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
features/usb/usb-dummy-hcd.cfg | 2 ++
features/usb/usb-dummy-hcd.scc | 7 +++++++
2 files changed, 9 insertions(+)
create mode 100644 features/usb/usb-dummy-hcd.cfg
create mode 100644 features/usb/usb-dummy-hcd.scc
diff --git a/features/usb/usb-dummy-hcd.cfg b/features/usb/usb-dummy-hcd.cfg
new file mode 100644
index 000000000..ab7c21435
--- /dev/null
+++ b/features/usb/usb-dummy-hcd.cfg
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: MIT
+CONFIG_USB_DUMMY_HCD=y
diff --git a/features/usb/usb-dummy-hcd.scc b/features/usb/usb-dummy-hcd.scc
new file mode 100644
index 000000000..6684ed9c4
--- /dev/null
+++ b/features/usb/usb-dummy-hcd.scc
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: MIT
+define KFEATURE_DESCRIPTION "Enable emulated USB host and device support (dummy HCD)"
+define KFEATURE_COMPATIBILITY all
+
+include usb-base.scc
+
+kconf non-hardware usb-dummy-hcd.cfg
--
GitLab
From 824a7ba4dda22da6465b814d8c98134c18d58512 Mon Sep 17 00:00:00 2001
From: Ovidiu Panait <ovidiu.panait@windriver.com>
Date: Fri, 4 Mar 2022 15:20:56 +0200
Subject: [PATCH 096/146] features/usb: add configs for USB raw gadget
Add support for enabling USB raw gadget. It's desirable to have this feature
enabled when doing kernel fuzzing with syzkaller.
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
features/usb/usb-raw-gadget.cfg | 5 +++++
features/usb/usb-raw-gadget.scc | 7 +++++++
2 files changed, 12 insertions(+)
create mode 100644 features/usb/usb-raw-gadget.cfg
create mode 100644 features/usb/usb-raw-gadget.scc
diff --git a/features/usb/usb-raw-gadget.cfg b/features/usb/usb-raw-gadget.cfg
new file mode 100644
index 000000000..6e169ab51
--- /dev/null
+++ b/features/usb/usb-raw-gadget.cfg
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: MIT
+# dependency
+CONFIG_USB_GADGET=y
+
+CONFIG_USB_RAW_GADGET=y
diff --git a/features/usb/usb-raw-gadget.scc b/features/usb/usb-raw-gadget.scc
new file mode 100644
index 000000000..9f0c2eb8c
--- /dev/null
+++ b/features/usb/usb-raw-gadget.scc
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: MIT
+define KFEATURE_DESCRIPTION "Enable USB raw gadget"
+define KFEATURE_COMPATIBILITY all
+
+include usb-base.scc
+
+kconf non-hardware usb-raw-gadget.cfg
--
GitLab
From 148948c3829a35d04f671b5ba318810492c6b7f8 Mon Sep 17 00:00:00 2001
From: Ovidiu Panait <ovidiu.panait@windriver.com>
Date: Fri, 4 Mar 2022 15:20:57 +0200
Subject: [PATCH 097/146] features/bluetooth: add configs for Bluetooth Virtual
HCI device driver
Add support for enabling Bluetooth Virtual HCI device driver. It's desirable to
have this feature enabled when doing kernel fuzzing with syzkaller.
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
features/bluetooth/bluetooth-vhci.cfg | 2 ++
features/bluetooth/bluetooth-vhci.scc | 7 +++++++
2 files changed, 9 insertions(+)
create mode 100644 features/bluetooth/bluetooth-vhci.cfg
create mode 100644 features/bluetooth/bluetooth-vhci.scc
diff --git a/features/bluetooth/bluetooth-vhci.cfg b/features/bluetooth/bluetooth-vhci.cfg
new file mode 100644
index 000000000..3f7c7850a
--- /dev/null
+++ b/features/bluetooth/bluetooth-vhci.cfg
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: MIT
+CONFIG_BT_HCIVHCI=y
diff --git a/features/bluetooth/bluetooth-vhci.scc b/features/bluetooth/bluetooth-vhci.scc
new file mode 100644
index 000000000..e99f33d54
--- /dev/null
+++ b/features/bluetooth/bluetooth-vhci.scc
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: MIT
+define KFEATURE_DESCRIPTION "Enable Bluetooth Virtual HCI device driver"
+define KFEATURE_COMPATIBILITY all
+
+include bluetooth.scc
+
+kconf non-hardware bluetooth-vhci.cfg
--
GitLab
From c4494ad7f23a4b33aedab2a31895d11dda688ad3 Mon Sep 17 00:00:00 2001
From: Ovidiu Panait <ovidiu.panait@windriver.com>
Date: Fri, 4 Mar 2022 15:20:58 +0200
Subject: [PATCH 098/146] features/tun: add configs for Universal TUN/TAP
device driver support
Add support for enabling Universal TUN/TAP device driver support. It's
desirable to have this feature enabled when doing kernel fuzzing with
syzkaller.
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
features/tun/tun.cfg | 5 +++++
features/tun/tun.scc | 5 +++++
2 files changed, 10 insertions(+)
create mode 100644 features/tun/tun.cfg
create mode 100644 features/tun/tun.scc
diff --git a/features/tun/tun.cfg b/features/tun/tun.cfg
new file mode 100644
index 000000000..b45d3e9b6
--- /dev/null
+++ b/features/tun/tun.cfg
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: MIT
+# dependency
+CONFIG_INET=y
+
+CONFIG_TUN=y
diff --git a/features/tun/tun.scc b/features/tun/tun.scc
new file mode 100644
index 000000000..5a4cc3bc4
--- /dev/null
+++ b/features/tun/tun.scc
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: MIT
+define KFEATURE_DESCRIPTION "Enable universal TUN/TAP device driver support"
+define KFEATURE_COMPATIBILITY all
+
+kconf non-hardware tun.cfg
--
GitLab
From b56db30a7c5a0d86ccc853ee68be925086318f88 Mon Sep 17 00:00:00 2001
From: Ovidiu Panait <ovidiu.panait@windriver.com>
Date: Fri, 4 Mar 2022 15:20:59 +0200
Subject: [PATCH 099/146] cfg/debug: add scc for syzkaller fuzzing
Add a scc file that groups together various debug and emulation features needed
for syzkaller fuzzing. Syzkaller runtime sanity checks now report that most
required features are enabled:
loading corpus...
serving http on http://127.0.0.1:53725
serving rpc on tcp://[::]:39765
booting test machines...
wait for the connection from test machine...
machine check:
syscalls : 2222/4223
code coverage : enabled
comparison tracing : enabled
extra coverage : enabled
delay kcov mmap : mmap returned an invalid pointer
setuid sandbox : enabled
namespace sandbox : enabled
Android sandbox : /sys/fs/selinux/policy does not exist
fault injection : enabled
leak checking : enabled
net packet injection : enabled
net device setup : enabled
concurrency sanitizer : enabled
devlink PCI setup : PCI device 0000:00:10.0 is not available
USB emulation : enabled
hci packet injection : enabled
wifi device emulation : enabled
802.15.4 emulation : enabled
corpus : 855 (deleted 0 broken)
seeds : 0/0
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
cfg/debug/syzkaller/debug-syzkaller.scc | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 cfg/debug/syzkaller/debug-syzkaller.scc
diff --git a/cfg/debug/syzkaller/debug-syzkaller.scc b/cfg/debug/syzkaller/debug-syzkaller.scc
new file mode 100644
index 000000000..ff99b2818
--- /dev/null
+++ b/cfg/debug/syzkaller/debug-syzkaller.scc
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: MIT
+define KFEATURE_DESCRIPTION "Enable debug and emulation features needed for syzkaller fuzzing"
+define KFEATURE_COMPATIBILITY all
+
+include cfg/debug/kcov/debug-kcov.scc
+include cfg/debug/mem/debug-memleak.scc
+include cfg/debug/kcsan/debug-kcsan.scc
+include cfg/debug/fault-inject/debug-failslab-slab.scc
+include cfg/debug/fault-inject/debug-fault-injection-debugfs.scc
+
+include features/tun/tun.scc
+include features/usb/usb-dummy-hcd.scc
+include features/usb/usb-raw-gadget.scc
+include features/mac80211/mac80211-hwsim.scc
+include features/bluetooth/bluetooth-vhci.scc
+include features/ieee802154/ieee802154-hwsim.scc
--
GitLab
From cec5f94cd2090d98b2dcfeee7a4258ae6adce506 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Wed, 9 Mar 2022 10:08:28 -0500
Subject: [PATCH 100/146] kver: bumping to v5.10.104
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index 7aedf96ec..8338d4b75 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.103
+v5.10.104
--
GitLab
From 24ab54209a8822aad92afe2c51ea5b95f5175394 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Mon, 21 Mar 2022 08:29:26 -0400
Subject: [PATCH 101/146] kver: bumping to v5.10.107
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index 8338d4b75..b50b519c3 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.104
+v5.10.107
--
GitLab
From 7f3f55a61cb112c5a65eb3e5e6d2d2cab9d23f2a Mon Sep 17 00:00:00 2001
From: Kevin Hao <kexin.hao@windriver.com>
Date: Fri, 18 Mar 2022 21:53:21 +0800
Subject: [PATCH 102/146] marvell-cn96xx: Factor out the specific options for
cn-sdkv5.4/octeon branches
In the linux-yocto there are two similar branches.
v5.10/standard/cn-sdkv4.18/cn96xx
v5.10/standard/cn-sdkv5.4/octeon
They supports the same SoC but are based on the different SDK version.
All these branches share with the same BSP definition (scc & cfg),
but some kernel options only exist in one of kernel branch. So factor
out these specific options to a separate cfg and the corresponding
machine can include these cfg files respectively.
Signed-off-by: Kevin Hao <kexin.hao@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/marvell-cn96xx/marvell-cn96xx.cfg | 3 ---
bsp/marvell-cn96xx/sdkv5.4.cfg | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 3 deletions(-)
create mode 100644 bsp/marvell-cn96xx/sdkv5.4.cfg
diff --git a/bsp/marvell-cn96xx/marvell-cn96xx.cfg b/bsp/marvell-cn96xx/marvell-cn96xx.cfg
index a4abd19bf..fcb9d5f8a 100644
--- a/bsp/marvell-cn96xx/marvell-cn96xx.cfg
+++ b/bsp/marvell-cn96xx/marvell-cn96xx.cfg
@@ -138,6 +138,3 @@ CONFIG_CORESIGHT_SOURCE_ETM4X=y
CONFIG_CORESIGHT_CPU_DEBUG=y
CONFIG_CORESIGHT_CTI=y
CONFIG_CORESIGHT_CTI_INTEGRATION_REGS=y
-
-# OCTEONTX2_CCU
-CONFIG_OCTEONTX2_CCU=y
diff --git a/bsp/marvell-cn96xx/sdkv5.4.cfg b/bsp/marvell-cn96xx/sdkv5.4.cfg
new file mode 100644
index 000000000..5f0361caf
--- /dev/null
+++ b/bsp/marvell-cn96xx/sdkv5.4.cfg
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: MIT
+..........................................................................
+. WARNING
+.
+. This file is a kernel configuration fragment, and not a full kernel
+. configuration file. The final kernel configuration is made up of
+. an assembly of processed fragments, each of which is designed to
+. capture a specific part of the final configuration (e.g. platform
+. configuration, feature configuration, and board specific hardware
+. configuration). For more information on kernel configuration, please
+. consult the product documentation.
+.
+..........................................................................
+
+# This file includes the kernel options which are specific to
+# the cn-sdkv5.4/octeon branches.
+
+# OCTEONTX2_CCU
+CONFIG_OCTEONTX2_CCU=y
--
GitLab
From 4de538f75948d23c05e9edbf06fc07f3ad645ca9 Mon Sep 17 00:00:00 2001
From: Kevin Hao <kexin.hao@windriver.com>
Date: Fri, 18 Mar 2022 21:53:22 +0800
Subject: [PATCH 103/146] marvell-cn96xx: Introduce marvell-cn96xx-sdkv5.4
machine
So far the BSPs based on the cn-sdkv4.18/cn96xx and cn-sdkv5.4/octeon
branches use the same BSP machine definition (scc & cfg), but some new
drivers are introduced in the cn-sdkv5.4/octeon branch recently, then we
can't just put these new kernel driver options into the
marvell-cn96xx.cfg since it will cause the config check warning for the
BSP based on cn-sdkv4.18/cn96xx branch. So introduce a new machine for
the BSP based on the cn-sdkv5.4/octeon branch to include these new kernel
drivers.
Signed-off-by: Kevin Hao <kexin.hao@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
.../marvell-cn96xx-sdkv5.4-preempt-rt.scc | 10 ++++++++++
bsp/marvell-cn96xx/marvell-cn96xx-sdkv5.4-standard.scc | 9 +++++++++
2 files changed, 19 insertions(+)
create mode 100644 bsp/marvell-cn96xx/marvell-cn96xx-sdkv5.4-preempt-rt.scc
create mode 100644 bsp/marvell-cn96xx/marvell-cn96xx-sdkv5.4-standard.scc
diff --git a/bsp/marvell-cn96xx/marvell-cn96xx-sdkv5.4-preempt-rt.scc b/bsp/marvell-cn96xx/marvell-cn96xx-sdkv5.4-preempt-rt.scc
new file mode 100644
index 000000000..ab4d380f2
--- /dev/null
+++ b/bsp/marvell-cn96xx/marvell-cn96xx-sdkv5.4-preempt-rt.scc
@@ -0,0 +1,10 @@
+define KMACHINE marvell-cn96xx-sdkv5.4
+define KTYPE preempt-rt
+define KARCH arm64
+
+include ktypes/preempt-rt
+
+include marvell-cn96xx.scc
+
+kconf hardware marvell-cn96xx-preempt-rt.cfg
+kconf hardware sdkv5.4.cfg
diff --git a/bsp/marvell-cn96xx/marvell-cn96xx-sdkv5.4-standard.scc b/bsp/marvell-cn96xx/marvell-cn96xx-sdkv5.4-standard.scc
new file mode 100644
index 000000000..23f0d340a
--- /dev/null
+++ b/bsp/marvell-cn96xx/marvell-cn96xx-sdkv5.4-standard.scc
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: MIT
+define KMACHINE marvell-cn96xx-sdkv5.4
+define KTYPE standard
+define KARCH arm64
+
+include ktypes/standard
+
+include marvell-cn96xx.scc
+kconf hardware sdkv5.4.cfg
--
GitLab
From 6c0ce91f7ce77b06195956bc3c7128ae8fafffc3 Mon Sep 17 00:00:00 2001
From: Xulin Sun <xulin.sun@windriver.com>
Date: Mon, 21 Mar 2022 09:07:32 +0800
Subject: [PATCH 104/146] ti-j72xx: disable TI J721E PCIe active state power
management configuration
If PCIe ASPM is enabled, this will cause the link status of
the TI J721e PCIe controller and external PCIe device card to
not be up, a series pcie read and write access will fail. To
workaround this issue, disable TI J721E PCIe ASPM configuration.
Signed-off-by: Xulin Sun <xulin.sun@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/ti-j72xx/ti-j72xx.cfg | 1 +
1 file changed, 1 insertion(+)
diff --git a/bsp/ti-j72xx/ti-j72xx.cfg b/bsp/ti-j72xx/ti-j72xx.cfg
index 7a742ec41..26fba376d 100755
--- a/bsp/ti-j72xx/ti-j72xx.cfg
+++ b/bsp/ti-j72xx/ti-j72xx.cfg
@@ -53,6 +53,7 @@ CONFIG_PCI_KEYSTONE_EP=y
CONFIG_PHY_CADENCE_TORRENT=y
CONFIG_PHY_CADENCE_SIERRA=y
CONFIG_BLK_DEV_NVME=y
+# CONFIG_PCIEASPM is not set
#
# MMC/SD/SDIO Host Controller Drivers
--
GitLab
From f85f2b09c9db51623d65971103d8e1b5a0c4f91d Mon Sep 17 00:00:00 2001
From: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Date: Tue, 22 Mar 2022 10:23:07 +0800
Subject: [PATCH 105/146] marvell-cn106xx: spi: Replace spi driver accroding to
marvell SDK11
Marvell SDK11 has changed the SPI controller to cadence Xspi, so we need
to replace the original driver with Cadence Xspi driver.
Signed-off-by: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/marvell-cn106xx/marvell-cn106xx.cfg | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/bsp/marvell-cn106xx/marvell-cn106xx.cfg b/bsp/marvell-cn106xx/marvell-cn106xx.cfg
index f2431bd64..2d5c582a5 100644
--- a/bsp/marvell-cn106xx/marvell-cn106xx.cfg
+++ b/bsp/marvell-cn106xx/marvell-cn106xx.cfg
@@ -52,8 +52,7 @@ CONFIG_USB_XHCI_HCD=y
# SPI
CONFIG_SPI=y
-CONFIG_SPI_OCTEONTX2=y
-CONFIG_SPI_CADENCE_XSPI_PCI=y
+CONFIG_SPI_CADENCE_XSPI=y
# I2C
CONFIG_I2C=y
--
GitLab
From dd846b8c39a5d0a8678c82fe20619458a1cd5c37 Mon Sep 17 00:00:00 2001
From: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Date: Tue, 22 Mar 2022 10:23:08 +0800
Subject: [PATCH 106/146] marvell-cn106xx: Add coresight support
Enable coresight driver for marvell-cn106xx.
Signed-off-by: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/marvell-cn106xx/marvell-cn106xx.cfg | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/bsp/marvell-cn106xx/marvell-cn106xx.cfg b/bsp/marvell-cn106xx/marvell-cn106xx.cfg
index 2d5c582a5..00a69a454 100644
--- a/bsp/marvell-cn106xx/marvell-cn106xx.cfg
+++ b/bsp/marvell-cn106xx/marvell-cn106xx.cfg
@@ -134,3 +134,15 @@ CONFIG_OCTEONTX2_NPA_PF=y
# FWLOG
CONFIG_MARVELL_CN10K_FWLOG=y
+
+# CORESIGHT
+CONFIG_CORESIGHT=y
+CONFIG_CORESIGHT_LINKS_AND_SINKS=y
+CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y
+CONFIG_CORESIGHT_CATU=y
+CONFIG_CORESIGHT_SINK_TPIU=y
+CONFIG_CORESIGHT_SINK_ETBV10=y
+CONFIG_CORESIGHT_SOURCE_ETM4X=y
+CONFIG_CORESIGHT_CPU_DEBUG=y
+CONFIG_CORESIGHT_CTI=y
+CONFIG_CORESIGHT_CTI_INTEGRATION_REGS=y
--
GitLab
From 1ae63728667964edf845b4f85bb6c06a55b81793 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Mon, 28 Mar 2022 15:16:23 -0400
Subject: [PATCH 107/146] kver: bumping to v5.10.109
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index b50b519c3..2b1826988 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.107
+v5.10.109
--
GitLab
From 7d5a75eb47df77e0f932bb14cd20b1b48f4addbf Mon Sep 17 00:00:00 2001
From: Zhantao Tang <zhantao.tang@windriver.com>
Date: Tue, 29 Mar 2022 11:48:54 +0800
Subject: [PATCH 108/146] kernel-cache: nxp-s32g: add support for new bsp layer
nxp-s32g
Given NXP S32G3 RDB3 board has been supported, the layer name nxp-s32g2xx
is not so proper, so add new layer nxp-s32g to support both S32G2 and S32G3
boards. And This patch is to update kernel cache for nxp-s32g.
Signed-off-by: Zhantao Tang <zhantao.tang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-s32g/nxp-s32g-preempt-rt.scc | 9 ++
bsp/nxp-s32g/nxp-s32g-standard.scc | 9 ++
bsp/nxp-s32g/nxp-s32g.cfg | 161 +++++++++++++++++++++++++++
bsp/nxp-s32g/nxp-s32g.scc | 7 ++
4 files changed, 186 insertions(+)
create mode 100755 bsp/nxp-s32g/nxp-s32g-preempt-rt.scc
create mode 100755 bsp/nxp-s32g/nxp-s32g-standard.scc
create mode 100644 bsp/nxp-s32g/nxp-s32g.cfg
create mode 100755 bsp/nxp-s32g/nxp-s32g.scc
diff --git a/bsp/nxp-s32g/nxp-s32g-preempt-rt.scc b/bsp/nxp-s32g/nxp-s32g-preempt-rt.scc
new file mode 100755
index 000000000..187f9f45c
--- /dev/null
+++ b/bsp/nxp-s32g/nxp-s32g-preempt-rt.scc
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: MIT
+define KMACHINE nxp-s32g
+define KTYPE preempt-rt
+define KARCH arm64
+
+include ktypes/preempt-rt
+branch nxp-s32g2xx
+
+include nxp-s32g.scc
diff --git a/bsp/nxp-s32g/nxp-s32g-standard.scc b/bsp/nxp-s32g/nxp-s32g-standard.scc
new file mode 100755
index 000000000..268cb5d21
--- /dev/null
+++ b/bsp/nxp-s32g/nxp-s32g-standard.scc
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: MIT
+define KMACHINE nxp-s32g
+define KTYPE standard
+define KARCH arm64
+
+include ktypes/standard
+branch nxp-s32g2xx
+
+include nxp-s32g.scc
diff --git a/bsp/nxp-s32g/nxp-s32g.cfg b/bsp/nxp-s32g/nxp-s32g.cfg
new file mode 100644
index 000000000..920143cd7
--- /dev/null
+++ b/bsp/nxp-s32g/nxp-s32g.cfg
@@ -0,0 +1,161 @@
+# SPDX-License-Identifier: MIT
+..........................................................................
+. WARNING
+.
+. This file is a kernel configuration fragment, and not a full kernel
+. configuration file. The final kernel configuration is made up of
+. an assembly of processed fragments, each of which is designed to
+. capture a specific part of the final configuration (e.g. platform
+. configuration, feature configuration, and board specific hardware
+. configuration). For more information on kernel configuration, please
+. consult the product documentation.
+.
+..........................................................................
+
+CONFIG_ARM64=y
+CONFIG_ARCH_S32=y
+CONFIG_SOC_S32GEN1=y
+CONFIG_SCHED_MC=y
+CONFIG_ARM_SMMU=y
+
+CONFIG_PINCTRL_S32GEN1=y
+CONFIG_PINCTRL_S32_GEN1_CORE=y
+CONFIG_PINCTRL_IMX=y
+
+CONFIG_CPU_IDLE=y
+CONFIG_ARM_CPUIDLE=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+
+#CAN
+CONFIG_CAN=y
+CONFIG_CAN_VCAN=y
+CONFIG_CAN_SLCAN=y
+CONFIG_CAN_FLEXCAN=y
+
+#Ethernet
+CONFIG_STMMAC_ETH=y
+CONFIG_AT803X_PHY=y
+CONFIG_MICREL_PHY=y
+CONFIG_AQUANTIA_PHY=y
+
+#Serial
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_SERIAL_FSL_LINFLEXUART=y
+CONFIG_SERIAL_FSL_LINFLEXUART_CONSOLE=y
+
+#SPI
+CONFIG_SPI=y
+CONFIG_SPI_FSL_DSPI=y
+CONFIG_SPI_SPIDEV=y
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_S32GEN1=y
+
+#PCIE
+CONFIG_PCI=y
+CONFIG_PCI_S32GEN1=y
+CONFIG_PCIE_DW=y
+CONFIG_PCIE_DW_PLAT_HOST=y
+CONFIG_PCI_ENDPOINT=y
+CONFIG_PCIE_DW_PLAT_EP=y
+CONFIG_PCI_S32GEN1_INIT_EP_BARS=y
+CONFIG_PCIEAER=y
+
+#USB
+CONFIG_USB=y
+CONFIG_USB_OTG=y
+CONFIG_USB_OTG_FSM=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_CHIPIDEA=y
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_NOP_USB_XCEIV=y
+CONFIG_USB_ULPI=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_CONFIGFS=y
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+
+#MMC
+CONFIG_MMC=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PLTFM=y
+CONFIG_MMC_SDHCI_ESDHC_IMX=y
+CONFIG_DMADEVICES=y
+CONFIG_FSL_EDMA=y
+CONFIG_CMA=y
+CONFIG_DMA_CMA=y
+CONFIG_CMA_SIZE_MBYTES=128
+
+CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_PHYSMAP_OF=y
+CONFIG_MTD_DATAFLASH=y
+CONFIG_MTD_SPI_NOR=y
+
+CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=y
+
+CONFIG_POWER_RESET_S32GEN1=y
+
+# Thermal
+CONFIG_THERMAL=y
+CONFIG_S32GEN1_THERMAL=y
+
+# ADC
+CONFIG_IIO=y
+CONFIG_S32_ADC=y
+
+# PWM
+CONFIG_PWM=y
+CONFIG_PWM_FSL_FTM=y
+
+CONFIG_FCCU=y
+CONFIG_GPIOLIB=y
+CONFIG_OF_GPIO=y
+
+CONFIG_MDIO_DEVICE=y
+CONFIG_PHYLIB=y
+
+#QSPI
+CONFIG_SPI_FSL_QUADSPI=y
+
+#RTC
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_S32GEN1=y
+CONFIG_RTC_DRV_PCF85063=y
+
+#I2C
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_IMX=y
+
+#Watchdog
+CONFIG_SAC58R_WDT=y
+
+#NVME
+CONFIG_NVM=y
+CONFIG_BLK_DEV_NVME=y
+CONFIG_NVME_TARGET=y
+
+#LLCE
+CONFIG_CAN_LLCE=y
+CONFIG_CAN_LLCE_CONTROLLER=m
+
+# Regulator configuration
+CONFIG_REGULATOR=y
+
+#HSE UIO
+CONFIG_UIO=y
+CONFIG_CRYPTO_DEV_NXP_HSE=y
+
+#RANDOM
+CONFIG_HW_RANDOM=y
diff --git a/bsp/nxp-s32g/nxp-s32g.scc b/bsp/nxp-s32g/nxp-s32g.scc
new file mode 100755
index 000000000..8674ac6bf
--- /dev/null
+++ b/bsp/nxp-s32g/nxp-s32g.scc
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: MIT
+kconf hardware nxp-s32g.cfg
+
+include cfg/usb-mass-storage.scc
+
+include features/hugetlb/hugetlb.scc
+include arch/arm/32bit-compat.scc
--
GitLab
From 2278ed571c14df6e87d8e01ac26f649d98020623 Mon Sep 17 00:00:00 2001
From: Kamil Dziezyk <kamil.dziezyk@arm.com>
Date: Fri, 1 Apr 2022 14:14:42 +0200
Subject: [PATCH 109/146] features/security: Move x86_64 configs to separate
file
This patch removes the warning message, that pops up if kernel config
'security.scc' is enabled for other architectures than x86_64, e.g. arm64:
WARNING: linux-yocto-${PV}-r0 do_kernel_configcheck: \
[kernel config]: This BSP contains fragments with warnings:
[INFO]: the following symbols were not found in the active configuration:
- CONFIG_LEGACY_VSYSCALL_EMULATE
- CONFIG_LEGACY_VSYSCALL_NONE
Configs 'LEGACY_VSYSCALL_*' are valid only for x86_64 architecture.
Signed-off-by: Kamil Dziezyk <kamil.dziezyk@arm.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
features/security/security-x86_64.cfg | 4 ++++
features/security/security.cfg | 4 ----
features/security/security.scc | 4 ++++
3 files changed, 8 insertions(+), 4 deletions(-)
create mode 100644 features/security/security-x86_64.cfg
diff --git a/features/security/security-x86_64.cfg b/features/security/security-x86_64.cfg
new file mode 100644
index 000000000..dad137f63
--- /dev/null
+++ b/features/security/security-x86_64.cfg
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: MIT
+# Modern libc no longer needs a fixed-position mapping in userspace, remove it as a possible target.
+# CONFIG_LEGACY_VSYSCALL_EMULATE is not set
+CONFIG_LEGACY_VSYSCALL_NONE=y
diff --git a/features/security/security.cfg b/features/security/security.cfg
index 475b647ec..5befeb90c 100644
--- a/features/security/security.cfg
+++ b/features/security/security.cfg
@@ -26,10 +26,6 @@ CONFIG_STACKPROTECTOR_STRONG=y
CONFIG_EXPERT=y
CONFIG_MODIFY_LDT_SYSCALL=n
-# Modern libc no longer needs a fixed-position mapping in userspace, remove it as a possible target.
-# CONFIG_LEGACY_VSYSCALL_EMULATE is not set
-CONFIG_LEGACY_VSYSCALL_NONE=y
-
# Prior to v4.1, assists heap memory attacks; best to keep interface disabled.
# CONFIG_INET_DIAG is not set
diff --git a/features/security/security.scc b/features/security/security.scc
index 4abdf4571..c6ca31f06 100644
--- a/features/security/security.scc
+++ b/features/security/security.scc
@@ -3,3 +3,7 @@ define KFEATURE_DESCRIPTION "Enable/disable configurations that impact kernel se
define KFEATURE_COMPATIBILITY all
kconf non-hardware security.cfg
+
+if [ "$KARCH" = "x86_64" ]; then
+ kconf non-hardware security-x86_64.cfg
+fi
--
GitLab
From 0959fd4d1eeb5312233be7a3c1f9a97104163f90 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Mon, 11 Apr 2022 15:35:39 -0400
Subject: [PATCH 110/146] kver: bumping to v5.10.110
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index 2b1826988..2ea08cb2d 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.109
+v5.10.110
--
GitLab
From bddb0e4921f541bafa595986f16cff5390d01f40 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 7 Apr 2022 09:17:36 +0200
Subject: [PATCH 111/146] base.cfg: enable kernel crypto userspace API
hardlink from util-linux 2.38 makes use of it and fails
its test suite in particular.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
ktypes/base/base.cfg | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/ktypes/base/base.cfg b/ktypes/base/base.cfg
index 84d53be20..e6350c603 100644
--- a/ktypes/base/base.cfg
+++ b/ktypes/base/base.cfg
@@ -1079,6 +1079,10 @@ CONFIG_CRYPTO=y
CONFIG_CRYPTO_DES=y
CONFIG_CRYPTO_ARC4=y
CONFIG_CRYPTO_LIB_ARC4=y
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
#
# Hardware crypto devices
--
GitLab
From b1e20cccb116cf9d056683fa064bd4e4444004c7 Mon Sep 17 00:00:00 2001
From: Dylan Garrett <dylang@microsoft.com>
Date: Tue, 12 Apr 2022 23:33:47 +0000
Subject: [PATCH 112/146] cfg/debug: Remove unused test config
This patch removes the warning message when enabling debug-info.scc:
WARNING: linux-yocto-${PV} do_kernel_configcheck: \
[kernel config]: This BSP contains fragments with warnings:
[INFO]: the following symbols were not found in the active configuration:
- CONFIG_TEST
CONFIG_TEST is not a real config and is apparently an artifact from an
old test.
Signed-off-by: Dylan Garrett <dylang@microsoft.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
cfg/debug/debug-info/debug-info.cfg | 1 -
1 file changed, 1 deletion(-)
diff --git a/cfg/debug/debug-info/debug-info.cfg b/cfg/debug/debug-info/debug-info.cfg
index 0514cea32..1d75b16bc 100644
--- a/cfg/debug/debug-info/debug-info.cfg
+++ b/cfg/debug/debug-info/debug-info.cfg
@@ -1,3 +1,2 @@
# SPDX-License-Identifier: MIT
-# CONFIG_TEST is not set
CONFIG_DEBUG_INFO=y
--
GitLab
From 682d236b4ea50b80102a136bd8a064aeed6c7008 Mon Sep 17 00:00:00 2001
From: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Date: Fri, 15 Apr 2022 12:44:48 +0800
Subject: [PATCH 113/146] marvell-cn106xx: Drop ASIM support
We no longer use ASIM for testing, so delete the ASIM support for
marvell-cn106xx.
Signed-off-by: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/marvell-cn106xx/marvell-cn106xx.cfg | 3 ---
1 file changed, 3 deletions(-)
diff --git a/bsp/marvell-cn106xx/marvell-cn106xx.cfg b/bsp/marvell-cn106xx/marvell-cn106xx.cfg
index 00a69a454..7cb2ba2c8 100644
--- a/bsp/marvell-cn106xx/marvell-cn106xx.cfg
+++ b/bsp/marvell-cn106xx/marvell-cn106xx.cfg
@@ -129,9 +129,6 @@ CONFIG_CRYPTO_DEV_OCTEONTX2_CPT=y
# NPA
CONFIG_OCTEONTX2_NPA_PF=y
-# Unsupported by simulator
-# CONFIG_ARM_PMU is not set
-
# FWLOG
CONFIG_MARVELL_CN10K_FWLOG=y
--
GitLab
From 2311a54750b6d9e0315e4f316b640e4e73945342 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Wed, 20 Apr 2022 12:05:37 -0400
Subject: [PATCH 114/146] kver: bumping to v5.10.112
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index 2ea08cb2d..95a142214 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.110
+v5.10.112
--
GitLab
From 8e9f8836e590f37d58d82c7a5f1b05b6d24f6f28 Mon Sep 17 00:00:00 2001
From: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Date: Fri, 15 Apr 2022 12:44:49 +0800
Subject: [PATCH 115/146] marvell-cn96xx: Add octeontx2-npa support
Enable octeontx2-npa support for marvell-cn96xx.
Signed-off-by: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/marvell-cn96xx/marvell-cn96xx.cfg | 3 +++
1 file changed, 3 insertions(+)
diff --git a/bsp/marvell-cn96xx/marvell-cn96xx.cfg b/bsp/marvell-cn96xx/marvell-cn96xx.cfg
index fcb9d5f8a..c30f18385 100644
--- a/bsp/marvell-cn96xx/marvell-cn96xx.cfg
+++ b/bsp/marvell-cn96xx/marvell-cn96xx.cfg
@@ -138,3 +138,6 @@ CONFIG_CORESIGHT_SOURCE_ETM4X=y
CONFIG_CORESIGHT_CPU_DEBUG=y
CONFIG_CORESIGHT_CTI=y
CONFIG_CORESIGHT_CTI_INTEGRATION_REGS=y
+
+# NPA
+CONFIG_OCTEONTX2_NPA_PF=y
--
GitLab
From 19e7547dd6617760d6094b7a42da1a718b5a96ee Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Thu, 21 Apr 2022 09:44:30 -0400
Subject: [PATCH 116/146] powerpc: add debug feature fragment
gcc12 generates some warnings with arch/powerpc, and we know that
these warnings are understood/non-fatal at runtime.
This fragment allows testing to continue, while upstream powerpc
looks at removing warnings.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
arch/powerpc/powerpc-debug.cfg | 1 +
arch/powerpc/powerpc-debug.scc | 3 +++
2 files changed, 4 insertions(+)
create mode 100644 arch/powerpc/powerpc-debug.cfg
create mode 100644 arch/powerpc/powerpc-debug.scc
diff --git a/arch/powerpc/powerpc-debug.cfg b/arch/powerpc/powerpc-debug.cfg
new file mode 100644
index 000000000..6ea12a124
--- /dev/null
+++ b/arch/powerpc/powerpc-debug.cfg
@@ -0,0 +1 @@
+CONFIG_PPC_DISABLE_WERROR=y
diff --git a/arch/powerpc/powerpc-debug.scc b/arch/powerpc/powerpc-debug.scc
new file mode 100644
index 000000000..aedb597cd
--- /dev/null
+++ b/arch/powerpc/powerpc-debug.scc
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: MIT
+
+kconf non-hardware powerpc-debug.cfg
--
GitLab
From 7767ab05bd3e525a287a7f9bfd780005b5eb25a3 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Tue, 3 May 2022 22:37:58 -0400
Subject: [PATCH 117/146] kver: bumping to v5.10.113
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index 95a142214..97126167e 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.112
+v5.10.113
--
GitLab
From b368b4c1c8ee0e0e7573caa7f1596c3385ad855f Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Mon, 9 May 2022 16:52:47 -0400
Subject: [PATCH 118/146] kver: bumping to v5.10.114
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index 97126167e..13275b44b 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.113
+v5.10.114
--
GitLab
From 081fcbfbc763d13eef4bfecb93d733666af2521a Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Wed, 25 May 2022 15:11:25 -0400
Subject: [PATCH 119/146] kver: bumping to v5.10.118
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index 13275b44b..bc36092dc 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.114
+v5.10.118
--
GitLab
From 2f6fa8da5f84c343e6ea57c76829eaca1cc6a840 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Tue, 31 May 2022 23:23:08 -0400
Subject: [PATCH 120/146] kver: bumping to v5.10.119
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index bc36092dc..da861f624 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.118
+v5.10.119
--
GitLab
From 6870a8348348f94ca46ddacf028fb0f4b4823148 Mon Sep 17 00:00:00 2001
From: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Date: Wed, 1 Jun 2022 14:17:25 +0800
Subject: [PATCH 121/146] marvell-cn96xx: Remove unused kernel config
Remove OCTEONTX2_RM config accroding to marvell SDK11.22.05.
Signed-off-by: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/marvell-cn96xx/marvell-cn96xx.cfg | 2 --
1 file changed, 2 deletions(-)
diff --git a/bsp/marvell-cn96xx/marvell-cn96xx.cfg b/bsp/marvell-cn96xx/marvell-cn96xx.cfg
index c30f18385..8a1f08a6a 100644
--- a/bsp/marvell-cn96xx/marvell-cn96xx.cfg
+++ b/bsp/marvell-cn96xx/marvell-cn96xx.cfg
@@ -103,8 +103,6 @@ CONFIG_VFIO_NOIOMMU=y
CONFIG_EEPROM_AT24=y
CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_CAVIUM=y
-CONFIG_OCTEONTX2_RM=y
-CONFIG_OCTEONTX2_RM_DOM_SYSFS=y
# BPHY
CONFIG_MARVELL_OTX_BPHY_CTR=y
--
GitLab
From 2c59dff0c487ea40b50b4ff4899cb48619ffc1ad Mon Sep 17 00:00:00 2001
From: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Date: Wed, 1 Jun 2022 14:17:27 +0800
Subject: [PATCH 122/146] marvell-cn96xx: Add Marvell Utility Bus support
Enable marvell utility bus feature for cn96xx.
Signed-off-by: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/marvell-cn96xx/marvell-cn96xx.cfg | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/bsp/marvell-cn96xx/marvell-cn96xx.cfg b/bsp/marvell-cn96xx/marvell-cn96xx.cfg
index 8a1f08a6a..5834824b0 100644
--- a/bsp/marvell-cn96xx/marvell-cn96xx.cfg
+++ b/bsp/marvell-cn96xx/marvell-cn96xx.cfg
@@ -139,3 +139,7 @@ CONFIG_CORESIGHT_CTI_INTEGRATION_REGS=y
# NPA
CONFIG_OCTEONTX2_NPA_PF=y
+
+# MARVELL_UB
+CONFIG_MARVELL_UB=y
+CONFIG_MARVELL_UB_GEN_DRIVER=y
--
GitLab
From 9715c20e3c9b93252d7da8e28f58604151444c44 Mon Sep 17 00:00:00 2001
From: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Date: Wed, 1 Jun 2022 14:17:26 +0800
Subject: [PATCH 123/146] marvell-cn96xx: Sync GHES config with SDK11.22.05
Replace OCTEONTX2_SDEI_GHES with EDAC_OCTEONTX.
Signed-off-by: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/marvell-cn96xx/marvell-cn96xx.cfg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bsp/marvell-cn96xx/marvell-cn96xx.cfg b/bsp/marvell-cn96xx/marvell-cn96xx.cfg
index 5834824b0..5ddef0c40 100644
--- a/bsp/marvell-cn96xx/marvell-cn96xx.cfg
+++ b/bsp/marvell-cn96xx/marvell-cn96xx.cfg
@@ -123,7 +123,7 @@ CONFIG_ARM_SCMI_CPUFREQ=y
# GHES
CONFIG_ACPI=y
-CONFIG_OCTEONTX2_SDEI_GHES=y
+CONFIG_EDAC_OCTEONTX=y
# CORESIGHT
CONFIG_CORESIGHT=y
--
GitLab
From 4e0c273886602078d6c346c564973fea185fd62c Mon Sep 17 00:00:00 2001
From: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Date: Wed, 1 Jun 2022 14:17:28 +0800
Subject: [PATCH 124/146] marvell-cn96xx: Add AVS bus reset support
Enable AVS bus reset function.
Signed-off-by: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/marvell-cn96xx/marvell-cn96xx.cfg | 3 +++
1 file changed, 3 insertions(+)
diff --git a/bsp/marvell-cn96xx/marvell-cn96xx.cfg b/bsp/marvell-cn96xx/marvell-cn96xx.cfg
index 5ddef0c40..9bf8c508f 100644
--- a/bsp/marvell-cn96xx/marvell-cn96xx.cfg
+++ b/bsp/marvell-cn96xx/marvell-cn96xx.cfg
@@ -143,3 +143,6 @@ CONFIG_OCTEONTX2_NPA_PF=y
# MARVELL_UB
CONFIG_MARVELL_UB=y
CONFIG_MARVELL_UB_GEN_DRIVER=y
+
+# AVS_RESET
+CONFIG_MARVELL_AVS_RESET=y
--
GitLab
From da61236cda6f41654292171f1da3ae4688de4c39 Mon Sep 17 00:00:00 2001
From: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Date: Tue, 7 Jun 2022 09:46:49 +0800
Subject: [PATCH 125/146] marvell-cn106xx: Remove unused kernel config
Remove OCTEONTX2_RM config accroding to marvell SDK11.22.05.
Signed-off-by: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/marvell-cn106xx/marvell-cn106xx.cfg | 2 --
1 file changed, 2 deletions(-)
diff --git a/bsp/marvell-cn106xx/marvell-cn106xx.cfg b/bsp/marvell-cn106xx/marvell-cn106xx.cfg
index 7cb2ba2c8..dc2c60e2a 100644
--- a/bsp/marvell-cn106xx/marvell-cn106xx.cfg
+++ b/bsp/marvell-cn106xx/marvell-cn106xx.cfg
@@ -103,8 +103,6 @@ CONFIG_EEPROM_AT24=y
CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_CAVIUM=y
CONFIG_HW_RANDOM_CN10K=y
-CONFIG_OCTEONTX2_RM=y
-CONFIG_OCTEONTX2_RM_DOM_SYSFS=y
CONFIG_OCTEONTX_INFO=y
# BPHY
--
GitLab
From 9d0f6a51c30a2b36acae1b266d13ef426349f950 Mon Sep 17 00:00:00 2001
From: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Date: Tue, 7 Jun 2022 09:46:50 +0800
Subject: [PATCH 126/146] marvell-cn106xx: Add Marvell Utility Bus support
Enable marvell utility bus feature for cn106xx.
Signed-off-by: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/marvell-cn106xx/marvell-cn106xx.cfg | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/bsp/marvell-cn106xx/marvell-cn106xx.cfg b/bsp/marvell-cn106xx/marvell-cn106xx.cfg
index dc2c60e2a..8826d6fc1 100644
--- a/bsp/marvell-cn106xx/marvell-cn106xx.cfg
+++ b/bsp/marvell-cn106xx/marvell-cn106xx.cfg
@@ -141,3 +141,7 @@ CONFIG_CORESIGHT_SOURCE_ETM4X=y
CONFIG_CORESIGHT_CPU_DEBUG=y
CONFIG_CORESIGHT_CTI=y
CONFIG_CORESIGHT_CTI_INTEGRATION_REGS=y
+
+# MARVELL_UB
+CONFIG_MARVELL_UB=y
+CONFIG_MARVELL_UB_GEN_DRIVER=y
--
GitLab
From 6337d56f23d18e5680493dadcb52899d5e6a7c09 Mon Sep 17 00:00:00 2001
From: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Date: Tue, 7 Jun 2022 09:46:51 +0800
Subject: [PATCH 127/146] marvell-cn106xx: Add AVS bus reset support
Enable AVS bus reset function.
Signed-off-by: Ruiqiang Hao <Ruiqiang.Hao@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/marvell-cn106xx/marvell-cn106xx.cfg | 3 +++
1 file changed, 3 insertions(+)
diff --git a/bsp/marvell-cn106xx/marvell-cn106xx.cfg b/bsp/marvell-cn106xx/marvell-cn106xx.cfg
index 8826d6fc1..33288e14c 100644
--- a/bsp/marvell-cn106xx/marvell-cn106xx.cfg
+++ b/bsp/marvell-cn106xx/marvell-cn106xx.cfg
@@ -145,3 +145,6 @@ CONFIG_CORESIGHT_CTI_INTEGRATION_REGS=y
# MARVELL_UB
CONFIG_MARVELL_UB=y
CONFIG_MARVELL_UB_GEN_DRIVER=y
+
+# AVS_RESET
+CONFIG_MARVELL_AVS_RESET=y
--
GitLab
From 53a0c749bae96beda7dc041dc6fdeee03336ada6 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Tue, 14 Jun 2022 15:45:20 -0400
Subject: [PATCH 128/146] kver: bumping to v5.10.121
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index da861f624..1dbe43441 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.119
+v5.10.121
--
GitLab
From ca025569d1b8a5c227d054033bbab457dc5535e8 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Tue, 21 Jun 2022 13:58:58 -0400
Subject: [PATCH 129/146] kver: bumping to v5.10.123
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index 1dbe43441..6ecd713f7 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.121
+v5.10.123
--
GitLab
From 67aa1fe3fa495bcef36fc3b0e98d50d2fd253964 Mon Sep 17 00:00:00 2001
From: Petr Gotthard <petr.gotthard@advantech.cz>
Date: Tue, 21 Jun 2022 12:27:23 +0000
Subject: [PATCH 130/146] nft: add NFT_OBJREF
This option allows references to stateful objects, such as counters
and quotas. In Linux kernel since 4.10, so applicable to all branches.
Signed-off-by: Petr Gotthard <petr.gotthard@advantech.cz>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
features/nf_tables/nf_tables.cfg | 1 +
1 file changed, 1 insertion(+)
diff --git a/features/nf_tables/nf_tables.cfg b/features/nf_tables/nf_tables.cfg
index 3bb34d596..b8f73b768 100644
--- a/features/nf_tables/nf_tables.cfg
+++ b/features/nf_tables/nf_tables.cfg
@@ -12,6 +12,7 @@ CONFIG_NFT_LIMIT=m
CONFIG_NFT_CONNLIMIT=m
CONFIG_NFT_TUNNEL=m
CONFIG_NFT_NAT=m
+CONFIG_NFT_OBJREF=m
CONFIG_NFT_QUEUE=m
CONFIG_NFT_REJECT=m
CONFIG_NFT_REJECT_INET=m
--
GitLab
From 5b3dacac6fe3c01c9df223897224c2367a5d20c0 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Tue, 5 Jul 2022 16:59:15 -0400
Subject: [PATCH 131/146] kver: bumping to v5.10.128
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index 6ecd713f7..4f8e497e8 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.123
+v5.10.128
--
GitLab
From 9e2ff1dce3a74ea3dc64c8648045f4811bd469a5 Mon Sep 17 00:00:00 2001
From: Carlos Dominguez <carlos.dominguez@windriver.com>
Date: Fri, 8 Jul 2022 18:03:16 +0300
Subject: [PATCH 132/146] marvell-cn96xx: Move the sdkv5.4 specific kernel
options to sdkv5.4.cfg
These kernel options were added due to the new drivers in the
v5.10/standard/cn-sdkv5.4/octeon branch, but they are put into
the wrong cfg file marvell-cn96xx.cfg since this file is also used
by the v5.10/standard/cn-sdkv4.18/cn96xx branch. Then these new
kernel options cause kernel config check warnings on the
v5.10/standard/cn-sdkv4.18/cn96xx branch. So move them to the
v5.10/standard/cn-sdkv5.4/octeon specific cfg file sdkv5.4.cfg.
Signed-off-by: Carlos Dominguez <carlos.dominguez@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/marvell-cn96xx/marvell-cn96xx.cfg | 8 --------
bsp/marvell-cn96xx/sdkv5.4.cfg | 10 ++++++++++
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/bsp/marvell-cn96xx/marvell-cn96xx.cfg b/bsp/marvell-cn96xx/marvell-cn96xx.cfg
index 9bf8c508f..13250aa54 100644
--- a/bsp/marvell-cn96xx/marvell-cn96xx.cfg
+++ b/bsp/marvell-cn96xx/marvell-cn96xx.cfg
@@ -123,7 +123,6 @@ CONFIG_ARM_SCMI_CPUFREQ=y
# GHES
CONFIG_ACPI=y
-CONFIG_EDAC_OCTEONTX=y
# CORESIGHT
CONFIG_CORESIGHT=y
@@ -139,10 +138,3 @@ CONFIG_CORESIGHT_CTI_INTEGRATION_REGS=y
# NPA
CONFIG_OCTEONTX2_NPA_PF=y
-
-# MARVELL_UB
-CONFIG_MARVELL_UB=y
-CONFIG_MARVELL_UB_GEN_DRIVER=y
-
-# AVS_RESET
-CONFIG_MARVELL_AVS_RESET=y
diff --git a/bsp/marvell-cn96xx/sdkv5.4.cfg b/bsp/marvell-cn96xx/sdkv5.4.cfg
index 5f0361caf..8e8cfdac4 100644
--- a/bsp/marvell-cn96xx/sdkv5.4.cfg
+++ b/bsp/marvell-cn96xx/sdkv5.4.cfg
@@ -17,3 +17,13 @@
# OCTEONTX2_CCU
CONFIG_OCTEONTX2_CCU=y
+
+# GHES
+CONFIG_EDAC_OCTEONTX=y
+
+# MARVELL_UB
+CONFIG_MARVELL_UB=y
+CONFIG_MARVELL_UB_GEN_DRIVER=y
+
+# AVS_RESET
+CONFIG_MARVELL_AVS_RESET=y
--
GitLab
From c01749af04f31c672e28ff927f61c60f4ab79214 Mon Sep 17 00:00:00 2001
From: Xiaolei Wang <xiaolei.wang@windriver.com>
Date: Fri, 8 Jul 2022 18:14:44 +0800
Subject: [PATCH 133/146] nxp-imx6: Delete duplicate
CONFIG_SND_SOC_FSL_ASOC_CARD
Delete duplicate CONFIG_SND_SOC_FSL_ASOC_CARD.
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-imx6/nxp-imx6.cfg | 1 -
1 file changed, 1 deletion(-)
diff --git a/bsp/nxp-imx6/nxp-imx6.cfg b/bsp/nxp-imx6/nxp-imx6.cfg
index aa517af7d..0a39d7c66 100644
--- a/bsp/nxp-imx6/nxp-imx6.cfg
+++ b/bsp/nxp-imx6/nxp-imx6.cfg
@@ -182,7 +182,6 @@ CONFIG_SND_SOC_FSL_SPDIF=y
CONFIG_SND_SOC_IMX_SPDIF=y
CONFIG_SND_SOC_FSL_ESAI=y
CONFIG_SND_SOC_WM8962=y
-CONFIG_SND_SOC_FSL_ASOC_CARD=y
CONFIG_SND_SOC_FSL_SSI=y
CONFIG_SND_SOC_WM8960=y
CONFIG_SND_SOC_FSL_SAI=y
--
GitLab
From 2f79722c50ad61cf055b40e8ba6d6f48e8dc6db0 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Sun, 10 Jul 2022 23:01:34 -0400
Subject: [PATCH 134/146] lib/build_OID_registry: fix reproducibility issues
1/1 [
Author: Bruce Ashfield
Email: bruce.ashfield@gmail.com
Subject: lib/build_OID_registry: fix reproducibility issues
Date: Sun, 10 Jul 2022 22:56:53 -0400
The script build_OID_registry captures the full path of itself
in the generated data. This causes reproduciblity issues as the
path is captured and packaged.
We use the basename of the script instead, and that allows us
to be reprodicible, with slightly less information captured in
the output data (but the generating script can still easily
be found).
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
]
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
..._registry-fix-reproducibility-issues.patch | 43 +++++++++++++++++++
patches/misc/misc.scc | 1 +
2 files changed, 44 insertions(+)
create mode 100644 patches/misc/lib-build_OID_registry-fix-reproducibility-issues.patch
diff --git a/patches/misc/lib-build_OID_registry-fix-reproducibility-issues.patch b/patches/misc/lib-build_OID_registry-fix-reproducibility-issues.patch
new file mode 100644
index 000000000..da04c927c
--- /dev/null
+++ b/patches/misc/lib-build_OID_registry-fix-reproducibility-issues.patch
@@ -0,0 +1,43 @@
+From 2fca0fd719812ea2ff67630b01355aa80481623e Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@gmail.com>
+Date: Sun, 10 Jul 2022 22:56:53 -0400
+Subject: [PATCH] lib/build_OID_registry: fix reproducibility issues
+
+The script build_OID_registry captures the full path of itself
+in the generated data. This causes reproduciblity issues as the
+path is captured and packaged.
+
+We use the basename of the script instead, and that allows us
+to be reprodicible, with slightly less information captured in
+the output data (but the generating script can still easily
+be found).
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+---
+ lib/build_OID_registry | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/build_OID_registry b/lib/build_OID_registry
+index d7fc32ea8ac2..f6de0a7f7457 100755
+--- a/lib/build_OID_registry
++++ b/lib/build_OID_registry
+@@ -8,6 +8,7 @@
+ #
+
+ use strict;
++use File::Basename;
+
+ my @names = ();
+ my @oids = ();
+@@ -35,7 +36,7 @@ close IN_FILE || die;
+ #
+ open C_FILE, ">$ARGV[1]" or die;
+ print C_FILE "/*\n";
+-print C_FILE " * Automatically generated by ", $0, ". Do not edit\n";
++print C_FILE " * Automatically generated by ", basename $0, ". Do not edit\n";
+ print C_FILE " */\n";
+
+ #
+--
+2.19.1
+
diff --git a/patches/misc/misc.scc b/patches/misc/misc.scc
index 37d583311..0ce6879ed 100644
--- a/patches/misc/misc.scc
+++ b/patches/misc/misc.scc
@@ -10,3 +10,4 @@ patch arm64-perf-fix-backtrace-for-AAPCS-with-FP-enabled.patch
patch defconfigs-drop-obselete-options.patch
patch arm64-perf-Fix-wrong-cast-that-may-cause-wrong-trunc.patch
patch cgroup1-fix-leaked-context-root-causing-sporadic-NUL.patch
+patch lib-build_OID_registry-fix-reproducibility-issues.patch
--
GitLab
From 96ea2660bb97e15f48f4885b9e436f24c3606bd9 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Thu, 14 Jul 2022 08:55:06 -0400
Subject: [PATCH 135/146] kver: bumping to v5.10.130
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index 4f8e497e8..3eb08d415 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.128
+v5.10.130
--
GitLab
From 35bec1ca790cf107235c23bc187d03fc623f346e Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Fri, 29 Jul 2022 15:05:30 -0400
Subject: [PATCH 136/146] kver: bumping to v5.10.134
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index 3eb08d415..6d63f8955 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.130
+v5.10.134
--
GitLab
From ed7e0c3bb9464387ba99fedd5ea32bf78ae2fe45 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Mon, 8 Aug 2022 14:41:40 -0400
Subject: [PATCH 137/146] kver: bumping to v5.10.135
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index 6d63f8955..565f37c94 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.134
+v5.10.135
--
GitLab
From 443f1c2f821e55dd96d115bb09e89f8f106b63d4 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Mon, 15 Aug 2022 10:36:57 -0400
Subject: [PATCH 138/146] kver: bumping to v5.10.136
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index 565f37c94..ac7771f10 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.135
+v5.10.136
--
GitLab
From e462ebf62581138ef03de1783e93c49c2f0b1051 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Mon, 22 Aug 2022 22:27:08 -0400
Subject: [PATCH 139/146] kver: bumping to v5.10.137
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index ac7771f10..a6079f826 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.136
+v5.10.137
--
GitLab
From 41751659d0650c4effdd598f26febba39aeaf082 Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei.gherzan@huawei.com>
Date: Mon, 22 Aug 2022 19:55:10 +0200
Subject: [PATCH 140/146] efi.cfg: Drop ACPI dependency
On X86 this will have no impact as CONFIG_ACPI is enabled by default. On
the other hand, ARM64 would be affected as they don't have the same
default. The defconfig for arm64 recommends CONFIG_ACPI and this patch
follows this recommendation in the qemuarm64 bsp configuration to fix
ACPI-only EFI boots on this arch.
arm (32bit) would also be unaffected as there is no ACPI support there
at all. And this unconditional drop (CONFIG_ACPI) will actually fix a
configuration warning when enabling EFI on a arm (32bit) machine:
[INFO]: config 'CONFIG_ACPI' was set, but it wasn't assignable, check
(parent) dependencies
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/qemuarm64/qemuarm64.cfg | 7 +++++++
cfg/efi.cfg | 1 -
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/bsp/qemuarm64/qemuarm64.cfg b/bsp/qemuarm64/qemuarm64.cfg
index ef8d3ed02..03fdc58cc 100644
--- a/bsp/qemuarm64/qemuarm64.cfg
+++ b/bsp/qemuarm64/qemuarm64.cfg
@@ -32,3 +32,10 @@ CONFIG_RTC_DRV_PL031=y
# PCI configs, needed for virtio-rng (and others)
CONFIG_PCI=y
CONFIG_PCI_HOST_GENERIC=y
+
+# arm64 defconfig suggests CONFIG_ACPI as default because it won't be enabled
+# with CONFIG_EFI - even though ACPI-only ARM64 EFI boots would break
+# otherwise. We also do the same here as a sane default.
+CONFIG_ARCH_SUPPORTS_ACPI=y
+CONFIG_ACPI=y
+
diff --git a/cfg/efi.cfg b/cfg/efi.cfg
index d3dfd603d..d729cbe9f 100644
--- a/cfg/efi.cfg
+++ b/cfg/efi.cfg
@@ -3,7 +3,6 @@
# Dependencies
CONFIG_PCI=y
-CONFIG_ACPI=y
# Enable basic EFI support
CONFIG_EFI=y
--
GitLab
From dcf3fae266930708f432bf37ed4668a1ea9c5ac4 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Fri, 9 Sep 2022 15:15:00 -0400
Subject: [PATCH 141/146] kver: bumping to v5.10.141
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index a6079f826..c7de43a8c 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.137
+v5.10.141
--
GitLab
From 92c947578207d27db250ee7250bacc11d9d80d4f Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Mon, 19 Sep 2022 10:04:26 -0400
Subject: [PATCH 142/146] kver: bumping to v5.10.143
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index c7de43a8c..2ed8beb67 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.141
+v5.10.143
--
GitLab
From df3b69dd24f7d249da49c027e749cd757f9eb70e Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Sat, 8 Oct 2022 22:53:38 -0400
Subject: [PATCH 143/146] kver: bumping to v5.10.147
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index 2ed8beb67..fd4cc1a42 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.143
+v5.10.147
--
GitLab
From 47b7070aa771dec970b79cb84e7b8c9329a93678 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Wed, 19 Oct 2022 13:29:10 -0400
Subject: [PATCH 144/146] kver: bumping to v5.10.149
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index fd4cc1a42..a68d262e2 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.147
+v5.10.149
--
GitLab
From 648713579b9076c25a3eb93ba1a96f2577ffca20 Mon Sep 17 00:00:00 2001
From: Ovidiu Panait <ovidiu.panait@windriver.com>
Date: Fri, 21 Oct 2022 13:10:22 +0300
Subject: [PATCH 145/146] nxp-s32g: disable CONFIG_NVM config
Stable commit 549209caabc8 ("lightnvm: disable the subsystem") disabled
the lightnvm subsystem in v5.10.114, as it is known to be broken.
Therefore, also disable CONFIG_NVM for nxp-s32g BSPs in order to fix the
following build warnings:
[NOTE]: 'CONFIG_NVM' last val (y) and .config val (n) do not match
[INFO]: CONFIG_NVM : n
Config 'NVM' has the following Direct dependencies (NVM=n):
BLOCK(=y) && BROKEN(=n)
Parent dependencies are:
BLOCK [y] BROKEN [n]
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
bsp/nxp-s32g/nxp-s32g.cfg | 1 -
bsp/nxp-s32g2xx/nxp-s32g2xx.cfg | 1 -
2 files changed, 2 deletions(-)
diff --git a/bsp/nxp-s32g/nxp-s32g.cfg b/bsp/nxp-s32g/nxp-s32g.cfg
index 920143cd7..ae0d14600 100644
--- a/bsp/nxp-s32g/nxp-s32g.cfg
+++ b/bsp/nxp-s32g/nxp-s32g.cfg
@@ -142,7 +142,6 @@ CONFIG_I2C_IMX=y
CONFIG_SAC58R_WDT=y
#NVME
-CONFIG_NVM=y
CONFIG_BLK_DEV_NVME=y
CONFIG_NVME_TARGET=y
diff --git a/bsp/nxp-s32g2xx/nxp-s32g2xx.cfg b/bsp/nxp-s32g2xx/nxp-s32g2xx.cfg
index 920143cd7..ae0d14600 100644
--- a/bsp/nxp-s32g2xx/nxp-s32g2xx.cfg
+++ b/bsp/nxp-s32g2xx/nxp-s32g2xx.cfg
@@ -142,7 +142,6 @@ CONFIG_I2C_IMX=y
CONFIG_SAC58R_WDT=y
#NVME
-CONFIG_NVM=y
CONFIG_BLK_DEV_NVME=y
CONFIG_NVME_TARGET=y
--
GitLab
From dd90d836c062535cc2e8fff8c69959178215a552 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Mon, 31 Oct 2022 16:01:59 -0400
Subject: [PATCH 146/146] kver: bumping to v5.10.152
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
kver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kver b/kver
index a68d262e2..ed218a16e 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.149
+v5.10.152
--
GitLab