UBUNTU: [Config] highbank -- commonise BLK/CHR

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

8 files changed, 13 insertions, 91 deletions

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 9a9f0714c97..380f7bee8f6 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -38,15 +38,7 @@ CONFIG_BCMA=m
 CONFIG_BCM_WIMAX=m
 CONFIG_BINARY_PRINTF=y
 CONFIG_BINFMT_MISC=m
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_MD=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RBD=m
-CONFIG_BLK_DEV_SR=y
 # CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_BLK_DEV_UB=m
 CONFIG_BRCMFMAC=m
 CONFIG_BROADCOM_PHY=y
 CONFIG_BSD_DISKLABEL=y
@@ -58,10 +50,6 @@ CONFIG_CFG80211_REG_DEBUG=y
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 CONFIG_CHECKPOINT_RESTORE=y
-CONFIG_CHR_DEV_OSST=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_CHR_DEV_SG=y
-CONFIG_CHR_DEV_ST=m
 CONFIG_CICADA_PHY=y
 CONFIG_CLEANCACHE=y
 CONFIG_COMPACTION=y
@@ -73,7 +61,6 @@ CONFIG_CPU_IDLE=y
 CONFIG_CRASH_DUMP=y
 CONFIG_CRC7=m
 CONFIG_CRC8=m
-CONFIG_CRC_T10DIF=y
 CONFIG_CRYPTO_LZO=y
 CONFIG_CUSE=m
 CONFIG_DAVICOM_PHY=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 67655cdafdc..ed0a356cd12 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -38,15 +38,7 @@ CONFIG_BCM_WIMAX=m
 CONFIG_BINARY_PRINTF=y
 CONFIG_BINFMT_AOUT=m
 CONFIG_BINFMT_MISC=m
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_MD=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RBD=m
-CONFIG_BLK_DEV_SR=y
 # CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_BLK_DEV_UB=m
 CONFIG_BRCMFMAC=m
 CONFIG_BROADCOM_PHY=y
 CONFIG_BSD_DISKLABEL=y
@@ -59,10 +51,6 @@ CONFIG_CFG80211_REG_DEBUG=y
 CONFIG_CGROUPS=y
 # CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set
 CONFIG_CHECKPOINT_RESTORE=y
-CONFIG_CHR_DEV_OSST=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_CHR_DEV_SG=y
-CONFIG_CHR_DEV_ST=m
 CONFIG_CICADA_PHY=y
 CONFIG_CLEANCACHE=y
 # CONFIG_COMPACTION is not set
@@ -74,7 +62,6 @@ CONFIG_CPU_IDLE=y
 CONFIG_CRASH_DUMP=y
 CONFIG_CRC7=m
 CONFIG_CRC8=m
-CONFIG_CRC_T10DIF=y
 CONFIG_CRYPTO_LZO=m
 CONFIG_CUSE=m
 CONFIG_DAVICOM_PHY=y
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index c5e48381881..4243c5288f7 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -30,14 +30,6 @@ CONFIG_ARCH_HIGHBANK=y
 # CONFIG_BINARY_PRINTF is not set
 # CONFIG_BINFMT_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
-# CONFIG_BLK_DEV_BSGLIB is not set
-# CONFIG_BLK_DEV_INTEGRITY is not set
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_MD=m
-CONFIG_BLK_DEV_RAM=m
-# CONFIG_BLK_DEV_RBD is not set
-# CONFIG_BLK_DEV_SR is not set
-# CONFIG_BLK_DEV_UB is not set
 # CONFIG_BRCMFMAC is not set
 CONFIG_BROADCOM_PHY=m
 # CONFIG_BSD_DISKLABEL is not set
@@ -49,10 +41,6 @@ CONFIG_CACHE_L2X0=y
 # CONFIG_CFG80211_REG_DEBUG is not set
 # CONFIG_CGROUPS is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
-# CONFIG_CHR_DEV_OSST is not set
-# CONFIG_CHR_DEV_SCH is not set
-# CONFIG_CHR_DEV_SG is not set
-# CONFIG_CHR_DEV_ST is not set
 CONFIG_CICADA_PHY=m
 # CONFIG_CLEANCACHE is not set
 # CONFIG_CONNECTOR is not set
@@ -62,7 +50,6 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 # CONFIG_CRASH_DUMP is not set
 # CONFIG_CRC7 is not set
 # CONFIG_CRC8 is not set
-# CONFIG_CRC_T10DIF is not set
 # CONFIG_CUSE is not set
 CONFIG_DAVICOM_PHY=m
 # CONFIG_DE600 is not set
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index 2328b6a5360..a7c61263939 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -30,14 +30,6 @@ CONFIG_BCM_WIMAX=m
 CONFIG_BINARY_PRINTF=y
 CONFIG_BINFMT_AOUT=m
 CONFIG_BINFMT_MISC=m
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_MD=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RBD=m
-CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_UB=m
 CONFIG_BRCMFMAC=m
 CONFIG_BROADCOM_PHY=y
 CONFIG_BSD_DISKLABEL=y
@@ -49,10 +41,6 @@ CONFIG_CDROM_PKTCDVD=m
 CONFIG_CFG80211_REG_DEBUG=y
 CONFIG_CGROUPS=y
 CONFIG_CHECKPOINT_RESTORE=y
-CONFIG_CHR_DEV_OSST=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_CHR_DEV_SG=y
-CONFIG_CHR_DEV_ST=m
 CONFIG_CICADA_PHY=y
 CONFIG_CLEANCACHE=y
 CONFIG_CONNECTOR=y
@@ -62,7 +50,6 @@ CONFIG_CPU_IDLE=y
 CONFIG_CRASH_DUMP=y
 CONFIG_CRC7=m
 CONFIG_CRC8=m
-CONFIG_CRC_T10DIF=y
 CONFIG_CUSE=m
 CONFIG_DAVICOM_PHY=y
 CONFIG_DE600=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 9599d0d314a..5297e8aebdc 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -579,6 +579,7 @@ CONFIG_BLK_DEV_3W_XXXX_RAID=m
 # CONFIG_BLK_DEV_ALI15X3 is not set
 # CONFIG_BLK_DEV_AMD74XX is not set
 CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_CMD64X=m
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_CRYPTOLOOP=m
@@ -604,12 +605,15 @@ CONFIG_BLK_DEV_IDE_PMAC=y
 CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
 # CONFIG_BLK_DEV_IDE_SATA is not set
 CONFIG_BLK_DEV_INITRD=y
+CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_IO_TRACE=y
 # CONFIG_BLK_DEV_IT8172 is not set
 # CONFIG_BLK_DEV_IT8213 is not set
 # CONFIG_BLK_DEV_IT821X is not set
 # CONFIG_BLK_DEV_JMICRON is not set
+CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_MD=y
 CONFIG_BLK_DEV_NBD=m
 # CONFIG_BLK_DEV_NS87415 is not set
 CONFIG_BLK_DEV_NVME=m
@@ -620,19 +624,23 @@ CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 # CONFIG_BLK_DEV_PDC202XX_OLD is not set
 # CONFIG_BLK_DEV_PIIX is not set
 # CONFIG_BLK_DEV_PLATFORM is not set
+CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=65536
+CONFIG_BLK_DEV_RBD=m
 # CONFIG_BLK_DEV_SC1200 is not set
 CONFIG_BLK_DEV_SD=y
 # CONFIG_BLK_DEV_SIIMAGE is not set
 # CONFIG_BLK_DEV_SL82C105 is not set
 # CONFIG_BLK_DEV_SLC90E66 is not set
+CONFIG_BLK_DEV_SR=y
 # CONFIG_BLK_DEV_SVWKS is not set
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_TC86C001 is not set
 CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_TRIFLEX is not set
 # CONFIG_BLK_DEV_TRM290 is not set
+CONFIG_BLK_DEV_UB=m
 CONFIG_BLK_DEV_UMEM=m
 # CONFIG_BLK_DEV_VIA82CXXX is not set
 # CONFIG_BLK_DEV_XD is not set
@@ -832,6 +840,10 @@ CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T3=m
 CONFIG_CHELSIO_T4=m
 CONFIG_CHELSIO_T4VF=m
+CONFIG_CHR_DEV_OSST=m
+CONFIG_CHR_DEV_SCH=m
+CONFIG_CHR_DEV_SG=y
+CONFIG_CHR_DEV_ST=m
 CONFIG_CIFS=m
 CONFIG_CIFS_ACL=y
 # CONFIG_CIFS_DEBUG2 is not set
@@ -1059,6 +1071,7 @@ CONFIG_CRC32=y
 CONFIG_CRC32_SLICEBY8=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC_ITU_T=m
+CONFIG_CRC_T10DIF=y
 CONFIG_CROSS_COMPILE=""
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_AEAD=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 06c9186ed07..4678ec6a674 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -38,15 +38,7 @@ CONFIG_BCM_WIMAX=m
 CONFIG_BINARY_PRINTF=y
 CONFIG_BINFMT_AOUT=m
 CONFIG_BINFMT_MISC=m
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_MD=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RBD=m
-CONFIG_BLK_DEV_SR=y
 # CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_BLK_DEV_UB=m
 CONFIG_BRCMFMAC=m
 CONFIG_BROADCOM_PHY=y
 CONFIG_BSD_DISKLABEL=y
@@ -58,10 +50,6 @@ CONFIG_CFG80211_REG_DEBUG=y
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 CONFIG_CHECKPOINT_RESTORE=y
-CONFIG_CHR_DEV_OSST=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_CHR_DEV_SG=y
-CONFIG_CHR_DEV_ST=m
 CONFIG_CICADA_PHY=y
 CONFIG_CLEANCACHE=y
 CONFIG_COMPACTION=y
@@ -73,7 +61,6 @@ CONFIG_CPU_IDLE=y
 CONFIG_CRASH_DUMP=y
 CONFIG_CRC7=m
 CONFIG_CRC8=m
-CONFIG_CRC_T10DIF=y
 CONFIG_CRYPTO_LZO=y
 CONFIG_CUSE=m
 CONFIG_DAVICOM_PHY=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 2dee9296f90..d0c3d420211 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -33,15 +33,7 @@ CONFIG_BCMA=m
 CONFIG_BCM_WIMAX=m
 CONFIG_BINARY_PRINTF=y
 CONFIG_BINFMT_MISC=m
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_MD=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RBD=m
-CONFIG_BLK_DEV_SR=y
 # CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_BLK_DEV_UB=m
 CONFIG_BRCMFMAC=m
 CONFIG_BROADCOM_PHY=y
 CONFIG_BSD_DISKLABEL=y
@@ -52,10 +44,6 @@ CONFIG_CDROM_PKTCDVD=m
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 CONFIG_CHECKPOINT_RESTORE=y
-CONFIG_CHR_DEV_OSST=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_CHR_DEV_SG=y
-CONFIG_CHR_DEV_ST=m
 CONFIG_CICADA_PHY=y
 CONFIG_CLEANCACHE=y
 # CONFIG_COMPACTION is not set
@@ -66,7 +54,6 @@ CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_IDLE=y
 CONFIG_CRC7=m
 CONFIG_CRC8=m
-CONFIG_CRC_T10DIF=y
 CONFIG_CRYPTO_LZO=m
 CONFIG_CUSE=m
 CONFIG_DAVICOM_PHY=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 2ba67e2e8cc..a0b7f65e8a8 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -36,15 +36,7 @@ CONFIG_BCMA=m
 CONFIG_BCM_WIMAX=m
 CONFIG_BINARY_PRINTF=y
 CONFIG_BINFMT_MISC=m
-CONFIG_BLK_DEV_BSGLIB=y
-CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_MD=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RBD=m
-CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_BLK_DEV_UB=m
 CONFIG_BRCMFMAC=m
 CONFIG_BROADCOM_PHY=y
 CONFIG_BSD_DISKLABEL=y
@@ -56,10 +48,6 @@ CONFIG_CDROM_PKTCDVD=m
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 CONFIG_CHECKPOINT_RESTORE=y
-CONFIG_CHR_DEV_OSST=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_CHR_DEV_SG=y
-CONFIG_CHR_DEV_ST=m
 CONFIG_CICADA_PHY=y
 CONFIG_CLEANCACHE=y
 CONFIG_COMPACTION=y
@@ -71,7 +59,6 @@ CONFIG_CPU_IDLE=y
 CONFIG_CRASH_DUMP=y
 CONFIG_CRC7=m
 CONFIG_CRC8=m
-CONFIG_CRC_T10DIF=y
 CONFIG_CRYPTO_LZO=m
 CONFIG_CUSE=m
 CONFIG_DAVICOM_PHY=y