[7/7] UBUNTU: [Config] updateconfigs

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index bc955e4..c185910 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -6,16 +6,10 @@  CONFIG_AC97_BUS=m
 CONFIG_ACPI_BLACKLIST_YEAR=0
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
 CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
-CONFIG_ARCH_KEYSTONE=y
 # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
-CONFIG_ARCH_OMAP3=y
-CONFIG_ARCH_OMAP4=y
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_ARCH_ROCKCHIP=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_STI=y
-CONFIG_ARCH_WM8850=y
 # CONFIG_ASYNC_TX_DMA is not set
 CONFIG_AUDIT_ARCH=y
 CONFIG_BCH=m
@@ -31,7 +25,6 @@  CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_FILLRECT=m
 CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FONTS is not set
-CONFIG_FORCE_MAX_ZONEORDER=12
 CONFIG_FUNCTION_TRACER=y
 CONFIG_GPIO_GENERIC=m
 # CONFIG_HAVE_AOUT is not set
@@ -57,7 +50,6 @@  CONFIG_MTD_NAND=m
 CONFIG_MTD_NAND_BCH=m
 CONFIG_MTD_NAND_ECC=m
 CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_OMAP_BCH8=y
 CONFIG_MTD_SM_COMMON=m
 CONFIG_MUSB_PIO_ONLY=y
 CONFIG_NL80211_TESTMODE=y
@@ -65,7 +57,6 @@  CONFIG_NOP_USB_XCEIV=m
 # CONFIG_NO_HZ_IDLE is not set
 CONFIG_NR_CPUS=256
 CONFIG_OMAP_CONTROL_USB=m
-CONFIG_OMAP_PM_NOOP=y
 CONFIG_OUTPUT_FORMAT="elf64-x86-64"
 CONFIG_PCCARD=m
 CONFIG_PHYS_ADDR_T_64BIT=y
@@ -94,12 +85,8 @@  CONFIG_SND_SOC=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 CONFIG_SND_SOC_SGTL5000=m
-CONFIG_SND_SOC_TWL4030=y
 CONFIG_SND_SOC_TWL6040=m
 CONFIG_SND_TIMER=m
-CONFIG_SOC_AM33XX=y
-CONFIG_SOC_AM43XX=y
-CONFIG_SOC_OMAP5=y
 CONFIG_SOUND=m
 CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPI_PXA2XX_PCI=m
@@ -113,7 +100,6 @@  CONFIG_USB_GADGET=m
 CONFIG_USB_HCD_BCMA=m
 CONFIG_USB_HCD_SSB=m
 CONFIG_USB_MUSB_HDRC=m
-CONFIG_USB_MUSB_OMAP2PLUS=m
 CONFIG_USB_MUSB_TUSB6010=m
 CONFIG_USB_OHCI_HCD_PLATFORM=y
 CONFIG_VFIO_IOMMU_TYPE1=m
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 36be762..18d2b43 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -1,12 +1,8 @@ 
 #
 # Config options for config.common.armhf automatically generated by splitconfig.pl
 #
-# CONFIG_ARCH_KEYSTONE is not set
-# CONFIG_ARCH_ROCKCHIP is not set
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
-# CONFIG_ARCH_STI is not set
-# CONFIG_ARCH_WM8850 is not set
 CONFIG_ASYNC_TX_DMA=y
 CONFIG_BCH=y
 # CONFIG_CPU_FREQ is not set
@@ -17,7 +13,6 @@  CONFIG_FB_SYS_COPYAREA=y
 CONFIG_FB_SYS_FILLRECT=y
 CONFIG_FB_SYS_IMAGEBLIT=y
 CONFIG_FONTS=y
-CONFIG_FORCE_MAX_ZONEORDER=11
 # CONFIG_FUNCTION_TRACER is not set
 CONFIG_HAVE_AOUT=y
 # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
@@ -68,9 +63,6 @@  CONFIG_SND_PCM=y
 CONFIG_SND_SOC=y
 CONFIG_SND_SOC_I2C_AND_SPI=y
 CONFIG_SND_TIMER=y
-# CONFIG_SOC_AM33XX is not set
-# CONFIG_SOC_AM43XX is not set
-# CONFIG_SOC_OMAP5 is not set
 CONFIG_SOUND=y
 # CONFIG_STACK_TRACER is not set
 CONFIG_STANDALONE=y
diff --git a/debian.master/config/armhf/config.flavour.generic b/debian.master/config/armhf/config.flavour.generic
index 333b200..3f1b90c 100644
--- a/debian.master/config/armhf/config.flavour.generic
+++ b/debian.master/config/armhf/config.flavour.generic
@@ -16,10 +16,8 @@  CONFIG_FB_DDC=m
 CONFIG_FB_SVGALIB=m
 CONFIG_GPIO_GENERIC=y
 # CONFIG_HUGETLB_PAGE is not set
-CONFIG_MTD_NAND_OMAP_BCH8=y
 CONFIG_MTD_SM_COMMON=m
 # CONFIG_MUSB_PIO_ONLY is not set
-CONFIG_OMAP_PM_NOOP=y
 CONFIG_PCI_SYSCALL=y
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_SND_EMU10K1_SEQ=m
@@ -30,7 +28,5 @@  CONFIG_SND_SOC_TWL4030=y
 CONFIG_SND_SOC_TWL6040=y
 CONFIG_SPI_PXA2XX_PCI=m
 CONFIG_TEGRA_HOST1X=m
-CONFIG_USB_INVENTRA_DMA=y
-CONFIG_USB_MUSB_OMAP2PLUS=m
 CONFIG_VGASTATE=m
 CONFIG_VIRTIO=y
diff --git a/debian.master/config/armhf/config.flavour.generic-lpae b/debian.master/config/armhf/config.flavour.generic-lpae
index 4894999..ee29378 100644
--- a/debian.master/config/armhf/config.flavour.generic-lpae
+++ b/debian.master/config/armhf/config.flavour.generic-lpae
@@ -16,10 +16,8 @@  CONFIG_COMPACTION=y
 # CONFIG_FB_SVGALIB is not set
 CONFIG_GPIO_GENERIC=m
 CONFIG_HUGETLB_PAGE=y
-# CONFIG_MTD_NAND_OMAP_BCH8 is not set
 # CONFIG_MTD_SM_COMMON is not set
 CONFIG_MUSB_PIO_ONLY=y
-# CONFIG_OMAP_PM_NOOP is not set
 # CONFIG_PCI_SYSCALL is not set
 CONFIG_PHYS_ADDR_T_64BIT=y
 # CONFIG_SND_EMU10K1_SEQ is not set
@@ -30,7 +28,5 @@  CONFIG_SND_SOC_TWL4030=m
 CONFIG_SND_SOC_TWL6040=m
 # CONFIG_SPI_PXA2XX_PCI is not set
 # CONFIG_TEGRA_HOST1X is not set
-# CONFIG_USB_INVENTRA_DMA is not set
-# CONFIG_USB_MUSB_OMAP2PLUS is not set
 # CONFIG_VGASTATE is not set
 CONFIG_VIRTIO=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 8310a6c..9e7de96 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -264,6 +264,7 @@  CONFIG_ARCH_HIGHBANK=y
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_KEYSTONE is not set
 # CONFIG_ARCH_KIRKWOOD is not set
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_LPC32XX is not set
@@ -289,6 +290,7 @@  CONFIG_ARCH_PROC_KCORE_TEXT=y
 CONFIG_ARCH_RANDOM=y
 # CONFIG_ARCH_REALVIEW is not set
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
+# CONFIG_ARCH_ROCKCHIP is not set
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_S3C24XX is not set
 # CONFIG_ARCH_S3C64XX is not set
@@ -301,6 +303,7 @@  CONFIG_ARCH_REQUIRE_GPIOLIB=y
 # CONFIG_ARCH_SIRF is not set
 # CONFIG_ARCH_SOCFPGA is not set
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
+# CONFIG_ARCH_STI is not set
 # CONFIG_ARCH_SUNXI is not set
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
@@ -322,7 +325,6 @@  CONFIG_ARCH_VEXPRESS_CA9X4=y
 CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
 CONFIG_ARCH_VEXPRESS_DCSCB=y
 CONFIG_ARCH_VIRT=y
-CONFIG_ARCH_VT8500=y
 # CONFIG_ARCH_W90X900 is not set
 CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y
 CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
@@ -332,6 +334,7 @@  CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+# CONFIG_ARCH_WM8850 is not set
 # CONFIG_ARCH_ZYNQ is not set
 CONFIG_ARCNET=m
 CONFIG_ARCNET_1051=m
@@ -365,7 +368,6 @@  CONFIG_ARM_ERRATA_764369=y
 CONFIG_ARM_ERRATA_775420=y
 CONFIG_ARM_ERRATA_798181=y
 CONFIG_ARM_GIC=y
-CONFIG_ARM_GLOBAL_TIMER=y
 CONFIG_ARM_KPROBES_TEST=m
 CONFIG_ARM_L1_CACHE_SHIFT=6
 CONFIG_ARM_L1_CACHE_SHIFT_6=y
@@ -913,7 +915,6 @@  CONFIG_CLEANCACHE=y
 CONFIG_CLKBLD_I8253=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKEVT_I8253=y
-CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y
 CONFIG_CLKSRC_I8253=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_CLKSRC_OF=y
@@ -1684,7 +1685,6 @@  CONFIG_DVB_ZL10036=m
 CONFIG_DVB_ZL10039=m
 CONFIG_DVB_ZL10353=m
 CONFIG_DW_APB_TIMER=y
-CONFIG_DW_APB_TIMER_OF=y
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC_PCI=m
@@ -1924,10 +1924,7 @@  CONFIG_FB_VIA=m
 CONFIG_FB_VIA_X_COMPATIBILITY=y
 # CONFIG_FB_VIRTUAL is not set
 CONFIG_FB_VOODOO1=m
-CONFIG_FB_VT8500=y
 CONFIG_FB_VT8623=m
-CONFIG_FB_WM8505=y
-CONFIG_FB_WMT_GE_ROPS=y
 CONFIG_FB_XGI=m
 CONFIG_FCOE=m
 CONFIG_FCOE_FNIC=m
@@ -1969,6 +1966,7 @@  CONFIG_FONT_ACORN_8x8=y
 # CONFIG_FONT_SUN8x16 is not set
 CONFIG_FONT_SUPPORT=y
 CONFIG_FORCEDETH=m
+CONFIG_FORCE_MAX_ZONEORDER=11
 # CONFIG_FPE_FASTFPE is not set
 CONFIG_FPE_NWFPE=y
 # CONFIG_FPE_NWFPE_XP is not set
@@ -2473,7 +2471,6 @@  CONFIG_I2C_MUX_GPIO=m
 CONFIG_I2C_MUX_PCA9541=m
 CONFIG_I2C_MUX_PCA954x=m
 CONFIG_I2C_MUX_PINCTRL=m
-CONFIG_I2C_MV64XXX=m
 CONFIG_I2C_NFORCE2=m
 CONFIG_I2C_NFORCE2_S4985=m
 CONFIG_I2C_NOMADIK=m
@@ -2501,7 +2498,6 @@  CONFIG_I2C_VERSATILE=m
 CONFIG_I2C_VIA=m
 CONFIG_I2C_VIAPRO=m
 CONFIG_I2C_VIPERBOARD=m
-CONFIG_I2C_WMT=m
 CONFIG_I2C_XILINX=m
 CONFIG_I2O=m
 CONFIG_I2O_BLOCK=m
@@ -3354,7 +3350,6 @@  CONFIG_MDIO_BUS_MUX=y
 CONFIG_MDIO_BUS_MUX_GPIO=y
 CONFIG_MDIO_BUS_MUX_MMIOREG=y
 CONFIG_MDIO_GPIO=y
-CONFIG_MDIO_SUN4I=m
 CONFIG_MD_AUTODETECT=y
 CONFIG_MD_FAULTY=m
 CONFIG_MD_LINEAR=m
@@ -3575,7 +3570,6 @@  CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_RICOH_MMC=y
 CONFIG_MMC_SDHCI_ACPI=m
-CONFIG_MMC_SDHCI_BCM_KONA=m
 CONFIG_MMC_SDHCI_ESDHC_IMX=y
 CONFIG_MMC_SDHCI_IO_ACCESSORS=y
 CONFIG_MMC_SDHCI_PCI=m
@@ -3593,7 +3587,6 @@  CONFIG_MMC_USHC=m
 CONFIG_MMC_VIA_SDMMC=m
 CONFIG_MMC_VUB300=m
 CONFIG_MMC_WBSD=m
-CONFIG_MMC_WMT=m
 CONFIG_MMIOTRACE=y
 # CONFIG_MMIOTRACE_TEST is not set
 CONFIG_MMU=y
@@ -3714,6 +3707,7 @@  CONFIG_MTD_NAND_NANDSIM=m
 CONFIG_MTD_NAND_OMAP2=y
 CONFIG_MTD_NAND_OMAP_BCH=y
 # CONFIG_MTD_NAND_OMAP_BCH4 is not set
+CONFIG_MTD_NAND_OMAP_BCH8=y
 CONFIG_MTD_NAND_PLATFORM=m
 CONFIG_MTD_NAND_RICOH=m
 CONFIG_MTD_NAND_TMIO=m
@@ -4000,7 +3994,6 @@  CONFIG_NET_TULIP=y
 CONFIG_NET_VENDOR_3COM=y
 CONFIG_NET_VENDOR_8390=y
 CONFIG_NET_VENDOR_ADAPTEC=y
-CONFIG_NET_VENDOR_ALLWINNER=y
 CONFIG_NET_VENDOR_ALTEON=y
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_NET_VENDOR_ARC=y
@@ -4264,7 +4257,6 @@  CONFIG_OMAP3_EMU=y
 CONFIG_OMAP4_DSS_HDMI=y
 CONFIG_OMAP4_DSS_HDMI_AUDIO=y
 CONFIG_OMAP4_THERMAL=y
-CONFIG_OMAP5_THERMAL=y
 CONFIG_OMAP_32K_TIMER=y
 CONFIG_OMAP_DM_TIMER=y
 CONFIG_OMAP_INTERCONNECT=y
@@ -4279,6 +4271,7 @@  CONFIG_OMAP_OCP2SCP=m
 CONFIG_OMAP_PACKAGE_CBB=y
 CONFIG_OMAP_PACKAGE_CBP=y
 CONFIG_OMAP_PACKAGE_CUS=y
+CONFIG_OMAP_PM_NOOP=y
 CONFIG_OMAP_REMOTEPROC=m
 CONFIG_OMAP_RESET_CLOCKS=y
 CONFIG_OMAP_USB2=y
@@ -4505,17 +4498,12 @@  CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX=y
 CONFIG_PINCTRL_IMX6Q=y
 CONFIG_PINCTRL_IMX6SL=y
-CONFIG_PINCTRL_ROCKCHIP=y
 CONFIG_PINCTRL_SINGLE=m
-CONFIG_PINCTRL_ST=y
-CONFIG_PINCTRL_SUNXI=y
 CONFIG_PINCTRL_TEGRA=y
 CONFIG_PINCTRL_TEGRA114=y
 CONFIG_PINCTRL_TEGRA20=y
 CONFIG_PINCTRL_TEGRA30=y
 CONFIG_PINCTRL_VF610=y
-CONFIG_PINCTRL_WM8850=y
-CONFIG_PINCTRL_WMT=y
 CONFIG_PINMUX=y
 CONFIG_PL310_ERRATA_588369=y
 CONFIG_PL310_ERRATA_727915=y
@@ -4622,12 +4610,8 @@  CONFIG_PWM=y
 CONFIG_PWM_PCA9685=m
 CONFIG_PWM_SYSFS=y
 CONFIG_PWM_TEGRA=m
-CONFIG_PWM_TIECAP=m
-CONFIG_PWM_TIEHRPWM=m
-CONFIG_PWM_TIPWMSS=y
 CONFIG_PWM_TWL=m
 CONFIG_PWM_TWL_LED=m
-CONFIG_PWM_VT8500=m
 CONFIG_QFMT_V1=m
 CONFIG_QFMT_V2=m
 CONFIG_QLA3XXX=m
@@ -4896,7 +4880,6 @@  CONFIG_RTC_DRV_MAX8998=m
 CONFIG_RTC_DRV_MC13XXX=m
 CONFIG_RTC_DRV_MSM6242=m
 # CONFIG_RTC_DRV_MXC is not set
-CONFIG_RTC_DRV_OMAP=m
 CONFIG_RTC_DRV_PALMAS=m
 CONFIG_RTC_DRV_PCAP=m
 CONFIG_RTC_DRV_PCF2123=m
@@ -4927,7 +4910,6 @@  CONFIG_RTC_DRV_TPS80031=m
 CONFIG_RTC_DRV_TWL4030=y
 CONFIG_RTC_DRV_V3020=m
 CONFIG_RTC_DRV_VRTC=m
-CONFIG_RTC_DRV_VT8500=m
 CONFIG_RTC_DRV_WM831X=m
 CONFIG_RTC_DRV_WM8350=m
 CONFIG_RTC_DRV_X1205=m
@@ -5389,8 +5371,6 @@  CONFIG_SERIAL_SCCNXP_CONSOLE=y
 CONFIG_SERIAL_TEGRA=m
 CONFIG_SERIAL_TIMBERDALE=m
 CONFIG_SERIAL_UARTLITE=m
-CONFIG_SERIAL_VT8500=y
-CONFIG_SERIAL_VT8500_CONSOLE=y
 CONFIG_SERIAL_XILINX_PS_UART=m
 CONFIG_SERIO=y
 CONFIG_SERIO_ALTERA_PS2=m
@@ -5814,6 +5794,8 @@  CONFIG_SND_VX_LIB=m
 CONFIG_SND_WAVEFRONT=m
 CONFIG_SND_WSS_LIB=m
 CONFIG_SND_YMFPCI=m
+# CONFIG_SOC_AM33XX is not set
+# CONFIG_SOC_AM43XX is not set
 CONFIG_SOC_BUS=y
 CONFIG_SOC_CAMERA=m
 CONFIG_SOC_CAMERA_IMX074=m
@@ -5833,13 +5815,11 @@  CONFIG_SOC_CAMERA_RJ54N1=m
 CONFIG_SOC_CAMERA_SCALE_CROP=m
 CONFIG_SOC_CAMERA_TW9910=m
 CONFIG_SOC_HAS_OMAP2_SDRC=y
-CONFIG_SOC_HAS_REALTIME_COUNTER=y
 # CONFIG_SOC_IMX53 is not set
 CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
 CONFIG_SOC_OMAP3430=y
-CONFIG_SOC_STIH415=y
-CONFIG_SOC_STIH416=y
+# CONFIG_SOC_OMAP5 is not set
 CONFIG_SOC_TI81XX=y
 CONFIG_SOC_VF610=y
 CONFIG_SOFT_WATCHDOG=m
@@ -5949,8 +5929,6 @@  CONFIG_STOP_MACHINE=y
 CONFIG_STP=m
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_STRIP_ASM_SYMS is not set
-CONFIG_SUN4I_EMAC=m
-CONFIG_SUN4I_TIMER=y
 CONFIG_SUNDANCE=m
 # CONFIG_SUNDANCE_MMIO is not set
 CONFIG_SUNGEM=m
@@ -6079,7 +6057,6 @@  CONFIG_TIPC_MEDIA_IB=y
 CONFIG_TIPC_PORTS=8191
 CONFIG_TI_ADC081C=m
 CONFIG_TI_AM335X_ADC=m
-# CONFIG_TI_CPSW is not set
 CONFIG_TI_DAC7512=m
 CONFIG_TI_DAVINCI_CPDMA=m
 CONFIG_TI_DAVINCI_EMAC=m
@@ -6412,6 +6389,7 @@  CONFIG_USB_HSO=m
 CONFIG_USB_HWA_HCD=m
 CONFIG_USB_IDMOUSE=m
 # CONFIG_USB_IMX21_HCD is not set
+CONFIG_USB_INVENTRA_DMA=y
 CONFIG_USB_IOWARRIOR=m
 CONFIG_USB_IPHETH=m
 CONFIG_USB_IRDA=m
@@ -6444,6 +6422,7 @@  CONFIG_USB_MR800=m
 CONFIG_USB_MUSB_DUAL_ROLE=y
 # CONFIG_USB_MUSB_GADGET is not set
 # CONFIG_USB_MUSB_HOST is not set
+CONFIG_USB_MUSB_OMAP2PLUS=m
 CONFIG_USB_MUSB_UX500=m
 CONFIG_USB_MV_U3D=m
 CONFIG_USB_MV_UDC=m
@@ -6608,8 +6587,6 @@  CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_U132_HCD=m
 CONFIG_USB_UEAGLEATM=m
 CONFIG_USB_UHCI_HCD=y
-CONFIG_USB_UHCI_PLATFORM=y
-CONFIG_USB_UHCI_SUPPORT_NON_PCI_HC=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_USBNET=m
@@ -6853,7 +6830,6 @@  CONFIG_VSOCKETS=m
 CONFIG_VT=y
 CONFIG_VT6655=m
 CONFIG_VT6656=m
-CONFIG_VT8500_TIMER=y
 CONFIG_VT_CONSOLE=y
 CONFIG_VT_CONSOLE_SLEEP=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index dfa0fa0..4d432e6 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -6,15 +6,9 @@  CONFIG_AC97_BUS=m
 CONFIG_ACPI_BLACKLIST_YEAR=2000
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
 CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
-CONFIG_ARCH_KEYSTONE=y
 # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
-CONFIG_ARCH_OMAP3=y
-CONFIG_ARCH_OMAP4=y
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
-CONFIG_ARCH_ROCKCHIP=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_STI=y
-CONFIG_ARCH_WM8850=y
 CONFIG_ASYNC_TX_DMA=y
 # CONFIG_AUDIT_ARCH is not set
 CONFIG_BCH=m
@@ -30,7 +24,6 @@  CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_FILLRECT=m
 CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FONTS is not set
-CONFIG_FORCE_MAX_ZONEORDER=12
 CONFIG_FUNCTION_TRACER=y
 CONFIG_GPIO_GENERIC=m
 CONFIG_HAVE_AOUT=y
@@ -56,7 +49,6 @@  CONFIG_MTD_NAND=m
 CONFIG_MTD_NAND_BCH=m
 CONFIG_MTD_NAND_ECC=m
 CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_OMAP_BCH8=y
 CONFIG_MTD_SM_COMMON=m
 CONFIG_MUSB_PIO_ONLY=y
 CONFIG_NL80211_TESTMODE=y
@@ -64,7 +56,6 @@  CONFIG_NOP_USB_XCEIV=m
 CONFIG_NO_HZ_IDLE=y
 CONFIG_NR_CPUS=8
 CONFIG_OMAP_CONTROL_USB=m
-CONFIG_OMAP_PM_NOOP=y
 CONFIG_OUTPUT_FORMAT="elf32-i386"
 CONFIG_PCCARD=m
 CONFIG_PHYS_ADDR_T_64BIT=y
@@ -92,12 +83,8 @@  CONFIG_SND_SOC=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 CONFIG_SND_SOC_SGTL5000=m
-CONFIG_SND_SOC_TWL4030=y
 CONFIG_SND_SOC_TWL6040=m
 CONFIG_SND_TIMER=m
-CONFIG_SOC_AM33XX=y
-CONFIG_SOC_AM43XX=y
-CONFIG_SOC_OMAP5=y
 CONFIG_SOUND=m
 # CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_SPI_PXA2XX_PCI=m
@@ -111,7 +98,6 @@  CONFIG_USB_GADGET=m
 CONFIG_USB_HCD_BCMA=m
 CONFIG_USB_HCD_SSB=m
 CONFIG_USB_MUSB_HDRC=m
-CONFIG_USB_MUSB_OMAP2PLUS=m
 CONFIG_USB_MUSB_TUSB6010=m
 CONFIG_USB_OHCI_HCD_PLATFORM=y
 CONFIG_VFIO_IOMMU_TYPE1=m