aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-11-11 19:26:44 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-11-11 19:26:44 +0000
commit1ff596e058541dde30563f146795a106a2039d34 (patch)
tree259efff980d9a500a6e84a604e0787038dfe9b1f
parentdbaa47e43b889f789c9a7d7801820ee88b55103c (diff)
downloadupstream-1ff596e058541dde30563f146795a106a2039d34.tar.gz
upstream-1ff596e058541dde30563f146795a106a2039d34.tar.bz2
upstream-1ff596e058541dde30563f146795a106a2039d34.zip
[au1000] split kernel config between generic, au1500 and au1550
Signed-off-by: Florian Fainelli <florian@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34155 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/au1000/au1500/config-default5
-rw-r--r--target/linux/au1000/au1550/config-default4
-rw-r--r--target/linux/au1000/config-3.3 (renamed from target/linux/au1000/au1500/config-3.3)5
3 files changed, 9 insertions, 5 deletions
diff --git a/target/linux/au1000/au1500/config-default b/target/linux/au1000/au1500/config-default
new file mode 100644
index 0000000000..0289d967bb
--- /dev/null
+++ b/target/linux/au1000/au1500/config-default
@@ -0,0 +1,5 @@
+CONFIG_DMA_NONCOHERENT=y
+# CONFIG_MIPS_DB1550 is not set
+CONFIG_MIPS_MTX1=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_WDT_MTX1=y
diff --git a/target/linux/au1000/au1550/config-default b/target/linux/au1000/au1550/config-default
new file mode 100644
index 0000000000..2c641b8cab
--- /dev/null
+++ b/target/linux/au1000/au1550/config-default
@@ -0,0 +1,4 @@
+CONFIG_DMA_COHERENT=y
+CONFIG_MIPS_DB1550=y
+CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y
+# CONFIG_MIPS_MTX1 is not set
diff --git a/target/linux/au1000/au1500/config-3.3 b/target/linux/au1000/config-3.3
index 8a1a53a10d..f7b3fd4f96 100644
--- a/target/linux/au1000/au1500/config-3.3
+++ b/target/linux/au1000/config-3.3
@@ -26,7 +26,6 @@ CONFIG_CRC16=y
CONFIG_CSRC_R4K_LIB=y
# CONFIG_DEBUG_ZBOOT is not set
CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DMA_NONCOHERENT=y
CONFIG_DUMMY=m
CONFIG_EARLY_PRINTK=y
CONFIG_ELF_CORE=y
@@ -91,11 +90,9 @@ CONFIG_MIPS_AU1X00_ENET=y
# CONFIG_MIPS_DB1000 is not set
# CONFIG_MIPS_DB1200 is not set
# CONFIG_MIPS_DB1300 is not set
-# CONFIG_MIPS_DB1550 is not set
# CONFIG_MIPS_GPR is not set
CONFIG_MIPS_L1_CACHE_SHIFT=5
# CONFIG_MIPS_MACHINE is not set
-CONFIG_MIPS_MTX1=y
CONFIG_MIPS_MT_DISABLED=y
# CONFIG_MIPS_PB1100 is not set
# CONFIG_MIPS_PB1500 is not set
@@ -106,7 +103,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y
# CONFIG_MTD_CFI_INTELEXT is not set
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
CONFIG_MTD_PHYSMAP=y
-CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NEED_PER_CPU_KM=y
CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
CONFIG_PAGEFLAGS_EXTENDED=y
@@ -135,7 +131,6 @@ CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
CONFIG_SYS_SUPPORTS_ZBOOT=y
CONFIG_USB_ARCH_HAS_XHCI=y
CONFIG_USB_SUPPORT=y
-CONFIG_WDT_MTX1=y
CONFIG_XZ_DEC=y
CONFIG_ZLIB_INFLATE=m
CONFIG_ZONE_DMA_FLAG=0