diff --git a/arch/arm/configs/zero-sugar_defconfig b/arch/arm/configs/zero-sugar_defconfig
index d621fa8f8e9a..c07bc509e078 100644
--- a/arch/arm/configs/zero-sugar_defconfig
+++ b/arch/arm/configs/zero-sugar_defconfig
@@ -153,6 +153,8 @@ CONFIG_USB_NET_CDC_EEM=m
 CONFIG_ATH6KL=m
 CONFIG_ATH6KL_SDIO=m
 CONFIG_BRCMFMAC=m
+CONFIG_BRCM_TRACING=y
+CONFIG_BRCMDBG=y
 CONFIG_HOSTAP=y
 CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_EVBUG=m
@@ -353,12 +355,7 @@ CONFIG_USB_CONFIGFS_MASS_STORAGE=y
 CONFIG_FSL_UTP=y
 CONFIG_USB_CONFIGFS_F_LB_SS=y
 CONFIG_USB_CONFIGFS_F_FS=y
-CONFIG_USB_ZERO=m
-CONFIG_USB_ETH=m
-CONFIG_USB_G_NCM=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_G_SERIAL=m
+CONFIG_USB_ETH=y
 CONFIG_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
@@ -435,6 +432,8 @@ CONFIG_NLS_ASCII=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_UTF8=y
+CONFIG_PRINTK_TIME=y
+CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DEBUG_FS=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_SCHED_DEBUG is not set