diff --git a/src/drivers/usb/Makefile.inc b/src/drivers/usb/Makefile.inc
index 6c46f04..181d1b5 100644
--- a/src/drivers/usb/Makefile.inc
+++ b/src/drivers/usb/Makefile.inc
@@ -2,3 +2,4 @@ romstage-$(CONFIG_USBDEBUG_IN_ROMSTAGE) += ehci_debug.c pci_ehci.c console.c gad
 postcar-$(CONFIG_USBDEBUG_IN_ROMSTAGE) += ehci_debug.c console.c
 
 ramstage-$(CONFIG_USBDEBUG) += ehci_debug.c pci_ehci.c console.c gadget.c
+smm-y += ehci_debug.c pci_ehci.c console.c gadget.c
diff --git a/src/include/console/usb.h b/src/include/console/usb.h
index 78956d7..a06aa1a 100644
--- a/src/include/console/usb.h
+++ b/src/include/console/usb.h
@@ -30,6 +30,7 @@ int usb_can_rx_byte(int idx);
 #define __CONSOLE_USB_ENABLE__	(IS_ENABLED(CONFIG_CONSOLE_USB) && \
 	((ENV_ROMSTAGE && IS_ENABLED(CONFIG_USBDEBUG_IN_ROMSTAGE)) || \
 	 (ENV_POSTCAR && IS_ENABLED(CONFIG_USBDEBUG_IN_ROMSTAGE)) || \
+	 (ENV_SMM && IS_ENABLED(CONFIG_DEBUG_SMI)) || \
 	 ENV_RAMSTAGE))
 
 #define USB_PIPE_FOR_CONSOLE 0