diff --git a/tool/run/depot.inc b/tool/run/depot.inc
index e71c62bb81..4fd774753e 100644
--- a/tool/run/depot.inc
+++ b/tool/run/depot.inc
@@ -466,34 +466,10 @@ proc check_for_missing_depot_archives { } {
 
 proc drivers_interactive_pkg { } {
 
-	if {[have_board linux]}     { return drivers_interactive-linux }
-	if {[have_board pc]}        { return drivers_interactive-pc }
-	if {[have_board pbxa9]}     { return drivers_interactive-pbxa9 }
-	if {[have_board imx53_qsb]} { return drivers_interactive-imx53_qsb }
 	if {[have_board imx53_qsb_tz]} { return drivers_interactive-imx53_qsb }
-	if {[have_board rpi]}       { return drivers_interactive-rpi }
-	if {[have_board imx8q_evk]} { return drivers_interactive-imx8q_evk }
-	if {[have_board panda]}     { return drivers_interactive-panda }
-	if {[have_board arndale]}   { return drivers_interactive-arndale }
 
-	puts stderr "drivers_interactive package undefined for this build configuration"
-	exit 1
+	return "drivers_interactive-[board]"
 }
 
 
-proc drivers_nic_pkg { } {
-
-	if {[have_board pc]}              { return drivers_nic-pc              }
-	if {[have_board linux]}           { return drivers_nic-linux           }
-	if {[have_board pbxa9]}           { return drivers_nic-pbxa9           }
-	if {[have_board rpi]}             { return drivers_nic-rpi             }
-	if {[have_board zynq_qemu]}       { return drivers_nic-zynq            }
-	if {[have_board imx53_qsb]}       { return drivers_nic-imx53_qsb       }
-	if {[have_board imx6q_sabrelite]} { return drivers_nic-imx6q_sabrelite }
-	if {[have_board imx7d_sabre]}     { return drivers_nic-imx7d_sabre     }
-	if {[have_board imx8q_evk]}       { return drivers_nic-imx8q_evk       }
-	if {[have_board virt_qemu]}       { return drivers_nic-virt_qemu       }
-
-	puts stderr "drivers_nic package undefined for this build configuration"
-	exit 1
-}
+proc drivers_nic_pkg { } { return "drivers_nic-[board]" }