diff --git a/supported.conf b/supported.conf
index 351f7d004b3..7a355f9ad4e 100644
--- a/supported.conf
+++ b/supported.conf
@@ -625,7 +625,7 @@
 -!optional			drivers/counter/ti-eqep
 				drivers/cpufreq/acpi-cpufreq					# x86 cpufreq driver used by all, if no specific one like intel_pstate
 				drivers/cpufreq/amd_freq_sensitivity				# AMD frequency sensitivity feedback to the ondemand governor
--!optional			drivers/cpufreq/apple-soc-cpufreq				# SP6-NEED-REVIEW
+-				drivers/cpufreq/apple-soc-cpufreq				# SP6-NEED-REVIEW
 -				drivers/cpufreq/armada-37xx-cpufreq
 -				drivers/cpufreq/armada-8k-cpufreq
 -				drivers/cpufreq/brcmstb-avs-cpufreq
@@ -757,7 +757,7 @@
 				drivers/devfreq/tegra30-devfreq
 -				drivers/dma/altera-msgdma
 -				drivers/dma/amd/qdma/amd-qdma
--!optional			drivers/dma/apple-admac						# SP6-NEED-REVIEW
+-				drivers/dma/apple-admac						# SP6-NEED-REVIEW
 -				drivers/dma/bcm-sba-raid
 				drivers/dma/bcm2835-dma
 -				drivers/dma/dma-axi-dmac
@@ -1477,7 +1477,7 @@
 				drivers/i2c/busses/i2c-amd756					# AMD756/766/768/8111 and nVidia nForce SMBus driver
 				drivers/i2c/busses/i2c-amd756-s4882				# SMBus multiplexing, Tyan S4882
 				drivers/i2c/busses/i2c-amd8111					# AMD8111 SMBus 2.0 driver
--!optional			drivers/i2c/busses/i2c-apple					# SP6-NEED-REVIEW
+-				drivers/i2c/busses/i2c-apple					# SP6-NEED-REVIEW
 -!optional			drivers/i2c/busses/i2c-aspeed					# armv7hl
 -!optional			drivers/i2c/busses/i2c-axxia					# armv7hl
 				drivers/i2c/busses/i2c-bcm-iproc
@@ -2406,7 +2406,7 @@
 -				drivers/interconnect/qcom/qnoc-x1e80100
 -				drivers/interconnect/samsung/exynos-interconnect
 				drivers/iommu/amd/iommu_v2					# AMD IOMMU v2 driver
--!optional			drivers/iommu/apple-dart					# SP6-NEED-REVIEW
+-				drivers/iommu/apple-dart					# SP6-NEED-REVIEW
 				drivers/iommu/iova						# SP6-NEED-REVIEW
 -				drivers/iommu/sprd-iommu
 				drivers/iommu/virtio-iommu					# jsc#SLE-12152, only for aarch64
@@ -3949,13 +3949,13 @@
 				drivers/nvdimm/of_pmem
 -				drivers/nvdimm/virtio_pmem
 				drivers/nvme/common/*						# fate#319965
--!optional			drivers/nvme/host/nvme-apple
+-				drivers/nvme/host/nvme-apple
 				drivers/nvme/host/*						# fate#319965
 				drivers/nvme/target/*						# fate#321732
 -				drivers/nvmem/layouts/onie-tlv					# SP6-NEED-REVIEW
 -				drivers/nvmem/layouts/sl28vpd					# SP6-NEED-REVIEW
 -				drivers/nvmem/layouts/u-boot-env
--!optional			drivers/nvmem/nvmem-apple-efuses				# SP6-NEED-REVIEW
+-				drivers/nvmem/nvmem-apple-efuses				# SP6-NEED-REVIEW
 -				drivers/nvmem/nvmem-bcm-ocotp
 -!optional			drivers/nvmem/nvmem-imx-iim
 -				drivers/nvmem/nvmem-imx-ocotp
@@ -3988,7 +3988,7 @@
 				drivers/pci/controller/dwc/pcie-tegra194
 +external			drivers/pci/controller/pci-hyperv
 +external			drivers/pci/controller/pci-hyperv-intf
--!optional			drivers/pci/controller/pcie-apple
+-				drivers/pci/controller/pcie-apple
 				drivers/pci/controller/pcie-brcmstb
 				drivers/pci/controller/pcie-iproc
 				drivers/pci/controller/pcie-iproc-platform
@@ -4893,9 +4893,9 @@
 -				drivers/slimbus/slim-qcom-ngd-ctrl
 				drivers/slimbus/slimbus
 -				drivers/soc/amlogic/meson-canvas
--!optional			drivers/soc/apple/apple-mailbox
--!optional			drivers/soc/apple/apple-rtkit					# SP6-NEED-REVIEW
--!optional			drivers/soc/apple/apple-sart					# SP6-NEED-REVIEW
+-				drivers/soc/apple/apple-mailbox
+-				drivers/soc/apple/apple-rtkit					# SP6-NEED-REVIEW
+-				drivers/soc/apple/apple-sart					# SP6-NEED-REVIEW
 -!optional			drivers/soc/aspeed/aspeed-lpc-ctrl				# armv7hl
 -!optional			drivers/soc/aspeed/aspeed-lpc-snoop				# armv7hl
 -!optional			drivers/soc/aspeed/aspeed-p2a-ctrl				# armv7hl
@@ -5448,7 +5448,7 @@
 				drivers/usb/image/microtek					# Microtek Scanmaker X6 USB scanner driver
 				drivers/usb/isp1760/isp1760
 -!optional			drivers/usb/misc/adutux
--!optional			drivers/usb/misc/apple-mfi-fastcharge
+-				drivers/usb/misc/apple-mfi-fastcharge
 -!optional			drivers/usb/misc/appledisplay
 -				drivers/usb/misc/brcmstb-usb-pinmap
 -				drivers/usb/misc/chaoskey					# we just cannot trust unverified external sources of entropy, see bnc#976355
@@ -5776,7 +5776,7 @@
 				drivers/watchdog/advantechwdt					# Advantech Single Board Computer WDT driver
 				drivers/watchdog/alim1535_wdt					# ALi M1535 PMU Watchdog Timer driver
 				drivers/watchdog/alim7101_wdt					# ALi M7101 PMU Computer Watchdog Timer driver
--!optional			drivers/watchdog/apple_wdt					# SP6-NEED-REVIEW
+-				drivers/watchdog/apple_wdt					# SP6-NEED-REVIEW
 -				drivers/watchdog/arm_smc_wdt
 -				drivers/watchdog/armada_37xx_wdt
 -				drivers/watchdog/atlas7_wdt					# armv7hl