diff --git a/common/recipes-kernel/linux/linux-obmc/obmc-bsp-user-config.cfg b/common/recipes-kernel/linux/linux-obmc/obmc-bsp-user-config.cfg
deleted file mode 100644
index 17c8b50..0000000
--- a/common/recipes-kernel/linux/linux-obmc/obmc-bsp-user-config.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Used by yocto-kernel to manage config options.
-#
-# yocto-kernel may change the contents of this file in any
-# way it sees fit, including removing comments like this,
-# so don't manually make any modifications you don't want
-# to lose.
-#
diff --git a/common/recipes-kernel/linux/linux-obmc/obmc-bsp-user-patches.scc b/common/recipes-kernel/linux/linux-obmc/obmc-bsp-user-patches.scc
deleted file mode 100644
index 7a598d9..0000000
--- a/common/recipes-kernel/linux/linux-obmc/obmc-bsp-user-patches.scc
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Used by yocto-kernel to manage patches.
-#
-# yocto-kernel may change the contents of this file in any
-# way it sees fit, including removing comments like this,
-# so don't manually make any modifications you don't want
-# to lose.
-#
diff --git a/common/recipes-kernel/linux/linux-obmc/obmc-bsp.cfg b/common/recipes-kernel/linux/linux-obmc/obmc-bsp.cfg
deleted file mode 100644
index 95170b1..0000000
--- a/common/recipes-kernel/linux/linux-obmc/obmc-bsp.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# A convenient place to add config options, nothing more.
-#
diff --git a/common/recipes-kernel/linux/linux-obmc/obmc-bsp.scc b/common/recipes-kernel/linux/linux-obmc/obmc-bsp.scc
deleted file mode 100644
index 88e76e6..0000000
--- a/common/recipes-kernel/linux/linux-obmc/obmc-bsp.scc
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# The top-level 'feature' for the meta-obmc-bsp custom kernel.
-#
-# Essentially this is a convenient top-level container or starting
-# point for adding lower-level config fragements and features.
-#
-
-# meta-obmc-bsp.cfg in the linux-yocto-custom subdir is just a
-# convenient place for adding random config fragments.
-
-kconf hardware obmc-bsp.cfg
-
-# These are used by yocto-kernel to add config fragments and features.
-# Don't remove if you plan on using yocto-kernel with this BSP.
-
-kconf hardware obmc-bsp-user-config.cfg
-include obmc-bsp-user-patches.scc
diff --git a/common/recipes-kernel/linux/linux-obmc_4.2.bb b/common/recipes-kernel/linux/linux-obmc_4.2.bb
index 81edb70..f49b3fc 100644
--- a/common/recipes-kernel/linux/linux-obmc_4.2.bb
+++ b/common/recipes-kernel/linux/linux-obmc_4.2.bb
@@ -3,16 +3,12 @@
 LICENSE = "GPLv2"
 
 KBRANCH ?= "dev"
+KCONFIG_MODE="--alldefconfig"
 
 SRC_URI = "git://github.com/openbmc/linux;protocol=git;branch=${KBRANCH}"
-SRC_URI += "file://obmc-bsp.scc \
-            file://obmc-bsp.cfg \
-            file://obmc-bsp-user-config.cfg \
-            file://obmc-bsp-user-patches.scc \
-           "
 
 LINUX_VERSION ?= "4.2"
-LINUX_VERSION_EXTENSION ?= "-openbmc-${SRCPV}"
+LINUX_VERSION_EXTENSION ?= "-${SRCREV}"
 
 SRCREV="openbmc-20151028-1"
 
@@ -22,7 +18,3 @@
 
 inherit kernel
 require recipes-kernel/linux/linux-yocto.inc
-
-do_configure_prepend() {
-        sed -i 's/CONFIG_LOCALVERSION=.\+/CONFIG_LOCALVERSION=${LINUX_VERSION_EXTENSION}/' ${S}/arch/${ARCH}/configs/${KMACHINE}_defconfig
-}