diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2016-05-20 12:05:37 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2016-05-20 12:05:37 +0100 |
| commit | d141433bf18de6f1316b583aa25d6f431497837c (patch) | |
| tree | 863b1b8c14b018cfb62b99c3a9862cecf0e81c15 | |
| parent | 39bfc7e6a160dcc72813b7996b41682b5e680393 (diff) | |
| download | kernel-d141433bf18de6f1316b583aa25d6f431497837c.tar.gz kernel-d141433bf18de6f1316b583aa25d6f431497837c.tar.xz kernel-d141433bf18de6f1316b583aa25d6f431497837c.zip | |
Minor ARM cleanups, enable Tegra USB-3 controller, drop dead DSA_MV
| -rw-r--r-- | config-arm-generic | 6 | ||||
| -rw-r--r-- | config-armv7-generic | 3 | ||||
| -rw-r--r-- | config-generic | 4 | ||||
| -rw-r--r-- | kernel.spec | 3 |
4 files changed, 7 insertions, 9 deletions
diff --git a/config-arm-generic b/config-arm-generic index dfbab76cc..1963d5ee3 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -6,8 +6,9 @@ CONFIG_EARLY_PRINTK=y CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y CONFIG_FB_SSD1307=m CONFIG_HW_PERF_EVENTS=y -CONFIG_NFS_FS=y CONFIG_FORCE_MAX_ZONEORDER=11 +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_CC_STACKPROTECTOR=y @@ -154,6 +155,8 @@ CONFIG_RTC_DRV_TEGRA=m CONFIG_ARM_TEGRA_DEVFREQ=m CONFIG_ARM_TEGRA124_CPUFREQ=m CONFIG_TEGRA_SOCTHERM=m +CONFIG_PHY_TEGRA_XUSB=m +CONFIG_USB_XHCI_TEGRA=m CONFIG_TEGRA_HOST1X=m CONFIG_TEGRA_HOST1X_FIREWALL=y @@ -165,7 +168,6 @@ CONFIG_SND_HDA_TEGRA=m # CONFIG_ARM_TEGRA20_CPUFREQ is not set # CONFIG_MFD_NVEC is not set -# CONFIG_PHY_TEGRA_XUSB is not set # Virt CONFIG_PARAVIRT=y diff --git a/config-armv7-generic b/config-armv7-generic index 486a445ce..ea045c1c3 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -30,7 +30,6 @@ CONFIG_ATAGS=y CONFIG_ATAGS_PROC=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_XZ_DEC_ARMTHUMB=y CONFIG_ARCH_HAS_TICK_BROADCAST=y CONFIG_IRQ_CROSSBAR=y CONFIG_IOMMU_IO_PGTABLE_LPAE=y @@ -164,8 +163,6 @@ CONFIG_DEVFREQ_GOV_USERSPACE=y CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 CONFIG_LSM_MMAP_MIN_ADDR=32768 -CONFIG_XZ_DEC_ARM=y - # CONFIG_PCI_LAYERSCAPE is not set # Do NOT enable this, it breaks stuff and makes things go slow # CONFIG_UACCESS_WITH_MEMCPY is not set diff --git a/config-generic b/config-generic index 21ac74dae..8030ba4f4 100644 --- a/config-generic +++ b/config-generic @@ -5580,10 +5580,6 @@ CONFIG_GPIOLIB=y CONFIG_NET_DSA=m CONFIG_NET_DSA_HWMON=y CONFIG_NET_DSA_MV88E6060=m -CONFIG_NET_DSA_MV88E6131=m -CONFIG_NET_DSA_MV88E6123=m -CONFIG_NET_DSA_MV88E6171=m -CONFIG_NET_DSA_MV88E6352=m CONFIG_NET_DSA_MV88E6XXX=m CONFIG_NET_DSA_BCM_SF2=m diff --git a/kernel.spec b/kernel.spec index 8d9028ab4..43588e458 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2139,6 +2139,9 @@ fi # # %changelog +* Fri May 20 2016 Peter Robinson <pbrobinson@fedoraproject.org> +- Minor ARM cleanups, enable Tegra USB-3 controller + * Thu May 19 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc0.git4.1 - Linux v4.6-5028-g2600a46 - trace, audit, input, media, scsi, armsoc merges |