diff --git a/00-README b/00-README
index 85e7c85e885cee4e67a4e6defd02e3b1c8a1c26e..214a3a7fd778235ae95ce8c08995bcbb0912e21f 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
============
diff --git a/arch/powerpc/powerpc-debug.cfg b/arch/powerpc/powerpc-debug.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..6ea12a12432c9dc831d7c2f189b260a228fa40fb
--- /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 0000000000000000000000000000000000000000..aedb597cd033f2915378764cba59cc5ddf4b1bb5
--- /dev/null
+++ b/arch/powerpc/powerpc-debug.scc
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: MIT
+
+kconf non-hardware powerpc-debug.cfg
diff --git a/bsp/axxiaarm/axxiaarm.cfg b/bsp/axxiaarm/axxiaarm.cfg
index c2fd717a33f1088076cfc25e253bccd8bae55760..a11248b18f92d7e784344a857e88e6dc02cfb43a 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
diff --git a/bsp/axxiaarm/axxiaarm.scc b/bsp/axxiaarm/axxiaarm.scc
index 4d06c9968455f4b8f5b17c2d796afc4209047ded..ab9e939a6859e594e0cf4612eb81a20d5a708f84 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.cfg b/bsp/axxiaarm64/axxiaarm64.cfg
index 0104ad7666838a4fe0d29066e227184b3872288e..f114fd7a62dd3152e5b33dc792db79317caeb055 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
diff --git a/bsp/axxiaarm64/axxiaarm64.scc b/bsp/axxiaarm64/axxiaarm64.scc
index c8611b18df2866e7f441e80a8f783ae5e32e70b2..a6bfe567fbd923f2f949d2d8485715aa0eda9b6e 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
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 0000000000000000000000000000000000000000..4814ac8c65e5cdfb2cd34d556945d0de80e5d19a
--- /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
diff --git a/bsp/intel-socfpga/intel-socfpga-64.cfg b/bsp/intel-socfpga/intel-socfpga-64.cfg
index 6ea0afa401679aa50ba5190f527aa3559666b784..6d4a716e22fd195da05b7ac19740832d16d08b70 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
diff --git a/bsp/intel-socfpga/intel-socfpga-64.scc b/bsp/intel-socfpga/intel-socfpga-64.scc
index d398f474d58d7093771f8b67bf801dfef0440087..172411b8312bc40f6f13c9bbddae0ed89f8e2e83 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
diff --git a/bsp/intel-x86/intel-x86-64-preempt-rt.scc b/bsp/intel-x86/intel-x86-64-preempt-rt.scc
index bd31121b879753b9a66c28dbe8c69c82fc29ca58..197b506456274b729490a64ab48eae5b52d3b3ab 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/bsp/intel-x86/intel-x86.cfg b/bsp/intel-x86/intel-x86.cfg
index f4b75f0e543d354eb81200084dcc05413c0b0b20..3aa03c3c8dd6771f5e8a6577331d6c995193ee99 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
diff --git a/bsp/intel-x86/intel-x86.scc b/bsp/intel-x86/intel-x86.scc
index e1afd0719d406d5d4a6cd86596399c007cb99015..90eb0b0931dbc8266655d9523289d9473d977bb7 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
diff --git a/bsp/marvell-cn106xx/marvell-cn106xx.cfg b/bsp/marvell-cn106xx/marvell-cn106xx.cfg
index 36b8d049af2ba0da174d1e36506eb2b673ec4445..33288e14c623b007d8cc56f9eadb2bc7d3b8b113 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
@@ -49,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
@@ -69,7 +71,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
@@ -102,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
@@ -123,10 +122,29 @@ 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
-# Unsupported by simulator
-# CONFIG_ARM_PMU is not set
+# 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
+
+# MARVELL_UB
+CONFIG_MARVELL_UB=y
+CONFIG_MARVELL_UB_GEN_DRIVER=y
+
+# AVS_RESET
+CONFIG_MARVELL_AVS_RESET=y
diff --git a/bsp/marvell-cn106xx/marvell-cn106xx.scc b/bsp/marvell-cn106xx/marvell-cn106xx.scc
index 5598878386ed6236df119bf6419dc79269f6186e..a809af52993cc604fa3ada8eb6fd901058a3a955 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
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 0000000000000000000000000000000000000000..ab4d380f2526f262afab1d547d76aab793ff9104
--- /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 0000000000000000000000000000000000000000..23f0d340ae4594e920105458c1637b256e1301aa
--- /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
diff --git a/bsp/marvell-cn96xx/marvell-cn96xx.cfg b/bsp/marvell-cn96xx/marvell-cn96xx.cfg
index 1b1c4af310985af680911f0e22041ece0d6e94ec..13250aa54965c2477e9b4b073c3ea2b9b07938e2 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
@@ -122,3 +120,21 @@ CONFIG_COMMON_CLK_SCMI=y
# CPU freq
CONFIG_CPU_FREQ=y
CONFIG_ARM_SCMI_CPUFREQ=y
+
+# GHES
+CONFIG_ACPI=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
+
+# NPA
+CONFIG_OCTEONTX2_NPA_PF=y
diff --git a/bsp/marvell-cn96xx/sdkv5.4.cfg b/bsp/marvell-cn96xx/sdkv5.4.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..8e8cfdac4bb99aa611b81c79bb9d7106f3c31a1b
--- /dev/null
+++ b/bsp/marvell-cn96xx/sdkv5.4.cfg
@@ -0,0 +1,29 @@
+# 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
+
+# GHES
+CONFIG_EDAC_OCTEONTX=y
+
+# MARVELL_UB
+CONFIG_MARVELL_UB=y
+CONFIG_MARVELL_UB_GEN_DRIVER=y
+
+# AVS_RESET
+CONFIG_MARVELL_AVS_RESET=y
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 0000000000000000000000000000000000000000..0497046a8723ee2247ee5ee306d9df15f0ad2d66
--- /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
diff --git a/bsp/nxp-imx6/nxp-imx6.cfg b/bsp/nxp-imx6/nxp-imx6.cfg
index 76d7811b4643e8c3071d10d6fdc556e6ccb4a90a..0a39d7c663469fa6628db91a70732aa2eaea8e49 100644
--- a/bsp/nxp-imx6/nxp-imx6.cfg
+++ b/bsp/nxp-imx6/nxp-imx6.cfg
@@ -1,5 +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
@@ -27,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
@@ -108,6 +111,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
@@ -116,6 +130,12 @@ CONFIG_LCD_CLASS_DEVICE=y
CONFIG_LCD_L4F00242T03=y
CONFIG_LCD_PLATFORM=y
CONFIG_BACKLIGHT_PWM=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
@@ -142,6 +162,11 @@ CONFIG_MMC_SDHCI_ESDHC_IMX=y
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
+CONFIG_PCI=y
+CONFIG_PCI_IMX6_HOST=y
+CONFIG_PCI_MSI=y
+CONFIG_PCIEPORTBUS=y
+
CONFIG_RTC_CLASS=y
CONFIG_RTC_INTF_DEV_UIE_EMUL=y
CONFIG_RTC_DRV_MC13XXX=y
@@ -156,6 +181,11 @@ 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_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
@@ -189,3 +219,5 @@ CONFIG_CMA_AREAS=7
CONFIG_GPIO_74X164=y
CONFIG_GPIO_MXC=y
CONFIG_GPIO_PCA953X=y
+
+CONFIG_MAILBOX=y
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 0000000000000000000000000000000000000000..780e974a4d5286816ebe94f1ee7d034f726ede7c
--- /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
new file mode 100644
index 0000000000000000000000000000000000000000..677790ee992155f1d5bb3d4001c20965c3d5bcc9
--- /dev/null
+++ b/bsp/nxp-imx8/nxp-imx8-preempt-rt.scc
@@ -0,0 +1,10 @@
+define KMACHINE nxp-imx8
+define KTYPE preempt-rt
+define KARCH arm64
+
+include ktypes/preempt-rt
+branch nxp-imx8
+
+include nxp-imx8.scc
+
+kconf hardware nxp-imx8-preempt-rt.cfg
diff --git a/bsp/nxp-imx8/nxp-imx8.cfg b/bsp/nxp-imx8/nxp-imx8.cfg
index 77326503865452d2f298983b7a29eb8753b9c53c..aafe0bc04f3ed8923588bc0fb5292fec75eebf28 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
#
@@ -71,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
@@ -143,6 +145,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
@@ -254,6 +257,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
@@ -369,6 +373,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
@@ -397,6 +410,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
@@ -461,6 +477,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
@@ -481,7 +498,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
diff --git a/bsp/nxp-imx8/nxp-imx8.scc b/bsp/nxp-imx8/nxp-imx8.scc
index 5ab69a06a959961ca6b7dc723c279a42f64fce59..b3454fbf3e7c74ec694556fa40b849dd9b29014f 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
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 0000000000000000000000000000000000000000..29f0a993d79e4dead0df054c05e04655e311768c
--- /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 0000000000000000000000000000000000000000..9c85ada6147b383ad673a3c2525f70bc69190995
--- /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 0000000000000000000000000000000000000000..319812e8c1f4b7c22b5b08c0a502a94762a1a1a7
--- /dev/null
+++ b/bsp/nxp-ls1043/nxp-ls1043.cfg
@@ -0,0 +1,158 @@
+..........................................................................
+. 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_ARM_PSCI_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_CPUFREQ_DT=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_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_ENERGY_MODEL=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_RTC_DRV_FSL_FTM_ALARM=y
+CONFIG_FSL_RCPM=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_DEVICE_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 0000000000000000000000000000000000000000..36b17ec4530bcf5aee8541df1d01775eac68fbd4
--- /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
+
diff --git a/bsp/nxp-lx2xxx/nxp-lx2xxx.cfg b/bsp/nxp-lx2xxx/nxp-lx2xxx.cfg
index e1dbbb4b7d49a06dd9510612832cfbb3800fa40c..d6ba3a6f30cc47ac05e8113a3bbba2a49c11155d 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
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 0000000000000000000000000000000000000000..187f9f45c03028ad163901fcc3d7e614d7fae925
--- /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 0000000000000000000000000000000000000000..268cb5d21bb7f974eef3f32d45e4e3591e105ca7
--- /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 0000000000000000000000000000000000000000..ae0d14600c6902c53454f642846903ed7a2f2d26
--- /dev/null
+++ b/bsp/nxp-s32g/nxp-s32g.cfg
@@ -0,0 +1,160 @@
+# 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_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 0000000000000000000000000000000000000000..8674ac6bf2fe6a10c3b2514ca9a4957426cb41a3
--- /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
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 0000000000000000000000000000000000000000..0335e4ba8e7e0ad759b1e45a92c6178f426e77f5
--- /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
diff --git a/bsp/nxp-s32g2xx/nxp-s32g2xx.cfg b/bsp/nxp-s32g2xx/nxp-s32g2xx.cfg
index 7589533864b7b069a234f4ce688253a001ef9f15..ae0d14600c6902c53454f642846903ed7a2f2d26 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
@@ -156,7 +155,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
diff --git a/bsp/qemuarm64/qemuarm64.cfg b/bsp/qemuarm64/qemuarm64.cfg
index ef8d3ed023de122e3ac7169860d957b37c498690..03fdc58cccf113e09c1392a8b9f496a059b1d1f0 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/bsp/ti-j72xx/ti-j72xx-preempt-rt.cfg b/bsp/ti-j72xx/ti-j72xx-preempt-rt.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..5e3915711bfb0f7a168353fa24832a02ef1dfe55
--- /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 0000000000000000000000000000000000000000..9ac678bbfbceff86d22735d7f476609a9aa0a40a
--- /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
diff --git a/bsp/ti-j72xx/ti-j72xx.cfg b/bsp/ti-j72xx/ti-j72xx.cfg
index 1afcaec532f9e90a79917714d98ee1b2c7d41608..26fba376d4101d7bc0a0b77088b71a43225f3664 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
@@ -337,7 +338,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
@@ -346,6 +346,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
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 0000000000000000000000000000000000000000..af791ac987c7af4346b178a37024688f9f449abe
--- /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
new file mode 100644
index 0000000000000000000000000000000000000000..6efecd97407101c31366a05a4b712044668b478e
--- /dev/null
+++ b/bsp/xilinx-zynqmp/xilinx-zynqmp-preempt-rt.scc
@@ -0,0 +1,11 @@
+# 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
+
+kconf hardware xilinx-zynqmp-preempt-rt.cfg
diff --git a/bsp/xilinx-zynqmp/xilinx-zynqmp.cfg b/bsp/xilinx-zynqmp/xilinx-zynqmp.cfg
index 6005eaeb0ccd3ff638fbd77fcc3baaa44b7f18d1..d4a18689350c395dff5f5b6da1ff225d4cb51b00 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
diff --git a/bsp/xilinx/soc/drivers-zynq.cfg b/bsp/xilinx/soc/drivers-zynq.cfg
index 560e0cb89c2eb3652e6c19186c394fbb3b0b3a1d..61373be996c86566584c53547b8b0465a45f02fb 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
diff --git a/cfg/debug/debug-info/debug-info.cfg b/cfg/debug/debug-info/debug-info.cfg
index 0514cea320dc908f8161b4f16920da6907674a46..1d75b16bc2890cf8a3d985460ede5c105d907964 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
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 0000000000000000000000000000000000000000..7e5b692a06429b2c452e3b6ef1734e012c287a47
--- /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 0000000000000000000000000000000000000000..d12af7027c967e8fecd7b225528f3ff79d44f094
--- /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
diff --git a/cfg/debug/kcov/debug-kcov.cfg b/cfg/debug/kcov/debug-kcov.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..9cdd37ce12e516defbdb39b499ed7700ba70d595
--- /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 0000000000000000000000000000000000000000..325c6f999096b9ba3db16064ed3b2c1167aa1ac3
--- /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
diff --git a/cfg/debug/kcsan/debug-kcsan.cfg b/cfg/debug/kcsan/debug-kcsan.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..57c4352e4c40919a15b63f05ad3937be68cb6424
--- /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 0000000000000000000000000000000000000000..b726d6b018a8a61b1324b0d3c34c8973a7c0d5d3
--- /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
diff --git a/cfg/debug/syzkaller/debug-syzkaller.scc b/cfg/debug/syzkaller/debug-syzkaller.scc
new file mode 100644
index 0000000000000000000000000000000000000000..ff99b28187d50044e8e499a51a6d43eaad6aed0c
--- /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
diff --git a/cfg/efi.cfg b/cfg/efi.cfg
index d3dfd603dc5754d9c62c907d58194c003328d7d7..d729cbe9fc78e07765d43ff3b53983a786aa1818 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
diff --git a/cfg/remoteproc.cfg b/cfg/remoteproc.cfg
index b4f13fd7b52b8436053a8772202af10aaa9cf9f8..dacb8505d182c109c93c1f99db26b170f90c83f0 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
diff --git a/cfg/vmware-guest.cfg b/cfg/vmware-guest.cfg
index 00b1131d5de63021a05bc06252016b7853360bc1..499a02b915a0d67c9e207aa7cafaac12932f1ad6 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
diff --git a/features/bluetooth/bluetooth-vhci.cfg b/features/bluetooth/bluetooth-vhci.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..3f7c7850a3517eeebb59518e884e5e04ca38d50f
--- /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 0000000000000000000000000000000000000000..e99f33d5414882b2cf3381e6efe5ee0534ce1125
--- /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
diff --git a/features/ieee802154/ieee802154-hwsim.cfg b/features/ieee802154/ieee802154-hwsim.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..5fe6f5c63aafd4825e86268f07aa7a3a6f9ff291
--- /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 0000000000000000000000000000000000000000..c29d43f5f48a27796bf01963d0f238d283a2ebe7
--- /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
diff --git a/bsp/intel-x86/intel-x86-cfg80211-overrides.cfg b/features/mac80211/mac80211-hwsim.cfg
similarity index 62%
rename from bsp/intel-x86/intel-x86-cfg80211-overrides.cfg
rename to features/mac80211/mac80211-hwsim.cfg
index 26957814a5f086d86734ac5a7d4519e492070baa..863a041f8901cd22e94c4e8448bfca28158ed967 100644
--- a/bsp/intel-x86/intel-x86-cfg80211-overrides.cfg
+++ b/features/mac80211/mac80211-hwsim.cfg
@@ -1,3 +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 0000000000000000000000000000000000000000..71df2daf614bd58033284407d2512c11e1898b01
--- /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
diff --git a/features/media/media-platform.cfg b/features/media/media-platform.cfg
index 58ad7330413ab11b50ce641292e55dc5c68beea8..135e3eeb5f1ec84c254c6a3c505ce00b23241fcc 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
diff --git a/features/nf_tables/nf_tables.cfg b/features/nf_tables/nf_tables.cfg
index 3bb34d596aa650552df3344f39e3b1374fcb82e6..b8f73b7686cf34f26eb697b63f95ff44e9e8eca3 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
diff --git a/features/security/security-x86_64.cfg b/features/security/security-x86_64.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..dad137f63bcdda2b0f9d45b81e1b5d2d3f62571f
--- /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 475b647ec121ad664ef106b2287563096f790b20..5befeb90cbbd1c3795b8cc1eea456f25988fcfc5 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 4abdf4571520689dda96b5aa4905c4abf5f827b5..c6ca31f069da27907aeece600dfabcd360a2f0c8 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
diff --git a/features/tpm/tpm-1.2.cfg b/features/tpm/tpm-1.2.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..d1fcf98cdb4666ebb092419408dd18a2d3ba9ac5
--- /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 0000000000000000000000000000000000000000..74900486b11fdf52e4b5ac3fb626aa6783ee0e51
--- /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 0000000000000000000000000000000000000000..27a1ba251fb026b73f0beb701424e01408da9c96
--- /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 0000000000000000000000000000000000000000..1274b3c7b2a788fa7019d52d2206ad60c6aec935
--- /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 tpm-2.0-crb.cfg
diff --git a/features/tpm/tpm-2.0.cfg b/features/tpm/tpm-2.0.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..9f427afacc98291e333c697b6f8ed61ec1e7ae73
--- /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 0000000000000000000000000000000000000000..83440f8b1c3422ccc8c8335774a207a6afd881e1
--- /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 tpm-2.0.cfg
diff --git a/features/tpm/tpm-common.cfg b/features/tpm/tpm-common.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..7e2ea6c12ac1e7afd05faa4b6cff8c2a3423bbe0
--- /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 0000000000000000000000000000000000000000..31a070c04f96c28636b20bde6684a9b3e97caa96
--- /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 ea10c1fb37b42b24bfb95d7c09cb66392f07e66a..0000000000000000000000000000000000000000
--- 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 a143548008e255486d2c4ee8ae5ae5f4f67ead7b..1f3ba9cf43d488c4a990fca3549b555d542ed5ca 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 0000000000000000000000000000000000000000..eeb58e96876f8e0d00a16aa13d96976dee114a49
--- /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 0000000000000000000000000000000000000000..e927ffb67ea58e694c0fae6b358e3cd4a312b418
--- /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
diff --git a/features/tun/tun.cfg b/features/tun/tun.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..b45d3e9b637b4368c4f4bc5e220c8890474b57d0
--- /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 0000000000000000000000000000000000000000..5a4cc3bc4232677bb1e0a8ff86d59897bc722ed2
--- /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
diff --git a/features/usb/usb-dummy-hcd.cfg b/features/usb/usb-dummy-hcd.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..ab7c21435d0cd5a84d500a08a57036f1f5876a44
--- /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 0000000000000000000000000000000000000000..6684ed9c433b21a265a2479f21dfc47e9cf750c1
--- /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
diff --git a/features/usb/usb-raw-gadget.cfg b/features/usb/usb-raw-gadget.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..6e169ab51c0d9fdca1e9b3d890d399ac9840b359
--- /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 0000000000000000000000000000000000000000..9f0c2eb8c1e7cba9769564ddfe7f64cdab143934
--- /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
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 0000000000000000000000000000000000000000..e0022e555296b8b20dbf71250b6e687cb87611a9
--- /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 a558a3db554ce14b5ca6a796647514fa4a125d13..be1247ffa4e7767d72972c1efc25ad1c15007043 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
diff --git a/features/zram/zram.cfg b/features/zram/zram.cfg
index 3174ae8605a988566c6f0d04bb1f5055545b9434..995ed8763c8bb32724848c516280c6929d3238cc 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
diff --git a/intel-x86-64-preempt-rt.cfg b/intel-x86-64-preempt-rt.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..9880d740d2d074190c3a12dd4f559552c2a1c985
--- /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
diff --git a/ktypes/base/base.cfg b/ktypes/base/base.cfg
index 84d53be20666cd8603bfd239aae9ad9f230d7389..e6350c60397ba510edd58b9e6fe617f8a112818b 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
diff --git a/ktypes/preempt-rt/preempt-rt.scc b/ktypes/preempt-rt/preempt-rt.scc
index 0b410474397a97e7997d49e7a76386c85d17b564..1361d466d3ced0ccb1c988f55f0e05c27c516578 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
diff --git a/kver b/kver
index aff05882d0625dc7e3f268eee674fd279d2b1ad7..ed218a16ec8bfbbf57c9f0d0482dfeb834bfcffe 100644
--- a/kver
+++ b/kver
@@ -1 +1 @@
-v5.10.61
+v5.10.152
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 0000000000000000000000000000000000000000..da04c927c5b1fe68b7d9777d0977d9939e688939
--- /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 37d583311de2ba922178924cba3a683d0b21f1ea..0ce6879edb855d4bd951397043d0536964c09421 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