diff --git a/config/Config-build.in b/config/Config-build.in
index 79fbe71a434..cdc1b5d2bb7 100644
--- a/config/Config-build.in
+++ b/config/Config-build.in
@@ -103,9 +103,6 @@ menu "Global build settings"
 		  you can use this config option to enable it
 
 
-	config DISPLAY_SUPPORT
-		bool "Show packages that require graphics support (local or remote)"
-
 	config BUILD_PATENTED
 		bool "Compile with support for patented functionality"
 		help
diff --git a/include/target.mk b/include/target.mk
index dbeef2761f7..0f6258eee9f 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -327,9 +327,6 @@ ifeq ($(DUMP),1)
     ifneq ($(CONFIG_PCMCIA)$(CONFIG_PCCARD),)
       FEATURES += pcmcia
     endif
-    ifneq ($(CONFIG_VGA_CONSOLE)$(CONFIG_FB),)
-      FEATURES += display
-    endif
     ifneq ($(CONFIG_RTC_CLASS),)
       FEATURES += rtc
     endif
diff --git a/scripts/target-metadata.pl b/scripts/target-metadata.pl
index 6bee26eb7e6..92575cef871 100755
--- a/scripts/target-metadata.pl
+++ b/scripts/target-metadata.pl
@@ -10,11 +10,9 @@ sub target_config_features(@) {
 
 	while ($_ = shift @_) {
 		/^arm_v(\w+)$/ and $ret .= "\tselect arm_v$1\n";
-		/^audio$/ and $ret .= "\tselect AUDIO_SUPPORT\n";
 		/^boot-part$/ and $ret .= "\tselect USES_BOOT_PART\n";
 		/^broken$/ and $ret .= "\tdepends on BROKEN\n";
 		/^cpiogz$/ and $ret .= "\tselect USES_CPIOGZ\n";
-		/^display$/ and $ret .= "\tselect DISPLAY_SUPPORT\n";
 		/^dt$/ and $ret .= "\tselect USES_DEVICETREE\n";
 		/^dt-overlay$/ and $ret .= "\tselect HAS_DT_OVERLAY_SUPPORT\n";
 		/^emmc$/ and $ret .= "\tselect EMMC_SUPPORT\n";
diff --git a/target/Config.in b/target/Config.in
index bb45bcfa637..25984e99b7f 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -16,14 +16,10 @@ config HAS_FPU
 config HAS_DT_OVERLAY_SUPPORT
 	bool
 
-config AUDIO_SUPPORT
-	bool
-
 config GPIO_SUPPORT
 	bool
 
 config PCI_SUPPORT
-	select AUDIO_SUPPORT
 	bool
 
 config PCIE_SUPPORT
@@ -39,7 +35,6 @@ config PWM_SUPPORT
 	bool
 
 config USB_SUPPORT
-	select AUDIO_SUPPORT
 	bool
 
 config USB_GADGET_SUPPORT