From 03b0b30e0bce22b485a78cb87af9a5019adf66f9 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Oct 03 2016 06:41:45 +0000 Subject: ARM config cleanups, some minor general cleanups --- diff --git a/config-arm-generic b/config-arm-generic index daadf36..7a88c2d 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -22,6 +22,9 @@ CONFIG_CC_STACKPROTECTOR=y # CONFIG_ARM_BIG_LITTLE_CPUIDLE is not set # CONFIG_IWMMXT is not set +# https://fedoraproject.org/wiki/Features/Checkpoint_Restore +CONFIG_CHECKPOINT_RESTORE=y + CONFIG_ARM_CPUIDLE=y CONFIG_RESET_CONTROLLER=y @@ -115,6 +118,51 @@ CONFIG_CLKSRC_VERSATILE=y CONFIG_POWER_RESET_VERSATILE=y # CONFIG_ARM_CHARLCD is not set +# Broadcom +CONFIG_ARCH_BCM=y +CONFIG_ARCH_BCM2835=y +# CONFIG_ARCH_BCM_CYGNUS is not set +# CONFIG_ARCH_BCM_NSP is not set +# CONFIG_ARCH_BCM_5301X is not set +# CONFIG_ARCH_BCM_281XX is not set +# CONFIG_ARCH_BCM_21664 is not set +# CONFIG_ARCH_BCM_63XX is not set +# CONFIG_ARCH_BRCMSTB is not set +# CONFIG_ARCH_BERLIN is not set +# CONFIG_ARCH_BCM_CYGNUS is not set +# CONFIG_ARCH_BCM_NSP is not set +# CONFIG_ARCH_BCM_5301X is not set +# CONFIG_ARCH_BCM_281XX is not set +# CONFIG_ARCH_BCM_21664 is not set +# CONFIG_ARCH_BCM_63XX is not set +# CONFIG_ARCH_BCM_23550 is not set +# CONFIG_ARCH_BRCMSTB is not set +# CONFIG_ARCH_BERLIN is not set +# BCM 283x +CONFIG_SERIAL_8250_BCM2835AUX=y +CONFIG_DMA_BCM2835=m +CONFIG_MMC_SDHCI_IPROC=m +CONFIG_MMC_BCM2835_SDHOST=m +CONFIG_BCM2835_MBOX=y +CONFIG_PWM_BCM2835=m +CONFIG_HW_RANDOM_BCM2835=m +CONFIG_I2C_BCM2835=m +CONFIG_SPI_BCM2835=m +CONFIG_SPI_BCM2835AUX=m +CONFIG_BCM2835_WDT=m +CONFIG_SND_BCM2835_SOC_I2S=m +CONFIG_DRM_VC4=m +CONFIG_RASPBERRYPI_FIRMWARE=y +CONFIG_RASPBERRYPI_POWER=y +# popular digital audio HATs +CONFIG_SND_SOC_PCM512x=m +CONFIG_SND_SOC_PCM512x_I2C=m +CONFIG_SND_SOC_PCM512x_SPI=m +CONFIG_SND_SOC_TPA6130A2=m +CONFIG_SND_SOC_WM8804=m +CONFIG_SND_SOC_WM8804_I2C=m +CONFIG_SND_SOC_WM8804_SPI=m + # Marvell EBU CONFIG_ARCH_MVEBU=y CONFIG_SERIAL_MVEBU_UART=y @@ -158,7 +206,7 @@ CONFIG_SPI_ROCKCHIP=m CONFIG_PWM_ROCKCHIP=m CONFIG_ROCKCHIP_SARADC=m CONFIG_ROCKCHIP_IODOMAIN=m -CONFIG_MMC_DW_ROCKCHIP=m +CONFIG_MMC_DW_ROCKCHIP=y CONFIG_EMAC_ROCKCHIP=m CONFIG_MFD_RK808=m CONFIG_COMMON_CLK_RK808=m @@ -282,7 +330,6 @@ CONFIG_OF_OVERLAY=y CONFIG_OF_PCI_IRQ=m CONFIG_OF_PCI=m CONFIG_PCI_HOST_GENERIC=y -# CONFIG_PCIE_IPROC is not set CONFIG_OF_RESERVED_MEM=y CONFIG_OF_RESOLVE=y CONFIG_PM_GENERIC_DOMAINS_OF=y @@ -398,9 +445,9 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m # Designware (used by numerous devices) CONFIG_MMC_DW=m -CONFIG_MMC_DW_PLTFM=m -CONFIG_MMC_DW_K3=m -CONFIG_MMC_DW_PCI=m +CONFIG_MMC_DW_PLTFM=y +CONFIG_MMC_DW_K3=y +CONFIG_MMC_DW_PCI=y CONFIG_SPI_DW_MMIO=m CONFIG_SPI_DW_PCI=m # CONFIG_SPI_DW_MID_DMA is not set @@ -646,16 +693,13 @@ CONFIG_NET_VENDOR_MELLANOX=y # CONFIG_LATTICE_ECP3_CONFIG is not set # CONFIG_TI_DAC7512 is not set -# https://fedoraproject.org/wiki/Features/Checkpoint_Restore -CONFIG_CHECKPOINT_RESTORE=y - # Bad Intel shit we don't care about # CONFIG_PINCTRL_BAYTRAIL is not set # CONFIG_PINCTRL_CHERRYVIEW is not set # CONFIG_PINCTRL_BROXTON is not set # CONFIG_PINCTRL_SUNRISEPOINT is not set +# CONFIG_XILINX_ZYNQMP_DMA is not set -# CONFIG_HW_RANDOM_HISI is not set # CONFIG_HISILICON_IRQ_MBIGEN is not set # CONFIG_QRTR is not set diff --git a/config-arm64 b/config-arm64 index 46708ff..ae98cc5 100644 --- a/config-arm64 +++ b/config-arm64 @@ -11,7 +11,6 @@ CONFIG_ARCH_XGENE=y CONFIG_ARCH_THUNDER=y # CONFIG_ARCH_ALPINE is not set # CONFIG_ARCH_BCM_IPROC is not set -# CONFIG_ARCH_BCM2835 is not set # CONFIG_ARCH_BERLIN is not set # CONFIG_ARCH_EXYNOS is not set # CONFIG_ARCH_LAYERSCAPE is not set @@ -164,6 +163,7 @@ CONFIG_COMMON_CLK_HI6220=y CONFIG_PCI_HISI=y CONFIG_POWER_RESET_HISI=y CONFIG_HISI_THERMAL=m +CONFIG_HW_RANDOM_HISI=m CONFIG_STUB_CLK_HI6220=y CONFIG_REGULATOR_HI655X=m CONFIG_PHY_HI6220_USB=m @@ -315,5 +315,4 @@ CONFIG_DEBUG_SECTION_MISMATCH=y # CONFIG_FUJITSU_ES is not set # CONFIG_IMX_THERMAL is not set # CONFIG_PNP_DEBUG_MESSAGES is not set - # CONFIG_BCM_PDC_MBOX is not set diff --git a/config-armv7-generic b/config-armv7-generic index a0e5327..f1e544e 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -53,8 +53,6 @@ CONFIG_NR_CPUS=32 # CONFIG_DEBUG_ALIGN_RODATA is not set # Platforms enabled/disabled globally on ARMv7 -CONFIG_ARCH_BCM=y -CONFIG_ARCH_BCM2835=y CONFIG_ARCH_EXYNOS=y CONFIG_ARCH_HIGHBANK=y CONFIG_ARCH_SUNXI=y @@ -62,23 +60,6 @@ CONFIG_ARCH_TEGRA=y CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y CONFIG_ARCH_VIRT=y # CONFIG_ARCH_ARTPEC is not set -# CONFIG_ARCH_BCM_CYGNUS is not set -# CONFIG_ARCH_BCM_NSP is not set -# CONFIG_ARCH_BCM_5301X is not set -# CONFIG_ARCH_BCM_281XX is not set -# CONFIG_ARCH_BCM_21664 is not set -# CONFIG_ARCH_BCM_63XX is not set -# CONFIG_ARCH_BRCMSTB is not set -# CONFIG_ARCH_BERLIN is not set -# CONFIG_ARCH_BCM_CYGNUS is not set -# CONFIG_ARCH_BCM_NSP is not set -# CONFIG_ARCH_BCM_5301X is not set -# CONFIG_ARCH_BCM_281XX is not set -# CONFIG_ARCH_BCM_21664 is not set -# CONFIG_ARCH_BCM_63XX is not set -# CONFIG_ARCH_BCM_23550 is not set -# CONFIG_ARCH_BRCMSTB is not set -# CONFIG_ARCH_BERLIN is not set # CONFIG_ARCH_HI3xxx is not set # CONFIG_ARCH_HISI is not set # CONFIG_ARCH_MEDIATEK is not set @@ -257,32 +238,6 @@ CONFIG_SND_SUN4I_I2S=m CONFIG_SUNXI_RSB=m CONFIG_NVMEM_SUNXI_SID=m -# BCM 283x -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y -CONFIG_SERIAL_8250_BCM2835AUX=y -CONFIG_DMA_BCM2835=m -CONFIG_MMC_SDHCI_IPROC=m -CONFIG_BCM2835_MBOX=y -CONFIG_PWM_BCM2835=m -CONFIG_HW_RANDOM_BCM2835=m -CONFIG_I2C_BCM2835=m -CONFIG_SPI_BCM2835=m -CONFIG_SPI_BCM2835AUX=m -CONFIG_BCM2835_WDT=m -CONFIG_SND_BCM2835_SOC_I2S=m -CONFIG_DRM_VC4=m -CONFIG_RASPBERRYPI_FIRMWARE=y -CONFIG_RASPBERRYPI_POWER=y -# popular digital audio HATs -CONFIG_SND_SOC_PCM512x=m -CONFIG_SND_SOC_PCM512x_I2C=m -CONFIG_SND_SOC_PCM512x_SPI=m -CONFIG_SND_SOC_TPA6130A2=m -CONFIG_SND_SOC_WM8804=m -CONFIG_SND_SOC_WM8804_I2C=m -CONFIG_SND_SOC_WM8804_SPI=m - # Exynos CONFIG_ARCH_EXYNOS3=y # CONFIG_ARCH_EXYNOS4 is not set @@ -312,7 +267,7 @@ CONFIG_EXYNOS_THERMAL=m CONFIG_EXYNOS_ADC=m CONFIG_MMC_SDHCI_S3C=m CONFIG_MMC_SDHCI_S3C_DMA=y -CONFIG_MMC_DW_EXYNOS=m +CONFIG_MMC_DW_EXYNOS=y # CONFIG_EXYNOS_IOMMU is not set CONFIG_PCI_EXYNOS=y CONFIG_PHY_EXYNOS5_USBDRD=m diff --git a/config-generic b/config-generic index c9d6e6e..c02e930 100644 --- a/config-generic +++ b/config-generic @@ -233,7 +233,6 @@ CONFIG_EXTRA_FIRMWARE="" CONFIG_FW_CFG_SYSFS=m # CONFIG_FW_CFG_SYSFS_CMDLINE is not set - # Give this a try in rawhide for now # CONFIG_FW_LOADER_USER_HELPER is not set # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set @@ -1626,7 +1625,6 @@ CONFIG_NET_VENDOR_SIS=y CONFIG_SIS900=m CONFIG_SIS190=m - CONFIG_NET_VENDOR_SMSC=y CONFIG_PCMCIA_SMC91C92=m CONFIG_EPIC100=m @@ -1685,7 +1683,6 @@ CONFIG_BCM63XX_PHY=m CONFIG_BCM7XXX_PHY=m CONFIG_INTEL_XWAY_PHY=m # CONFIG_MDIO_HISI_FEMAC is not set -# CONFIG_MDIO_XGENE is not set CONFIG_LSI_ET1011C_PHY=m CONFIG_LXT_PHY=m CONFIG_MARVELL_PHY=m @@ -1730,7 +1727,6 @@ CONFIG_JME=m # Ethernet (10000 Mbit) # CONFIG_NET_VENDOR_AURORA is not set -# CONFIG_MLX4_CORE=m CONFIG_MLX4_EN=m CONFIG_MLX4_EN_DCB=y @@ -1773,7 +1769,6 @@ CONFIG_SLIP_SMART=y # # Wireless LAN # -# CONFIG_WLAN=y # CONFIG_STRIP is not set # CONFIG_PCMCIA_RAYCS is not set @@ -2223,8 +2218,6 @@ CONFIG_BT_HIDP=m # Bluetooth device drivers # CONFIG_BT_HCIBTUSB=m -# Disable the BT_HCIUSB driver. -# It sucks more power than BT_HCIBTUSB which has the same functionality. CONFIG_BT_HCIBTUSB_BCM=y CONFIG_BT_HCIBTUSB_RTL=y CONFIG_BT_HCIUART=m @@ -2264,20 +2257,19 @@ CONFIG_MISDN_SPEEDFAX=m CONFIG_MISDN_INFINEON=m CONFIG_MISDN_W6692=m CONFIG_MISDN_NETJET=m +CONFIG_MISDN_HFCUSB=m +CONFIG_MISDN_HFCPCI=m +CONFIG_MISDN_HFCMULTI=m # # mISDN hardware drivers # -CONFIG_MISDN_HFCPCI=m -CONFIG_MISDN_HFCMULTI=m CONFIG_ISDN_I4L=m CONFIG_ISDN_DRV_AVMB1_B1PCI=m CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m CONFIG_ISDN_DRV_AVMB1_T1PCI=m CONFIG_ISDN_DRV_AVMB1_C4=m -CONFIG_MISDN_HFCUSB=m - CONFIG_ISDN_PPP=y CONFIG_ISDN_PPP_VJ=y CONFIG_ISDN_MPP=y @@ -5497,8 +5489,8 @@ CONFIG_LEDS_WM831X_STATUS=m CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y -CONFIG_DW_DMAC_CORE=m CONFIG_DW_DMAC=m +CONFIG_DW_DMAC_CORE=m CONFIG_DW_DMAC_PCI=m # CONFIG_IDMA64 is not set # CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set @@ -5509,9 +5501,7 @@ CONFIG_DW_DMAC_PCI=m CONFIG_ASYNC_TX_DMA=y # CONFIG_HSU_DMA is not set # CONFIG_HSU_DMA_PCI is not set -# CONFIG_XGENE_DMA is not set # CONFIG_XILINX_DMA is not set -# CONFIG_XILINX_ZYNQMP_DMA is not set # CONFIG_INTEL_IDMA64 is not set # CONFIG_QCOM_HIDMA_MGMT is not set # CONFIG_QCOM_HIDMA is not set @@ -6060,7 +6050,6 @@ CONFIG_SYSTEM_BLACKLIST_KEYRING=y # CONFIG_MODULE_COMPRESS is not set # CONFIG_RTC_DRV_EFI is not set -# CONFIG_NET_XGENE is not set # CONFIG_GLOB_SELFTEST is not set diff --git a/kernel.spec b/kernel.spec index 6f13547..623e70d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2160,7 +2160,8 @@ fi # # %changelog -* Fri Sep 30 2016 Peter Robinson +* Sun Oct 2 2016 Peter Robinson +- ARM config cleanups, some minor general cleanups - Some bcm283x VC4 fixes for Raspberry Pi * Fri Sep 30 2016 Justin M. Forbes - 4.8.0-0.rc8.git3.1