UBUNTU: [Config] highbank -- commonise CRC settings

Signed-off-by: Andy Whitcroft <apw@canonical.com>

8 files changed, 2 insertions, 14 deletions

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index f1846681d27..39aea706b4f 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -56,8 +56,6 @@ CONFIG_CORDIC=m
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_IDLE=y
 CONFIG_CRASH_DUMP=y
-CONFIG_CRC7=m
-CONFIG_CRC8=m
 CONFIG_CRYPTO_LZO=y
 CONFIG_CUSE=m
 CONFIG_DE600=m
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 911d335eea4..1094c706f0a 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -57,8 +57,6 @@ CONFIG_CORDIC=m
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_IDLE=y
 CONFIG_CRASH_DUMP=y
-CONFIG_CRC7=m
-CONFIG_CRC8=m
 CONFIG_CRYPTO_LZO=m
 CONFIG_CUSE=m
 CONFIG_DE600=m
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index fa27f990915..f5440cec8cb 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -45,8 +45,6 @@ CONFIG_CACHE_L2X0=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 # CONFIG_CPU_IDLE is not set
 # CONFIG_CRASH_DUMP is not set
-# CONFIG_CRC7 is not set
-# CONFIG_CRC8 is not set
 # CONFIG_CUSE is not set
 # CONFIG_DE600 is not set
 # CONFIG_DE620 is not set
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index 7bf7e9e9557..85be4b8b29a 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -45,8 +45,6 @@ CONFIG_CORDIC=m
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_CPU_IDLE=y
 CONFIG_CRASH_DUMP=y
-CONFIG_CRC7=m
-CONFIG_CRC8=m
 CONFIG_CUSE=m
 CONFIG_DE600=m
 CONFIG_DE620=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 8fbb57f9208..53ba65e4196 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1072,6 +1072,8 @@ CONFIG_CRC32=y
 # CONFIG_CRC32_SELFTEST is not set
 # CONFIG_CRC32_SLICEBY4 is not set
 CONFIG_CRC32_SLICEBY8=y
+CONFIG_CRC7=m
+CONFIG_CRC8=m
 CONFIG_CRC_CCITT=m
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC_T10DIF=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 0f395229ac9..af3d8e63f03 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -56,8 +56,6 @@ CONFIG_CORDIC=m
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_IDLE=y
 CONFIG_CRASH_DUMP=y
-CONFIG_CRC7=m
-CONFIG_CRC8=m
 CONFIG_CRYPTO_LZO=y
 CONFIG_CUSE=m
 CONFIG_DE600=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 9bde23e6602..9539df0baea 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -49,8 +49,6 @@ CONFIG_CORDIC=m
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_IDLE=y
-CONFIG_CRC7=m
-CONFIG_CRC8=m
 CONFIG_CRYPTO_LZO=m
 CONFIG_CUSE=m
 CONFIG_DE600=m
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index cf5548db643..f11bf583814 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -54,8 +54,6 @@ CONFIG_CORDIC=m
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_IDLE=y
 CONFIG_CRASH_DUMP=y
-CONFIG_CRC7=m
-CONFIG_CRC8=m
 CONFIG_CRYPTO_LZO=m
 CONFIG_CUSE=m
 CONFIG_DE600=m