slinux.mk, slinux: Drop use/slinux/arm-base, pruning

conf.d/slinux.mk

@@ -16,17 +16,19 @@ distro/slinux: distro/.installer use/slinux/full use/rescue/base
 endif
 
 ifeq (vm,$(IMAGE_CLASS))
-ifeq (,$(filter-out aarch64 armh,$(ARCH)))
-vm/slinux: use/slinux/vm-base use/slinux/arm-base; @:
+vm/slinux:: use/slinux/vm-base; @:
 
-vm/slinux-rpi: vm/slinux use/arm-rpi4/full; @:
+ifeq (,$(filter-out aarch64 armh riscv64,$(ARCH)))
+vm/slinux:: use/uboot
+	@$(call add,BASE_LISTS,uboot)
+endif
 
-ifeq (,$(filter-out aarch64,$(ARCH)))
-vm/slinux-tegra: use/slinux/vm-base use/slinux/arm-base \
-	use/aarch64-tegra; @:
+ifeq (,$(filter-out aarch64 armh,$(ARCH)))
+vm/slinux-rpi: use/slinux/vm-base use/arm-rpi4/full; @:
 endif
 
-else
-vm/slinux: use/slinux/vm-base; @:
+ifeq (,$(filter-out aarch64,$(ARCH)))
+vm/slinux-tegra: use/slinux/vm-base use/aarch64-tegra; @:
 endif
+
 endif

features.in/slinux/config.mk

@@ -44,10 +44,8 @@ use/slinux/services-disabled:
 
 use/slinux/services: use/slinux/services-enabled use/slinux/services-disabled
 
-use/slinux/arm-base: use/x11/armsoc use/bootloader/uboot
-
 ifeq (,$(filter-out riscv64,$(ARCH)))
-use/slinux/vm-base:: use/oem/vnc use/bootloader/uboot
+use/slinux/vm-base:: use/oem/vnc
 	@$(call set,KFLAVOURS,un-def)
 endif