diff --git a/config-armv7-generic b/config-armv7-generic
index 474409d9b..57ee4ef1f 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -52,6 +52,7 @@ CONFIG_CPU_SW_DOMAIN_PAN=y
 # 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
@@ -60,7 +61,21 @@ 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 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_BRCMSTB is not set
 # CONFIG_ARCH_BERLIN is not set
 # CONFIG_ARCH_HI3xxx is not set
 # CONFIG_ARCH_HISI is not set
@@ -239,9 +254,10 @@ 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_MMC_SDHCI_BCM2835 is not set
+CONFIG_MMC_SDHCI_IPROC=m
 CONFIG_BCM2835_MBOX=m
 CONFIG_PWM_BCM2835=m
 CONFIG_HW_RANDOM_BCM2835=m
diff --git a/kernel.spec b/kernel.spec
index fb426c6a0..43448fc02 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2144,6 +2144,9 @@ fi
 #
 # 
 %changelog
+* Thu May 12 2016 Peter Robinson <pbrobinson@fedoraproject.org>
+- Some minor ARMv7 platform fixes from F-24
+
 * Wed May 11 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc7.git2.1
 - Linux v4.6-rc7-55-gc5114626f33b