summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDennis Gilmore <dennis@ausil.us>2011-08-16 11:41:15 -0500
committerDennis Gilmore <dennis@ausil.us>2011-08-16 11:41:15 -0500
commite153256415d572b089a2eda40c7a1abfd9f6fd48 (patch)
treeed4e8005707d95b22bb0e21d5bc4cd04f98754fc
parent53fe9c977abcf0cf29fe9e804b0510e1a4784c9e (diff)
downloadkernel-e153256415d572b089a2eda40c7a1abfd9f6fd48.tar.gz
kernel-e153256415d572b089a2eda40c7a1abfd9f6fd48.tar.xz
kernel-e153256415d572b089a2eda40c7a1abfd9f6fd48.zip
disable crystalhd module on the generic arm qemu build
but enable it on the others disable tpm on arm build in mmc_block on tegra build
-rw-r--r--config-arm-generic7
-rw-r--r--config-arm-omap-generic3
-rw-r--r--config-arm-tegra2
3 files changed, 11 insertions, 1 deletions
diff --git a/config-arm-generic b/config-arm-generic
index 296d52b08..307c66d68 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -156,6 +156,13 @@ CONFIG_MMC_SDHCI_PXAV2=m
CONFIG_FTGMAC100=m
+# disable TPM on arm at least on the trimslices it causes havoc
+# CONFIG_TCG_TPM is not set
+# CONFIG_IMA is not set
+
+# ERROR: "__bswapsi2" [drivers/staging/crystalhd/crystalhd.ko] undefined!
+# CONFIG_CRYSTALHD is not set
+
# these modules all fail with missing __bad_udelay
# http://www.spinics.net/lists/arm/msg15615.html provides some background
# CONFIG_SUNGEM is not set
diff --git a/config-arm-omap-generic b/config-arm-omap-generic
index df7ab065a..12a6e30e3 100644
--- a/config-arm-omap-generic
+++ b/config-arm-omap-generic
@@ -415,7 +415,6 @@ CONFIG_SERIAL_OMAP_CONSOLE=y
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
# CONFIG_R3964 is not set
# CONFIG_RAW_DRIVER is not set
-# CONFIG_TCG_TPM is not set
CONFIG_I2C=y
CONFIG_I2C_CHARDEV=y
# CONFIG_I2C_GPIO is not set
@@ -1097,3 +1096,5 @@ CONFIG_LIBCRC32C=y
# CONFIG_BT_ATH3K is not set
# CONFIG_BT_WILINK is not set
# CONFIG_USB_HSO is not set
+
+CONFIG_CRYSTALHD=m
diff --git a/config-arm-tegra b/config-arm-tegra
index c72660bf8..c79efcf5b 100644
--- a/config-arm-tegra
+++ b/config-arm-tegra
@@ -16,6 +16,7 @@ CONFIG_AEABI=y
CONFIG_I2C_TEGRA=y
CONFIG_MMC=y
+CONFIG_MMC_BLOCK=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_PLTFM=y
CONFIG_MMC_SDHCI_TEGRA=y
@@ -76,3 +77,4 @@ CONFIG_CPU_FREQ_TABLE=y
CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_STAT_DETAILS=y
+CONFIG_CRYSTALHD=m