aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2010-08-23 14:52:57 -0600
committerJohn Rigby <john.rigby@linaro.org>2010-08-23 15:27:37 -0600
commit6e1b35b84d5648c3e8e3f6fb9a283778ad0195a0 (patch)
tree3582c8f114f09545a770a425f68b8b86ee86ae87
parentc763bb9759137e556b5cc66ddbd094b9df9ff8b0 (diff)
LINARO: [config] Update vexpress config
Enable USB mass storage as a module Enable SCSI disk support Signed-off-by: John Rigby <john.rigby@linaro.org>
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-mx511
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-omap1
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-vexpress3
-rw-r--r--debian.linaro/config/config.common.ubuntu1
4 files changed, 2 insertions, 4 deletions
diff --git a/debian.linaro/config/armel/config.flavour.linaro-mx51 b/debian.linaro/config/armel/config.flavour.linaro-mx51
index 7fb73ed90bd..3c49084c187 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-mx51
+++ b/debian.linaro/config/armel/config.flavour.linaro-mx51
@@ -30,7 +30,6 @@ CONFIG_BINFMT_MISC=m
# CONFIG_BLK_DEV_BSG is not set
# CONFIG_BLK_DEV_INTEGRITY is not set
CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_SD=y
# CONFIG_BLK_DEV_SR is not set
# CONFIG_BONDING is not set
# CONFIG_BRIDGE is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap
index 09eaf93f1ec..02bbd4dc296 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ b/debian.linaro/config/armel/config.flavour.linaro-omap
@@ -31,7 +31,6 @@ CONFIG_BINFMT_MISC=m
CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_INTEGRITY=y
CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_SD=y
CONFIG_BLK_DEV_SR=y
CONFIG_BONDING=m
CONFIG_BRIDGE=m
diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress
index 5691cbe3e54..d3d8bdc6265 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-vexpress
+++ b/debian.linaro/config/armel/config.flavour.linaro-vexpress
@@ -31,7 +31,6 @@ CONFIG_ATA=m
# CONFIG_BLK_DEV_BSG is not set
# CONFIG_BLK_DEV_INTEGRITY is not set
# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_SD is not set
# CONFIG_BLK_DEV_SR is not set
# CONFIG_BONDING is not set
# CONFIG_BRIDGE is not set
@@ -531,7 +530,7 @@ CONFIG_USB_MON=y
# CONFIG_USB_SERIAL is not set
# CONFIG_USB_SEVSEG is not set
# CONFIG_USB_SL811_HCD is not set
-CONFIG_USB_STORAGE=y
+CONFIG_USB_STORAGE=m
# CONFIG_USB_STORAGE_ALAUDA is not set
# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
# CONFIG_USB_STORAGE_DATAFAB is not set
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index 055804dd050..548f48e6ae2 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -242,6 +242,7 @@ CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=65536
+CONFIG_BLK_DEV_SD=y
# CONFIG_BLK_DEV_SR_VENDOR is not set
# CONFIG_BLK_DEV_UB is not set
# CONFIG_BLK_DEV_XIP is not set