5 files changed, 8 insertions, 2 deletions
diff --git a/target/linux/brcm2708/bcm2708/config-default b/target/linux/brcm2708/bcm2708/config-default
index 8ebd8e837f..858d23651a 100644
--- a/target/linux/brcm2708/bcm2708/config-default
+++ b/target/linux/brcm2708/bcm2708/config-default
@@ -1,3 +1,4 @@
 CONFIG_ARCH_BCM2708=y
 # CONFIG_BCM2708_DT is not set
+CONFIG_MACH_BCM2708=y
 CONFIG_VMSPLIT_3G=y
diff --git a/target/linux/brcm2708/bcm2709/config-default b/target/linux/brcm2708/bcm2709/config-default
index e9d87ca659..8945c24b5b 100644
--- a/target/linux/brcm2708/bcm2709/config-default
+++ b/target/linux/brcm2708/bcm2709/config-default
@@ -8,7 +8,7 @@ CONFIG_BCM2708_NOL2CACHE=y
 # CONFIG_CRYPTO_SHA512_ARM_NEON is not set
 CONFIG_HAVE_ARM_ARCH_TIMER=y
 CONFIG_KERNEL_MODE_NEON=y
-CONFIG_LOCALVERSION="-v7"
+CONFIG_MACH_BCM2709=y
 CONFIG_NEON=y
 CONFIG_NR_CPUS=4
 CONFIG_SMP=y
diff --git a/target/linux/brcm2708/config-3.18 b/target/linux/brcm2708/config-3.18
index 9cae2fa685..e75fb22fb3 100644
--- a/target/linux/brcm2708/config-3.18
+++ b/target/linux/brcm2708/config-3.18
@@ -182,7 +182,8 @@ CONFIG_LOGO=y
 CONFIG_LOGO_LINUX_CLUT224=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_MACH_BCM2708=y
+# CONFIG_MACH_BCM2708 is not set
+# CONFIG_MACH_BCM2709 is not set
 CONFIG_MAC_PARTITION=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAX_RAW_DEVS=256
diff --git a/target/linux/generic/config-3.18 b/target/linux/generic/config-3.18
index 52cc3b0ff0..5487bdd262 100644
--- a/target/linux/generic/config-3.18
+++ b/target/linux/generic/config-3.18
@@ -1338,6 +1338,7 @@ CONFIG_HZ_100=y
 # CONFIG_I2C_AMD8111 is not set
 # CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
 # CONFIG_I2C_AU1550 is not set
+# CONFIG_I2C_BCM2835 is not set
 # CONFIG_I2C_CBUS_GPIO is not set
 # CONFIG_I2C_CHARDEV is not set
 # CONFIG_I2C_COMPAT is not set
@@ -3729,6 +3730,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SPINLOCK_TEST is not set
 # CONFIG_SPI_ALTERA is not set
 # CONFIG_SPI_AU1550 is not set
+# CONFIG_SPI_BCM2835 is not set
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_BUTTERFLY is not set
 # CONFIG_SPI_CADENCE is not set
diff --git a/target/linux/generic/config-3.19 b/target/linux/generic/config-3.19
index 0d05ddbf20..a5405f47ce 100644
--- a/target/linux/generic/config-3.19
+++ b/target/linux/generic/config-3.19
@@ -1345,6 +1345,7 @@ CONFIG_HZ_100=y
 # CONFIG_I2C_AMD8111 is not set
 # CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
 # CONFIG_I2C_AU1550 is not set
+# CONFIG_I2C_BCM2835 is not set
 # CONFIG_I2C_CBUS_GPIO is not set
 # CONFIG_I2C_CHARDEV is not set
 # CONFIG_I2C_COMPAT is not set
@@ -3754,6 +3755,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SPINLOCK_TEST is not set
 # CONFIG_SPI_ALTERA is not set
 # CONFIG_SPI_AU1550 is not set
+# CONFIG_SPI_BCM2835 is not set
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_BUTTERFLY is not set
 # CONFIG_SPI_CADENCE is not set