makefile: do not couple gpu to efi feature

This tweaks the `EFI=1` make option so that it doesn't automatically bring
along the `gpu` feature. Since `EFI` resets `FEATURE_FLAGS`, the test
for `GPU` and `SND` (not implied by `efi` rust feature) are evaluated
after.

Signed-off-by: Geoffrey Goodman <[email protected]>

Author: ggoodman

Makefile

@@ -27,9 +27,6 @@ ifeq ($(SEV),1)
     INIT_SRC += $(SNP_INIT_SRC)
 	BUILD_INIT = 0
 endif
-ifeq ($(GPU),1)
-    FEATURE_FLAGS += --features gpu
-endif
 ifeq ($(VIRGL_RESOURCE_MAP2),1)
 	FEATURE_FLAGS += --features virgl_resource_map2
 endif
@@ -39,14 +36,17 @@ endif
 ifeq ($(NET),1)
     FEATURE_FLAGS += --features net
 endif
+ifeq ($(EFI),1)
+    VARIANT = -efi
+    FEATURE_FLAGS := --features efi # EFI Implies blk and net
+    BUILD_INIT = 0
+endif
+ifeq ($(GPU),1)
+    FEATURE_FLAGS += --features gpu
+endif
 ifeq ($(SND),1)
     FEATURE_FLAGS += --features snd
 endif
-ifeq ($(EFI),1)
-	VARIANT = -efi
-	FEATURE_FLAGS := --features efi,gpu
-	BUILD_INIT = 0
-endif
 
 ifeq ($(TIMESYNC),1)
     INIT_DEFS += -D__TIMESYNC__