7 files changed, 29 insertions, 47 deletions
diff --git a/bsp/qemuarma15/qemuarma15-gfx.cfg b/bsp/qemuarma15/qemuarma15-gfx.cfg
index 039bfae5..c3e36f0d 100644
--- a/bsp/qemuarma15/qemuarma15-gfx.cfg
+++ b/bsp/qemuarma15/qemuarma15-gfx.cfg
@@ -1,8 +1,6 @@
 # SPDX-License-Identifier: MIT
-CONFIG_INPUT_TABLET=y
-CONFIG_USB=y
+CONFIG_INPUT=y
 CONFIG_USB_HID=y
-CONFIG_USB_XHCI_HCD=y
 
-CONFIG_DRM=y
-CONFIG_DRM_BOCHS=y
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=y
diff --git a/bsp/qemuarma15/qemuarma15-preempt-rt.scc b/bsp/qemuarma15/qemuarma15-preempt-rt.scc
index 216757bb..f6a2a400 100644
--- a/bsp/qemuarma15/qemuarma15-preempt-rt.scc
+++ b/bsp/qemuarma15/qemuarma15-preempt-rt.scc
@@ -3,11 +3,10 @@ define KMACHINE qemuarma15
 define KTYPE preempt-rt
 define KARCH arm
 
-# no new branch required, re-use the ktypes/preempt-rt/preempt-rt.scc branch
 include ktypes/preempt-rt/preempt-rt.scc
 
-include cfg/virtio.scc
-include cfg/dmaengine.scc
-include cfg/timer/rtc.scc
 include qemuarma15.scc
 
+include features/pci/pci.scc
+# for emulated pci support
+include features/pci/pci-of-generic.scc
diff --git a/bsp/qemuarma15/qemuarma15-standard.scc b/bsp/qemuarma15/qemuarma15-standard.scc
index cdee6332..804e89d3 100644
--- a/bsp/qemuarma15/qemuarma15-standard.scc
+++ b/bsp/qemuarma15/qemuarma15-standard.scc
@@ -4,12 +4,9 @@ define KTYPE standard
 define KARCH arm
 
 include ktypes/standard/standard.scc
-# we aren't carrying patches specific to this platform, so let's
-# skip the branch for now.
-# branch qemuarma15
 
-include cfg/virtio.scc
-include cfg/dmaengine.scc
-include cfg/timer/rtc.scc
 include qemuarma15.scc
 
+include features/pci/pci.scc
+# for emulated pci support
+include features/pci/pci-of-generic.scc
diff --git a/bsp/qemuarma15/qemuarma15-tiny.cfg b/bsp/qemuarma15/qemuarma15-tiny.cfg
deleted file mode 100644
index ed47939f..00000000
--- a/bsp/qemuarma15/qemuarma15-tiny.cfg
+++ /dev/null
@@ -1,20 +0,0 @@
-# SPDX-License-Identifier: MIT
-CONFIG_MMU=y
-CONFIG_ARCH_MULTIPLATFORM=y
-CONFIG_ARCH_MULTI_V7=y
-
-CONFIG_ARM_AMBA=y
-
-CONFIG_ARM_THUMB=y
-CONFIG_KUSER_HELPERS=y
-CONFIG_OABI_COMPAT=y
-CONFIG_EXT4_FS=y
-
-# to keep things small, you really don't want these on. But to
-# keep qemuarm's hvc0 console happy, we have them on for now
-CONFIG_TTY=y
-CONFIG_VIRTIO_MENU=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_CONSOLE=y
-CONFIG_HVC_DRIVER=y
diff --git a/bsp/qemuarma15/qemuarma15-tiny.scc b/bsp/qemuarma15/qemuarma15-tiny.scc
index 406f8111..058f2ddc 100644
--- a/bsp/qemuarma15/qemuarma15-tiny.scc
+++ b/bsp/qemuarma15/qemuarma15-tiny.scc
@@ -4,14 +4,7 @@ define KTYPE tiny
 define KARCH arm
 
 include ktypes/tiny/tiny.scc
-# we aren't carrying patches specific to this platform, so let's
-# skip the branch for now.
-# branch qemuarma15
-
-include cfg/virtio.scc
-include cfg/dmaengine.scc
-include cfg/timer/rtc.scc
-include qemuarma15.scc
 
+include features/hid/hid.scc
 
-kconf hardware qemuarma15-tiny.cfg
+include qemuarma15.scc
diff --git a/bsp/qemuarma15/qemuarma15.cfg b/bsp/qemuarma15/qemuarma15.cfg
index 48c68617..3c40bd0a 100644
--- a/bsp/qemuarma15/qemuarma15.cfg
+++ b/bsp/qemuarma15/qemuarma15.cfg
@@ -1,13 +1,18 @@
 # SPDX-License-Identifier: MIT
+CONFIG_MMU=y
+CONFIG_ARCH_MULTIPLATFORM=y
+CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_VIRT=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=8
 CONFIG_CPU_IDLE=y
 CONFIG_ARM_CPUIDLE=y
+CONFIG_ARM_PATCH_PHYS_VIRT=y
 CONFIG_VFP=y
 CONFIG_VFPv3=y
 CONFIG_NEON=y
 CONFIG_KERNEL_MODE_NEON=y
+CONFIG_TTY=y
 CONFIG_SERIAL_AMBA_PL011=y
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_HW_RANDOM=y
@@ -16,7 +21,6 @@ CONFIG_SPI_PL022=y
 CONFIG_ARM_SP805_WATCHDOG=y
 CONFIG_RTC_DRV_PL031=y
 CONFIG_PL330_DMA=y
-CONFIG_ARM_CRYPTO=y
 CONFIG_CRYPTO_SHA1_ARM_NEON=y
 CONFIG_CRYPTO_SHA1_ARM_CE=y
 CONFIG_CRYPTO_SHA2_ARM_CE=y
@@ -28,5 +32,8 @@ CONFIG_CRYPTO_GHASH_ARM_CE=y
 CONFIG_CRYPTO_CRC32_ARM_CE=y
 CONFIG_CRYPTO_CHACHA20_NEON=y
 CONFIG_ARM_LPAE=y
-CONFIG_PCI=y
-CONFIG_PCI_HOST_GENERIC=y
+CONFIG_HIGHMEM=y
+CONFIG_ARM_AMBA=y
+CONFIG_ARM_THUMB=y
+
+CONFIG_FUNCTION_GRAPH_TRACER=n
diff --git a/bsp/qemuarma15/qemuarma15.scc b/bsp/qemuarma15/qemuarma15.scc
index 68d9e710..db49ee54 100644
--- a/bsp/qemuarma15/qemuarma15.scc
+++ b/bsp/qemuarma15/qemuarma15.scc
@@ -1,3 +1,11 @@
 # SPDX-License-Identifier: MIT
 kconf hardware qemuarma15.cfg
 kconf hardware qemuarma15-gfx.cfg
+
+include features/usb/xhci-hcd.scc
+include features/net/net.scc
+
+include cfg/virtio.scc
+include cfg/dmaengine.scc
+include cfg/timer/rtc.scc
+include cfg/net/mdio.scc