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

This commit is contained in:
Dennis Gilmore 2011-08-16 11:41:15 -05:00
parent d5210424c1
commit 2fe4ccdc75
3 changed files with 11 additions and 1 deletions

View File

@ -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

View File

@ -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

View File

@ -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