diff --git a/arch/arm/configs/bruno_gfhd300_defconfig b/arch/arm/configs/bruno_gfhd300_defconfig
index 9b7b053..cabcbc1 100644
--- a/arch/arm/configs/bruno_gfhd300_defconfig
+++ b/arch/arm/configs/bruno_gfhd300_defconfig
@@ -24,7 +24,6 @@
 CONFIG_ARM_LPAE=y
 CONFIG_PCI=y
 CONFIG_PCI_MSI=y
-CONFIG_PCIEPORTBUS=y
 CONFIG_SMP=y
 CONFIG_ARM_PSCI=y
 CONFIG_AEABI=y
@@ -32,10 +31,8 @@
 CONFIG_HIGHPTE=y
 CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_CMA=y
-CONFIG_CMA_DEBUG=y
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
-CONFIG_KEXEC=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
@@ -45,27 +42,26 @@
 CONFIG_VFP=y
 CONFIG_NEON=y
 CONFIG_PM_RUNTIME=y
-CONFIG_PM_DEBUG=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_LRO is not set
-CONFIG_INET_UDP_DIAG=y
-# CONFIG_IPV6 is not set
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_IPV6=y
 CONFIG_BRIDGE=y
+CONFIG_VLAN_8021Q=y
+CONFIG_NET_SCHED=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_DEBUG_DRIVER=y
 CONFIG_DMA_CMA=y
 CONFIG_CMA_ALIGNMENT=12
 CONFIG_MTD=y
@@ -153,37 +149,32 @@
 CONFIG_HW_RANDOM=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_SPI=y
-CONFIG_SPI_DEBUG=y
 CONFIG_SPI_BITBANG=y
 CONFIG_GPIOLIB=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_POWER_RESET=y
 # CONFIG_HWMON is not set
 CONFIG_THERMAL=y
-CONFIG_CPU_THERMAL=y
 CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE=y
 CONFIG_THERMAL_GOV_STEP_WISE=y
-CONFIG_REGULATOR_DEBUG=y
+CONFIG_CPU_THERMAL=y
+CONFIG_INTEL_POWERCLAMP=y
+CONFIG_BRCMSTB_THERMAL=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_VIDEO_ADV_DEBUG=y
 CONFIG_MEDIA_USB_SUPPORT=y
 CONFIG_USB_GSPCA=y
 # CONFIG_VGA_ARB is not set
 CONFIG_SOUND=y
 CONFIG_SND=y
-CONFIG_SND_DEBUG=y
 CONFIG_SND_SOC=y
 CONFIG_USB=y
-CONFIG_USB_DEBUG=y
 CONFIG_USB_MON=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_STORAGE=y
-CONFIG_USB_STORAGE_DEBUG=y
 CONFIG_MMC=y
-CONFIG_MMC_DEBUG=y
 CONFIG_MMC_BLOCK_MINORS=16
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
@@ -226,20 +217,8 @@
 CONFIG_DEBUG_INFO_REDUCED=y
 CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_SECTION_MISMATCH=y
-CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
 CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_PAGEALLOC=y
-CONFIG_DEBUG_SLAB=y
-CONFIG_DEBUG_KMEMLEAK=y
-CONFIG_DEBUG_STACK_USAGE=y
-CONFIG_DEBUG_VM=y
-CONFIG_DEBUG_MEMORY_INIT=y
-CONFIG_DEBUG_PER_CPU_MAPS=y
-CONFIG_DEBUG_HIGHMEM=y
-CONFIG_DEBUG_SHIRQ=y
 CONFIG_LOCKUP_DETECTOR=y
-CONFIG_DEBUG_SPINLOCK=y
-CONFIG_DEBUG_MUTEXES=y
 CONFIG_DEBUG_USER=y
 CONFIG_DEBUG_LL=y
 CONFIG_DEBUG_BRCMSTB_UART=y