Move the USB and VIRTIO GPU stuff out of gfx, as those should be handled in the usb and virtio scc files. Add the PCI scc for virtio (which thinks it's PCI on this QEMU setup), and add a tiny.scc/cfg to get tiny working.
Also, EARLY_PRINTK does not exist for arm64. So remove those from the common configs. Signed-off-by: Jon Mason <[email protected]> --- bsp/qemuarm64/qemuarm64-gfx.cfg | 9 +-------- bsp/qemuarm64/qemuarm64-preempt-rt.scc | 1 - bsp/qemuarm64/qemuarm64-standard.scc | 2 -- bsp/qemuarm64/qemuarm64-tiny.scc | 5 +---- bsp/qemuarm64/qemuarm64.cfg | 1 + bsp/qemuarm64/qemuarm64.scc | 5 +++++ features/debug/printk.cfg | 3 --- ktypes/tiny/yocto.cfg | 1 - 8 files changed, 8 insertions(+), 19 deletions(-) diff --git a/bsp/qemuarm64/qemuarm64-gfx.cfg b/bsp/qemuarm64/qemuarm64-gfx.cfg index 193ff9850d22..ceae36c5831f 100644 --- a/bsp/qemuarm64/qemuarm64-gfx.cfg +++ b/bsp/qemuarm64/qemuarm64-gfx.cfg @@ -1,11 +1,4 @@ # SPDX-License-Identifier: MIT -CONFIG_INPUT_TABLET=y -CONFIG_USB=y -CONFIG_USB_HID=y -CONFIG_USB_XHCI_HCD=y - -CONFIG_DRM=y -CONFIG_DRM_VIRTIO_GPU=y - +CONFIG_INPUT=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y diff --git a/bsp/qemuarm64/qemuarm64-preempt-rt.scc b/bsp/qemuarm64/qemuarm64-preempt-rt.scc index f2004be0e44a..8705450152f7 100644 --- a/bsp/qemuarm64/qemuarm64-preempt-rt.scc +++ b/bsp/qemuarm64/qemuarm64-preempt-rt.scc @@ -6,7 +6,6 @@ define KARCH arm64 # 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 qemuarm64.scc # enable the ability to run 32 bit apps diff --git a/bsp/qemuarm64/qemuarm64-standard.scc b/bsp/qemuarm64/qemuarm64-standard.scc index 361f4a20639f..17bc7bb60fa6 100644 --- a/bsp/qemuarm64/qemuarm64-standard.scc +++ b/bsp/qemuarm64/qemuarm64-standard.scc @@ -4,9 +4,7 @@ define KTYPE standard define KARCH arm64 include ktypes/standard/standard.scc -branch qemuarm64 -include cfg/virtio.scc include qemuarm64.scc # enable the ability to run 32 bit apps diff --git a/bsp/qemuarm64/qemuarm64-tiny.scc b/bsp/qemuarm64/qemuarm64-tiny.scc index 0ec933dc5d05..e4928b43416e 100644 --- a/bsp/qemuarm64/qemuarm64-tiny.scc +++ b/bsp/qemuarm64/qemuarm64-tiny.scc @@ -4,11 +4,8 @@ define KTYPE tiny define KARCH arm64 include ktypes/tiny/tiny.scc -branch qemuarm64 -include cfg/virtio.scc -include cfg/fs/ext4.scc include qemuarm64.scc # enable the ability to run 32 bit apps -include arch/arm/32bit-compat.scc \ No newline at end of file +include arch/arm/32bit-compat.scc diff --git a/bsp/qemuarm64/qemuarm64.cfg b/bsp/qemuarm64/qemuarm64.cfg index ef8d3ed023de..2412d24e6258 100644 --- a/bsp/qemuarm64/qemuarm64.cfg +++ b/bsp/qemuarm64/qemuarm64.cfg @@ -14,6 +14,7 @@ CONFIG_ARM_AMBA=y # # Non-8250 serial port support # +CONFIG_TTY=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y diff --git a/bsp/qemuarm64/qemuarm64.scc b/bsp/qemuarm64/qemuarm64.scc index dee5741eb2a1..f6c5d07318c9 100644 --- a/bsp/qemuarm64/qemuarm64.scc +++ b/bsp/qemuarm64/qemuarm64.scc @@ -1,3 +1,8 @@ # SPDX-License-Identifier: MIT kconf hardware qemuarm64.cfg kconf hardware qemuarm64-gfx.cfg + +include features/usb/xhci-hcd.scc +include features/net/net.scc +include features/pci/pci.scc +include cfg/virtio.scc diff --git a/features/debug/printk.cfg b/features/debug/printk.cfg index 0df20f914836..5beb425f73ae 100644 --- a/features/debug/printk.cfg +++ b/features/debug/printk.cfg @@ -5,8 +5,5 @@ CONFIG_PRINTK=y CONFIG_PRINTK_TIME=y -CONFIG_EARLY_PRINTK=y - -CONFIG_EARLY_PRINTK_DBGP=y CONFIG_EFI_EARLYCON=y CONFIG_TTY_PRINTK=y diff --git a/ktypes/tiny/yocto.cfg b/ktypes/tiny/yocto.cfg index 2e51a7d73c6e..e891070b83c4 100644 --- a/ktypes/tiny/yocto.cfg +++ b/ktypes/tiny/yocto.cfg @@ -20,7 +20,6 @@ CONFIG_RT_MUTEXES=y # Basic logging facilities CONFIG_PRINTK=y -CONFIG_EARLY_PRINTK=y CONFIG_PRINTK_TIME=y # Provide a minimal dynamic device fs -- 2.30.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#11116): https://lists.yoctoproject.org/g/linux-yocto/message/11116 Mute This Topic: https://lists.yoctoproject.org/mt/90161236/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
