aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-12-20 14:09:39 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-12-20 14:09:39 +0000
commit5da1d7daa5e057f5073a72ae9e89f37426960e04 (patch)
tree84257b1d4e3fae6ec0cac2417c8465bca8cfa6c5
parent1b0aaff2467d1ac5e08e35dae168df781e688b10 (diff)
downloadupstream-5da1d7daa5e057f5073a72ae9e89f37426960e04.tar.gz
upstream-5da1d7daa5e057f5073a72ae9e89f37426960e04.tar.bz2
upstream-5da1d7daa5e057f5073a72ae9e89f37426960e04.zip
ppc40x/44x: disable SWIOTLB
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 34797
-rw-r--r--target/linux/ppc40x/config-3.64
-rw-r--r--target/linux/ppc44x/config-3.64
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ppc40x/config-3.6 b/target/linux/ppc40x/config-3.6
index 784907d498..978a054953 100644
--- a/target/linux/ppc40x/config-3.6
+++ b/target/linux/ppc40x/config-3.6
@@ -98,7 +98,7 @@ CONFIG_IBM_EMAC_RX_COPY_THRESHOLD=256
CONFIG_IBM_EMAC_RX_SKB_HEADROOM=0
CONFIG_IBM_EMAC_TXB=256
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_IOMMU_HELPER=y
+# CONFIG_IOMMU_HELPER is not set
# CONFIG_IPIC is not set
CONFIG_IRQ_DOMAIN=y
CONFIG_IRQ_FORCED_THREADING=y
@@ -204,7 +204,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
# CONFIG_SLAB is not set
CONFIG_SLUB=y
CONFIG_SPARSE_IRQ=y
-CONFIG_SWIOTLB=y
+# CONFIG_SWIOTLB is not set
CONFIG_TASK_SIZE=0xc0000000
CONFIG_USB=m
CONFIG_USB_ARCH_HAS_XHCI=y
diff --git a/target/linux/ppc44x/config-3.6 b/target/linux/ppc44x/config-3.6
index 71e1362c6b..44b02b3c38 100644
--- a/target/linux/ppc44x/config-3.6
+++ b/target/linux/ppc44x/config-3.6
@@ -107,7 +107,7 @@ CONFIG_IBM_EMAC_TXB=128
CONFIG_IBM_EMAC_ZMII=y
# CONFIG_ICON is not set
CONFIG_INITRAMFS_SOURCE=""
-CONFIG_IOMMU_HELPER=y
+# CONFIG_IOMMU_HELPER is not set
# CONFIG_IPIC is not set
CONFIG_IRQ_DOMAIN=y
CONFIG_IRQ_FORCED_THREADING=y
@@ -214,7 +214,7 @@ CONFIG_SERIAL_8250_FSL=y
CONFIG_SERIAL_8250_SHARE_IRQ=y
CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_SPARSE_IRQ=y
-CONFIG_SWIOTLB=y
+# CONFIG_SWIOTLB is not set
CONFIG_TAISHAN=y
CONFIG_TASK_SIZE=0xc0000000
CONFIG_USB_ARCH_HAS_XHCI=y