diff --git a/arch/arm/configs/bruno_gfhd254_defconfig b/arch/arm/configs/bruno_gfhd254_defconfig
index 278e318..f324fe7 100644
--- a/arch/arm/configs/bruno_gfhd254_defconfig
+++ b/arch/arm/configs/bruno_gfhd254_defconfig
@@ -22,7 +22,6 @@
 CONFIG_ARCH_BCM=y
 CONFIG_ARCH_BRCMSTB=y
 CONFIG_BCM7439B0=y
-# CONFIG_BRCM_MOCA is not set
 CONFIG_ARM_LPAE=y
 CONFIG_PCI=y
 CONFIG_PCI_MSI=y
@@ -43,7 +42,6 @@
 CONFIG_CPU_IDLE=y
 CONFIG_VFP=y
 CONFIG_NEON=y
-CONFIG_PM_RUNTIME=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
@@ -112,7 +110,6 @@
 CONFIG_MTD_SPI_NOR=y
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_GLUEBI=y
-CONFIG_PROC_DEVICETREE=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192
@@ -120,10 +117,7 @@
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SR=y
 CONFIG_CHR_DEV_SG=y
-CONFIG_SCSI_MULTI_LUN=y
 CONFIG_ATA=y
-CONFIG_SATA_AHCI_PLATFORM=y
-CONFIG_SATA_BRCMSTB=y
 CONFIG_MD=y
 CONFIG_BLK_DEV_DM=y
 CONFIG_DM_VERITY=y
@@ -186,6 +180,7 @@
 CONFIG_SERIAL_8250_DW=y
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_HW_RANDOM=y
+# CONFIG_BRCM_MOCA is not set
 CONFIG_I2C_CHARDEV=y
 CONFIG_SPI=y
 CONFIG_SPI_BITBANG=y
@@ -225,15 +220,13 @@
 CONFIG_MMC_BLOCK_MINORS=64
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
+# CONFIG_IOMMU_SUPPORT is not set
 CONFIG_BRCMSTB_BMEM=y
 CONFIG_BRCMSTB_CMA=y
-CONFIG_BRCMSTB_MEMORY_API=y
 CONFIG_BRCMSTB_SRPD=y
 CONFIG_BRCMSTB_WKTMR=y
 CONFIG_BRCMSTB_NEXUS_API=y
-# CONFIG_IOMMU_SUPPORT is not set
 CONFIG_RESET_CONTROLLER=y
-CONFIG_GENERIC_PHY=y
 CONFIG_EXT4_FS=y
 CONFIG_JBD2_DEBUG=y
 CONFIG_FUSE_FS=y
@@ -273,7 +266,6 @@
 CONFIG_PANIC_ON_OOPS=y
 CONFIG_DEBUG_USER=y
 CONFIG_DEBUG_LL=y
-CONFIG_DEBUG_BRCMSTB_UART=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_CMAC=y