diff --git a/config-armv7 b/config-armv7
index 3944697d2..4dc63eca3 100644
--- a/config-armv7
+++ b/config-armv7
@@ -65,27 +65,26 @@ CONFIG_SOC_OMAP5=y
 # CONFIG_SOC_DRA7XX is not set
 CONFIG_SOC_OMAP3430=y
 CONFIG_SOC_TI81XX=y
-CONFIG_MACH_CRANEBOARD=y
-CONFIG_MACH_DEVKIT8000=y
+# CONFIG_MACH_CM_T35 is not set
+# CONFIG_MACH_CM_T3517 is not set
+# CONFIG_MACH_CRANEBOARD is not set
+# CONFIG_MACH_DEVKIT8000 is not set
+# CONFIG_MACH_IGEP0030 is not set
 # CONFIG_MACH_NOKIA_RX51 is not set
-CONFIG_MACH_OMAP_3630SDP=y
-CONFIG_MACH_OMAP_GENERIC=y
-CONFIG_MACH_OMAP_LDP=y
-CONFIG_MACH_OMAP3_BEAGLE=y
-# CONFIG_MACH_OMAP3EVM is not set
-CONFIG_MACH_OMAP_3430SDP=y
-CONFIG_MACH_OMAP3530_LV_SOM=y
+# CONFIG_MACH_OMAP_3430SDP is not set
+# CONFIG_MACH_OMAP_3630SDP is  not set
+# CONFIG_MACH_OMAP_LDP is not set
+# CONFIG_MACH_OMAP3_BEAGLE is not set
 # CONFIG_MACH_OMAP3517EVM is not set
-CONFIG_MACH_OMAP3_PANDORA=y
-CONFIG_MACH_OMAP3_TORPEDO=y
-CONFIG_MACH_OVERO=y
-CONFIG_MACH_TOUCHBOOK=y
-CONFIG_MACH_CM_T35=y
-CONFIG_MACH_CM_T3517=y
-CONFIG_MACH_IGEP0030=y
-CONFIG_MACH_SBC3530=y
+# CONFIG_MACH_OMAP3530_LV_SOM is not set
+# CONFIG_MACH_OMAP3EVM is not set
+# CONFIG_MACH_OMAP3_PANDORA is not set
+# CONFIG_MACH_OMAP3_TORPEDO is not set
+# CONFIG_MACH_OVERO is not set
+# CONFIG_MACH_SBC3530 is not set
 # CONFIG_MACH_TI8168EVM is not set
 # CONFIG_MACH_TI8148EVM is not set
+# CONFIG_MACH_TOUCHBOOK is not set
 
 CONFIG_SOC_HAS_REALTIME_COUNTER=y
 CONFIG_OMAP_RESET_CLOCKS=y
@@ -93,6 +92,8 @@ CONFIG_OMAP_MUX=y
 CONFIG_OMAP_MUX_WARNINGS=y
 CONFIG_OMAP_32K_TIMER=y
 CONFIG_OMAP_32K_TIMER_HZ=128
+CONFIG_OMAP_PACKAGE_CBB=y
+CONFIG_OMAP_PACKAGE_CUS=y
 # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
 
 CONFIG_OMAP_MCBSP=y
@@ -149,6 +150,8 @@ CONFIG_RTC_DRV_TWL4030=y
 CONFIG_RTC_DRV_OMAP=y
 CONFIG_SENSORS_TWL4030_MADC=m
 CONFIG_TWL6030_GPADC=m
+CONFIG_BATTERY_RX51=m
+# CONFIG_IR_RX51 is not set
 
 # OMAP5 (possibly other devices too)
 CONFIG_MFD_PALMAS=y
@@ -276,7 +279,7 @@ CONFIG_SND_OMAP_SOC_OMAP3EVM=m
 CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=m
 CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
 CONFIG_SND_OMAP_SOC_OVERO=m
-# CONFIG_SND_OMAP_SOC_RX51 is not set
+CONFIG_SND_OMAP_SOC_RX51=m
 CONFIG_SND_OMAP_SOC_SDP4430=m
 CONFIG_SND_SOC_TLV320AIC23=m
 CONFIG_SND_SOC_TLV320AIC3X=m
@@ -648,8 +651,6 @@ CONFIG_REGULATOR_MAX8973=m
 # Defined config options we don't use yet
 # CONFIG_PINCTRL_IMX35 is not set
 
-# CONFIG_BATTERY_RX51 is not set
-# CONFIG_IR_RX51 is not set
 # CONFIG_MFD_SMSC is not set
 # CONFIG_MFD_SEC_CORE is not set
 # CONFIG_MFD_LP8788 is not set
diff --git a/kernel.spec b/kernel.spec
index eb5b876c7..4815d3ef1 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2219,6 +2219,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Sat May  3 2014 Peter Robinson <pbrobinson@fedoraproject.org>
+- Disable OMAP-3 boards (use DT) and some minor omap3 config updates
+
 * Sat May 03 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc3.git5.1
 - Linux v3.15-rc3-159-g6c6ca9c2a5b9